Merge branch 'main' into whichCameFirst_design

app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt

@@ -35,7 +35,6 @@ import org.wikipedia.edit.EditTags
 import org.wikipedia.login.LoginActivity
 import org.wikipedia.notifications.AnonymousNotificationHelper
 import org.wikipedia.settings.Prefs
-import org.wikipedia.suggestededits.SuggestedEditsSurvey
 import org.wikipedia.suggestededits.SuggestionsActivity
 import org.wikipedia.util.DeviceUtil
 import org.wikipedia.util.FeedbackUtil
@@ -87,9 +86,6 @@ class DescriptionEditFragment : Fragment() {
         if (!AccountUtil.isLoggedIn) {
             Prefs.incrementTotalAnonDescriptionsEdited()
         }
-        if (viewModel.invokeSource == InvokeSource.SUGGESTED_EDITS) {
-            SuggestedEditsSurvey.onEditSuccess()
-        }
         Prefs.lastDescriptionEditTime = Date().time
         Prefs.isSuggestedEditsReactivationPassStageOne = false
         binding.fragmentDescriptionEditView.setSaveState(false)

app/src/main/java/org/wikipedia/settings/Prefs.kt

@@ -381,18 +381,6 @@ object Prefs {
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_description_edit_success_prompt, true)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_description_edit_success_prompt, value)
 
-    var suggestedEditsCountForSurvey
-        get() = PrefsIoUtil.getInt(R.string.preference_key_suggested_edits_count_for_survey, 0)
-        set(count) = PrefsIoUtil.setInt(R.string.preference_key_suggested_edits_count_for_survey, count)
-
-    var suggestedEditsSurveyClicked
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_suggested_edits_survey_clicked, false)
-        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_suggested_edits_survey_clicked, value)
-
-    var showSuggestedEditsSurvey
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_suggested_edits_survey, false)
-        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_suggested_edits_survey, value)
-
     var showSuggestedEditsTooltip
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_suggested_edits_tooltip, true)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_suggested_edits_tooltip, value)

app/src/main/res/values-qq/strings.xml

@@ -1016,8 +1016,6 @@
   <string name="suggested_edits_feed_card_add_image_caption">Suggested edits feed card call-to-action text for adding image captions</string>
   <string name="suggested_edits_feed_card_translate_image_caption">Suggested edits feed card call-to-action text for translating image captions. %s represents the language into which the image caption needs to be translated</string>
   <string name="suggested_edits_feed_card_add_image_tags">Suggested edits feed card call-to-action text for adding image depicts.</string>
-  <string name="suggested_edits_snackbar_survey_text">One-time text shown to users when they submit a successful suggested edit, requesting them to take a survey.</string>
-  <string name="suggested_edits_snackbar_survey_action_text">Button label on the snackbar shown to users when they submit a successful suggested edit, requesting them to take a survey.</string>
   <string name="suggested_edits_task_action_text_add">Button label for suggested edits task add action\n\n{{Identical|Add}}</string>
   <string name="suggested_edits_task_action_text_translate">Button label for suggested edits task translate action\n\n{{Identical|Translate}}</string>
   <string name="suggested_edits_image_captions">Suggested Edits image captions task title.\n\nAppears in a box above {{msg-wm|Wikipedia-android-strings-suggested edits image captions task detail}}.\n\nAppears in the same screen as and formatted similarly to:\n* {{msg-wm|Wikipedia-android-strings-description edit tutorial title descriptions}}\n* {{msg-wm|Wikipedia-android-strings-suggested edits image tags}}</string>
@@ -1765,4 +1763,7 @@
   <string name="on_this_day_game_turn_on_notification_dialog_negative_btn_label">Negative button label of a popup dialog for turning off notifications about the daily game.</string>
   <string name="on_this_day_game_notification_turned_off_snackbar_message">Snackbar message when user choose to turn off notifications.</string>
   <string name="on_this_day_game_notification_turned_on_snackbar_message">Snackbar message when user choose to turn on notifications.</string>
+  <string name="on_this_day_game_notification_text">Text for notification when new game is ready to play.</string>
+  <string name="on_this_day_game_report_email_subject">Subject heading for sending a report about a problem with the Wikipedia games feature.</string>
+  <string name="on_this_day_game_report_email_body">Body of email for sending a report about a problem with the Wikipedia games feature.</string>
 </resources>

app/src/main/res/values/preference_keys.xml

@@ -91,9 +91,6 @@
     <string name="preference_key_history_offline_articles_toast">historyOfflineArticlesToast</string>
     <string name="preference_key_logged_out_in_background">loggedOutInBackground</string>
     <string name="preference_key_show_description_edit_success_prompt">showDescriptionEditSuccessPrompt</string>
