Fix: rename string name because it is overriding the in module resource

therajanmaurya · Nov 26, 2020 · 5dee451 · 5dee451
1 parent d202025
commit 5dee451
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdater.kt b/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdater.kt
@@ -134,7 +134,7 @@ class SweetPlayAppUpdater constructor(private val context: Activity, private val
             }
             InstallStatus.DOWNLOADED -> {
                 btnDownloadInstall.text = context.getString(R.string.install)
-                tvUpdateAvailable.text = context.getString(R.string.app_update_downloaded)
+                tvUpdateAvailable.text = context.getString(R.string.sweet_app_update_downloaded)
                 llDownloadUpdate.visibility = View.VISIBLE
                 llUpdateAction.visibility = View.VISIBLE
                 llUpdateDownloadProgress.visibility = View.GONE

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
@@ -167,7 +167,7 @@ class SweetPlayAppUpdaterBottomSheet(
             }
             InstallStatus.DOWNLOADED -> {
                 binding.btnDownloadInstall.text = getString(R.string.install)
-                binding.tvUpdateAvailable.text = getString(R.string.app_update_downloaded)
+                binding.tvUpdateAvailable.text = getString(R.string.sweet_app_update_downloaded)
                 binding.llUpdateAction.visibility = View.VISIBLE
                 binding.llUpdateDownloadProgress.visibility = View.GONE
                 binding.llNoUpdateAvailable.visibility = View.GONE

diff --git a/SweetUpdate/src/main/res/layout/layout_sweet_update.xml b/SweetUpdate/src/main/res/layout/layout_sweet_update.xml
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
-                    android:text="@string/app_update_available"
+                    android:text="@string/sweet_app_update_available"
                     android:textColor="@color/colorPrimary"
                     android:textStyle="bold" />
 
@@ -57,7 +57,7 @@
                     style="@style/Base.TextAppearance.AppCompat.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/app_update_available_message"
+                    android:text="@string/sweet_app_update_available_message"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size_14sp" />
 

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
@@ -59,7 +59,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageView"
-            tools:text="@string/app_update_available" />
+            tools:text="@string/sweet_app_update_available" />
 
         <TextView
             android:id="@+id/tvUpdateAvailableMessage"
@@ -73,7 +73,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvUpdateAvailable"
-            tools:text="@string/app_update_available_message" />
+            tools:text="@string/sweet_app_update_available_message" />
 
         <View
             android:id="@+id/view"

diff --git a/SweetUpdate/src/main/res/values/strings.xml b/SweetUpdate/src/main/res/values/strings.xml
@@ -3,9 +3,9 @@
     <string name="download">Download</string>
     <string name="later">Later</string>
     <string name="install">Install</string>
-    <string name="app_update_available">Update Available</string>
-    <string name="app_update_downloaded">Update Downloaded</string>
-    <string name="app_update_available_message">We have fixed some issues and added some cool feature in this update</string>
+    <string name="sweet_app_update_available">Update Available</string>
+    <string name="sweet_app_update_downloaded">Update Downloaded</string>
+    <string name="sweet_app_update_available_message">We have fixed some issues and added some cool feature in this update</string>
     <string name="downloading">Downloading…</string>
     <string name="installing_update">Installing Updates</string>
     <string name="in_app_update">In-App-Update</string>