feat: promote new study screen to public testing

Author: BrayanDSO

AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerTest.kt

@@ -217,7 +217,7 @@ class ReviewerTest : InstrumentedTest() {
     }
 
     private fun disableNewReviewer() {
-        val newReviewerPrefKey = testContext.getString(R.string.new_reviewer_pref_key)
+        val newReviewerPrefKey = testContext.getString(R.string.new_reviewer_options_key)
         val prefs = testContext.sharedPrefs()
         val isUsingNewReviewer = prefs.getBoolean(newReviewerPrefKey, false)
         if (!isUsingNewReviewer) return

AnkiDroid/src/main/java/com/ichi2/anki/preferences/DevOptionsFragment.kt

@@ -190,13 +190,6 @@ class DevOptionsFragment : SettingsFragment() {
             ActivityCompat.recreate(requireActivity())
             true
         }
-
-        requirePreference<Preference>(R.string.new_reviewer_pref_key).setOnPreferenceChangeListener { pref, newValue ->
-            val boolValue = newValue as? Boolean ?: return@setOnPreferenceChangeListener false
-            pref.sharedPreferences?.edit { putBoolean("newReviewerOptions", boolValue) }
-            ActivityCompat.recreate(requireActivity())
-            true
-        }
     }
 
     /**

AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt

@@ -32,7 +32,6 @@ import com.ichi2.anki.reviewreminders.ReviewReminderScope
 import com.ichi2.anki.reviewreminders.ScheduleReminders
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.internationalization.toSentenceCase
-import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.compat.CompatHelper
 import com.ichi2.preferences.HeaderPreference
 import com.ichi2.utils.AdaptionUtil
@@ -59,9 +58,6 @@ class HeaderFragment : SettingsFragment() {
         requirePreference<Preference>(R.string.pref_dev_options_screen_key)
             .isVisible = Prefs.isDevOptionsEnabled
 
-        requirePreference<HeaderPreference>(R.string.new_reviewer_options_key)
-            .isVisible = sharedPrefs().getBoolean(getString(R.string.new_reviewer_pref_key), false)
-
         requirePreference<HeaderPreference>(R.string.pref_review_reminders_screen_key)
             .setOnPreferenceClickListener {
                 Timber.i("HeaderFragment:: edit review reminders button pressed")

AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt

@@ -288,8 +288,7 @@ object Prefs {
         get() = getBoolean(R.string.dev_options_enabled_by_user_key, false) || BuildConfig.DEBUG
         set(value) = putBoolean(R.string.dev_options_enabled_by_user_key, value)
 
-    val isNewStudyScreenEnabled: Boolean
-        get() = getBoolean(R.string.new_reviewer_pref_key, false) && getBoolean(R.string.new_reviewer_options_key, false)
+    val isNewStudyScreenEnabled by booleanPref(R.string.new_reviewer_options_key, false)
 
     val devIsCardBrowserFragmented: Boolean
         get() = getBoolean(R.string.dev_card_browser_fragmented, false)

AnkiDroid/src/main/res/values/preferences.xml

@@ -211,7 +211,6 @@
     <string name="pref_lock_database_key">debug_lock_database</string>
     <string name="pref_corrupt_fsrs_params">debug_corrupt_fsrs_params</string>
     <string name="new_congrats_screen_pref_key">new_congrats_screen</string>
-    <string name="new_reviewer_pref_key">newReviewer</string>
     <string name="new_reviewer_options_key">newReviewerOptions</string>
     <string name="pref_browser_find_replace">browserFindReplace</string>
     <string name="pref_new_review_reminders">newReviewReminders</string>

AnkiDroid/src/main/res/xml/preference_headers.xml

@@ -36,6 +36,15 @@
         app:summaryEntries="@array/general_summary_entries">
     </com.ichi2.preferences.HeaderPreference>
 
+
+    <com.ichi2.preferences.HeaderPreference
+        android:fragment="com.ichi2.anki.preferences.ReviewerOptionsFragment"
+        android:title="@string/new_study_screen"
+        android:icon="@drawable/ic_cards_star"
+        android:key="@string/new_reviewer_options_key"
+        app:summaryEntries="@array/study_screen_summary_entries"
+        />
+
     <!-- Reviewing Preferences -->
     <com.ichi2.preferences.HeaderPreference
         android:fragment="com.ichi2.anki.preferences.ReviewingSettingsFragment"
@@ -115,14 +124,6 @@
         app:summaryEntries="@array/advanced_summary_entries">
     </com.ichi2.preferences.HeaderPreference>
 
-    <com.ichi2.preferences.HeaderPreference
-        android:fragment="com.ichi2.anki.preferences.ReviewerOptionsFragment"
-        android:title="@string/new_study_screen"
-        android:icon="@drawable/ic_cards_star"
-        android:key="@string/new_reviewer_options_key"
-        app:summaryEntries="@array/study_screen_summary_entries"
-        />
-
     <com.ichi2.preferences.HeaderPreference
         android:key="@string/pref_dev_options_screen_key"
         android:title="@string/pref_cat_dev_options"

AnkiDroid/src/main/res/xml/preferences_dev_options.xml

@@ -99,10 +99,6 @@
         android:title="Work in progress"
         android:summary="Only for testing. Not suited for use. Don't create reports about them">
 
-        <SwitchPreferenceCompat
-            android:title="@string/new_study_screen"
-            android:key="@string/new_reviewer_pref_key"
-            android:defaultValue="false"/>
         <SwitchPreferenceCompat
             android:title="[Tablet] Side-by-side browser and editor"
             android:key="@string/dev_card_browser_fragmented"

AnkiDroid/src/main/res/xml/preferences_reviewer.xml

@@ -6,11 +6,6 @@
     android:title="@string/new_study_screen"
     >
 
-    <com.ichi2.preferences.HtmlHelpPreference
-        android:summary="The new study screen is still a WIP developer option with features under development, so please don't create reports about it. The message below requesting feedback only exists at the moment for it to get translated."
-        search:ignore="true"
-        />
-
     <com.ichi2.preferences.HtmlHelpPreference
         android:summary="@string/new_study_screen_summ"
         app:substitution1="@string/link_anki_forum_ankidroid"
@@ -21,7 +16,7 @@
     <SwitchPreferenceCompat
         android:key="@string/new_reviewer_options_key"
         android:title="@string/new_study_screen"
-        android:defaultValue="true"
+        android:defaultValue="false"
         search:ignore="true"
         />