-    <string name="preference_key_suggested_edits_count_for_survey">surveyShownCount</string>
-    <string name="preference_key_suggested_edits_survey_clicked">suggestedEditsSurveyClicked</string>
-    <string name="preference_key_show_suggested_edits_survey">showSuggestedEditsSurvey</string>
     <string name="preference_key_show_suggested_edits_tooltip">showSuggestedEditsTooltip</string>
     <string name="preference_key_visited_article_page">hasVisitedArticlePage</string>
     <string name="preference_key_match_system_theme">matchSystemTheme</string>

app/src/main/res/values/strings.xml

@@ -1030,8 +1030,6 @@
     <string name="suggested_edits_feed_card_add_image_caption">Add image caption</string>
     <string name="suggested_edits_feed_card_translate_image_caption">Add image caption (%s)</string>
     <string name="suggested_edits_feed_card_add_image_tags">Add image tags</string>
-    <string name="suggested_edits_snackbar_survey_text">How was your editing experience? Please take a moment to fill out the survey about in-app editing.</string>
-    <string name="suggested_edits_snackbar_survey_action_text">Take Survey</string>
     <string name="suggested_edits_task_action_text_add">Add</string>
     <string name="suggested_edits_task_action_text_translate">Translate</string>
     <string name="suggested_edits_image_captions">Image captions</string>
@@ -1830,8 +1828,8 @@
     <string name="on_this_day_game_stats_streak">Current streak</string>
     <string name="on_this_day_game_result_subtitle">Articles referenced in today\'s game</string>
     <string name="on_this_day_game_menu_notifications">Game notifications</string>
-    <string name="on_this_day_game_menu_info">About this game</string>
-    <string name="on_this_day_game_menu_feedback">Report a bug</string>
+    <string name="on_this_day_game_menu_info">Learn more</string>
+    <string name="on_this_day_game_menu_feedback">Problem with feature</string>
     <string name="on_this_day_game_share_text">I\'m playing \"What came first?\" a daily trivia game on the Wikipedia Android app %s</string>
     <string name="on_this_day_game_article_read_button">Read article</string>
     <string name="on_this_day_game_article_related_event_title">Event related to this article</string>
@@ -1847,4 +1845,7 @@
     <string name="on_this_day_game_turn_on_notification_dialog_negative_btn_label">Keep them off</string>
     <string name="on_this_day_game_notification_turned_off_snackbar_message">Game notifications off.</string>
     <string name="on_this_day_game_notification_turned_on_snackbar_message">Game notifications on.</string>
+    <string name="on_this_day_game_notification_text">Today\'s game of \"Which came first?\" is ready to play.</string>
+    <string name="on_this_day_game_report_email_subject">Issue Report - Wikipedia games</string>
+    <string name="on_this_day_game_report_email_body">I have encountered a problem with the Wikipedia games feature:\n- [Describe specific problem]\n\nThe behavior I would like to see is:\n- [Describe proposed solution]</string>
 </resources>

app/src/main/res/values/strings_no_translate.xml

@@ -6,7 +6,6 @@
     <!-- URLs -->
     <string name="support_email">[email protected]</string>
     <string name="donate_url">https://donate.wikimedia.org/?utm_medium=WikipediaApp&amp;utm_campaign=Android&amp;utm_source=appmenu&amp;uselang=%1$s&amp;app_version=%2$s</string>
-    <string name="suggested_edits_survey_url">@null</string>
     <string name="talk_pages_survey_url">https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/Android/Communication/UsertestingOctober2021</string>
     <string name="survey_privacy_policy_url">https://foundation.wikimedia.org/wiki/Legal:Wikipedia_Android_App_Onboarding_Survey_Privacy_Statement</string>
     <string name="image_captions_style_url">https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Images</string>
@@ -22,7 +21,6 @@
     <string name="donate_tax_url">https://donate.wikimedia.org/wiki/Special:LandingCheck?landing_page=Tax_deductibility&amp;basic=true</string>
     <string name="donate_email">[email protected]</string>
     <string name="donor_privacy_policy_url">https://foundation.wikimedia.org/wiki/Policy:Donor_privacy_policy</string>
-    <string name="contributions_dashboard_wiki_url">https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/Android/Private_Donor_Recognition_Experiment#Summary</string>
 
     <!-- Accounts -->
     <string name="account_name">@string/wikimedia</string>

app/src/main/res/xml/developer_preferences.xml

@@ -358,9 +358,6 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/preferences_developer_suggested_edits_category">
-        <org.wikipedia.settings.SwitchPreferenceMultiLine
-            android:key="@string/preference_key_show_suggested_edits_survey"
-            android:title="@string/preference_key_show_suggested_edits_survey" />
 
         <org.wikipedia.settings.SwitchPreferenceMultiLine
             android:key="@string/preference_key_show_suggested_edits_tooltip"

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 androidPluginAnnotationV9 = "3.0.2"
 androidSdk = "11.8.0"
 appcompat = "1.7.0"
-balloon = "1.6.11"
+balloon = "1.6.12"
 browser = "1.8.0"
 commonsLang3 = "3.17.0"
 constraintlayout = "2.2.0"