Add hint about switching from pre-release to release by just opting o…

…ut and waiting.
GHT66 · Jun 4, 2024 · 3e33b3b · 3e33b3b
1 parent 983b5d8
commit 3e33b3b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/app/src/foss/res/values/strings.xml b/app/src/foss/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="nudge_betagoodbye_title">Version 1.0 🥳</string>
     <string name="nudge_betagoodbye_body">Thank you. We made it this far only together. Development will continue of course, but you can now switch to a release track.</string>
     <string name="nudge_betagoodbye_hint">This is already a normal version. Just opt out of testing and you will only receive release updates in the future.</string>
+    <string name="nudge_betagoodbye_reinstall_note">You can switch without reinstalling the app by leaving the testing program and waiting for the next release update. A normal update is possible once there is a release version newer than this pre-release.</string>
     <string name="nudge_betagoodbye_positive_action">Switch to release track</string>
     <string name="nudge_betagoodbye_negative_action">Keep getting pre-releases</string>
 </resources>
diff --git a/app/src/gplay/res/values/strings.xml b/app/src/gplay/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="nudge_betagoodbye_title">Version 1.0 🥳</string>
     <string name="nudge_betagoodbye_body">Thank you. We made it this far only together. Development will continue of course, but you can now install SD Maid without opting in for testing on Google Play.</string>
     <string name="nudge_betagoodbye_hint">You don\'t have to re-install the app. This is already a normal version. Just opt out of testing and you will only receive release updates in the future.</string>
+    <string name="nudge_betagoodbye_reinstall_note">You can switch without reinstalling the app by leaving the testing program and waiting for the next release update. A normal update is possible once there is a release version newer than this pre-release.</string>
     <string name="nudge_betagoodbye_positive_action">Leave testing programm</string>
     <string name="nudge_betagoodbye_negative_action">Keep testing</string>
 </resources>
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt
@@ -31,6 +31,7 @@ class BetaGoodbyeFragment : Fragment3(R.layout.beta_goodbye_fragment) {
         ui.stayBetaAction.setOnClickListener { vm.consentPrerelease(true) }
         ui.optOutAction.setOnClickListener { vm.consentPrerelease(false) }
         ui.alreadyProdContainer.isGone = BuildConfigWrap.BUILD_TYPE != BuildConfigWrap.BuildType.RELEASE
+        ui.stillBetaContainer.isGone = BuildConfigWrap.BUILD_TYPE != BuildConfigWrap.BuildType.BETA
         super.onViewCreated(view, savedInstanceState)
     }
 }
diff --git a/app/src/main/res/layout/beta_goodbye_fragment.xml b/app/src/main/res/layout/beta_goodbye_fragment.xml
@@ -61,6 +61,23 @@
                     android:text="@string/nudge_betagoodbye_hint" />
             </com.google.android.material.card.MaterialCardView>
 
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/still_beta_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:backgroundTint="?colorSecondaryContainer"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.BodyMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:text="@string/nudge_betagoodbye_reinstall_note" />
+            </com.google.android.material.card.MaterialCardView>
+
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"