Fix: update layout

therajanmaurya · Nov 27, 2020 · ffc2d21 · ffc2d21
1 parent de71905
commit ffc2d21
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 21 deletions.
diff --git a/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdaterBottomSheet.kt b/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdaterBottomSheet.kt
@@ -23,7 +23,8 @@ class SweetPlayAppUpdaterBottomSheet(
     private val title: String,
     private val description: String,
     private val headerImage: Int,
-    private val typeface: Typeface? = null
+    private val typeface: Typeface? = null,
+    private val background: Int
 ) : BottomSheetDialogFragment(), InstallStateUpdatedListener {
 
     private lateinit var appUpdateManager: AppUpdateManager
@@ -35,8 +36,10 @@ class SweetPlayAppUpdaterBottomSheet(
         fun newInstant(
             title: String,
             description: String,
-            headerImage: Int
-        ) = SweetPlayAppUpdaterBottomSheet(title, description, headerImage)
+            headerImage: Int,
+            typeface: Typeface?,
+            background: Int
+        ) = SweetPlayAppUpdaterBottomSheet(title, description, headerImage, typeface, background)
 
         const val REQUEST_CODE_FLEXIBLE_UPDATE = 17363
     }
@@ -57,8 +60,9 @@ class SweetPlayAppUpdaterBottomSheet(
             title = this@SweetPlayAppUpdaterBottomSheet.title
             description = this@SweetPlayAppUpdaterBottomSheet.description
             headerImage = this@SweetPlayAppUpdaterBottomSheet.headerImage
+            bsBackground = this@SweetPlayAppUpdaterBottomSheet.background
 
-            typeface?.let {
+            /*typeface?.let {
                 tvUpdateAvailable.typeface = it
                 tvUpdateAvailableMessage.typeface = it
                 tvUpdateProgress.typeface = it
@@ -68,7 +72,7 @@ class SweetPlayAppUpdaterBottomSheet(
                 btnDownloadInstall.typeface = it
                 btnCancel.typeface = it
                 btnOk.typeface = it
-            }
+            }*/
         }
         return binding.root
     }

diff --git a/SweetUpdate/src/main/res/layout/layout_sweet_update_bottom_sheet.xml b/SweetUpdate/src/main/res/layout/layout_sweet_update_bottom_sheet.xml
@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="androidx.core.content.ContextCompat" />
+
         <variable
             name="fragment"
             type="com.github.sweet.play.update.SweetPlayAppUpdaterBottomSheet" />
@@ -21,6 +23,10 @@
             name="description"
             type="String" />
 
+        <variable
+            name="bsBackground"
+            type="Integer" />
+
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -33,10 +39,11 @@
             android:id="@+id/ivBackground"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:background="@drawable/shp_header_background"
+            android:background="@{ContextCompat.getDrawable(context, bsBackground)}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:background="@color/blue_start" />
 
         <ImageView
             android:id="@+id/imageView3"
@@ -107,16 +114,25 @@
             app:layout_constraintTop_toBottomOf="@+id/tvUpdateAvailable"
             tools:text="@string/sweet_app_update_available_message" />
 
+        <View
+            android:id="@+id/view"
+            android:layout_width="wrap_content"
+            android:layout_height="24dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvUpdateAvailableMessage" />
+
         <LinearLayout
             android:id="@+id/llUpdateAction"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:animateLayoutChanges="true"
             android:gravity="center"
+            android:paddingBottom="24dp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvUpdateAvailableMessage">
+            app:layout_constraintTop_toBottomOf="@+id/view">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnLater"
@@ -143,6 +159,7 @@
             android:animateLayoutChanges="true"
             android:gravity="center"
             android:orientation="horizontal"
+            android:paddingBottom="24dp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -174,8 +191,8 @@
             android:layout_gravity="center"
             android:animateLayoutChanges="true"
             android:gravity="center"
-            android:paddingBottom="24dp"
             android:orientation="vertical"
+            android:paddingBottom="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/llUpdateDownloadProgress">
@@ -200,19 +217,19 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/layout_padding_16dp"
                     android:layout_weight="1"
-                    android:text="@string/checking_for_update"/>
+                    android:text="@string/checking_for_update" />
 
             </LinearLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCancel"
+                style="@style/SweetButtonStyle.BorderedOutlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/text_color"
-                style="@style/MaterialButtonStyle.Bordered"
                 android:onClick="@{() -> fragment.dismiss()}"
                 android:text="@string/cancel"
-                android:textAllCaps="false" />
+                android:textAllCaps="false"
+                android:textColor="@color/text_color" />
 
         </LinearLayout>
 
@@ -223,21 +240,21 @@
             android:animateLayoutChanges="true"
             android:gravity="center"
             android:orientation="vertical"
-            android:visibility="gone"
             android:paddingBottom="24dp"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/llCheckingUpdate">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnOk"
+                style="@style/SweetButtonStyle.BorderedOutlined"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_padding_8dp"
-                android:textColor="@color/text_color"
-                style="@style/MaterialButtonStyle.Bordered"
                 android:onClick="@{() -> fragment.dismiss()}"
                 android:text="@string/ok"
-                android:textAllCaps="false" />
+                android:textAllCaps="false"
+                android:textColor="@color/text_color" />
 
         </LinearLayout>
 

diff --git a/SweetUpdate/src/main/res/values/sweet_play_update_styles.xml b/SweetUpdate/src/main/res/values/sweet_play_update_styles.xml
@@ -16,7 +16,7 @@
         <item name="cornerSize">50%</item>
     </style>
 
-    <style name="MaterialButtonStyle.Bordered" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="SweetButtonStyle.BorderedOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:layout_height">48dp</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.github.sweet.play.update.demo"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 34
-        versionName "1.34"
+        versionCode 2
+        versionName "1.1"
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/com/github/sweet/play/update/demo/MainActivity.kt b/app/src/main/java/com/github/sweet/play/update/demo/MainActivity.kt
@@ -31,7 +31,9 @@ class MainActivity : AppCompatActivity() {
         SweetPlayAppUpdaterBottomSheet.newInstant(
             "App Update Available",
             "We have fixed some issues and added some cool feature in this update",
-            R.drawable.ic_android_black_24dp
+            R.drawable.ic_android_black_24dp,
+            null,
+            R.drawable.shp_header_background
         ).apply { isCancelable = false }
             .show(supportFragmentManager, "Check Update")
     }

diff --git a/...in/res/drawable/shp_header_background.xml → ...in/res/drawable/shp_header_background.xml b/...in/res/drawable/shp_header_background.xml → ...in/res/drawable/shp_header_background.xml