Merge branch 'main' into places-search-selected-position-design

wikimedia · Jul 11, 2024 · fe5190e · fe5190e
2 parents 9e3cb42 + 11ab3de
commit fe5190e
Show file tree

Hide file tree

Showing 94 changed files with 53 additions and 291 deletions.
diff --git a/.kotlin/sessions/kotlin-compiler-16343554820659244602.salive b/.kotlin/sessions/kotlin-compiler-16343554820659244602.salive
diff --git a/app/src/main/java/org/wikipedia/main/MainActivity.kt b/app/src/main/java/org/wikipedia/main/MainActivity.kt
@@ -42,10 +42,6 @@ class MainActivity : SingleFragmentActivity<MainFragment>(), MainFragment.Callba
         setImageZoomHelper()
         if (Prefs.isInitialOnboardingEnabled && savedInstanceState == null && !intent.hasExtra(
                 Constants.INTENT_EXTRA_PREVIEW_SAVED_READING_LISTS)) {
-            // Updating preference so the search multilingual tooltip
-            // is not shown again for first time users
-            Prefs.isMultilingualSearchTooltipShown = false
-
             // Use startActivityForResult to avoid preload the Feed contents before finishing the initial onboarding.
             onboardingLauncher.launch(InitialOnboardingActivity.newIntent(this))
         }

diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.kt b/app/src/main/java/org/wikipedia/main/MainFragment.kt
@@ -37,7 +37,6 @@ import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.BaseActivity
 import org.wikipedia.activity.FragmentUtil.getCallback
-import org.wikipedia.analytics.eventplatform.PlacesEvent
 import org.wikipedia.analytics.eventplatform.ReadingListsAnalyticsHelper
 import org.wikipedia.auth.AccountUtil
 import org.wikipedia.commons.FilePageActivity
@@ -186,7 +185,6 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
         downloadReceiver.register(requireContext(), downloadReceiverCallback)
         // reset the last-page-viewed timer
         Prefs.pageLastShown = 0
-        maybeShowPlacesTooltip()
     }
 
     override fun onDestroyView() {
@@ -570,19 +568,6 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
         }
     }
 
-    private fun maybeShowPlacesTooltip() {
-        if (Prefs.showOneTimePlacesMainNavOnboardingTooltip && Prefs.exploreFeedVisitCount > SHOW_PLACES_MAIN_NAV_TOOLTIP) {
-            enqueueTooltip {
-                PlacesEvent.logImpression("main_nav_tooltip")
-                FeedbackUtil.showTooltip(requireActivity(), binding.mainNavTabLayout.findViewById(NavTab.MORE.id),
-                    getString(R.string.places_nav_tab_tooltip_message), aboveOrBelow = true, autoDismiss = false, showDismissButton = true).setOnBalloonDismissListener {
-                    Prefs.showOneTimePlacesMainNavOnboardingTooltip = false
-                    PlacesEvent.logAction("dismiss_click", "main_nav_tooltip")
-                }
-            }
-        }
-    }
-
     private inner class PageChangeCallback : OnPageChangeCallback() {
         override fun onPageSelected(position: Int) {
             callback()?.onTabChanged(NavTab.of(position))
@@ -616,7 +601,6 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
     companion object {
         // Actually shows on the 3rd time of using the app. The Pref.incrementExploreFeedVisitCount() gets call after MainFragment.onResume()
         private const val SHOW_EDITS_SNACKBAR_COUNT = 2
-        private const val SHOW_PLACES_MAIN_NAV_TOOLTIP = 1
 
         fun newInstance(): MainFragment {
             return MainFragment().apply {

diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.kt b/app/src/main/java/org/wikipedia/page/PageActivity.kt
@@ -36,7 +36,6 @@ import org.wikipedia.activity.SingleWebViewActivity
 import org.wikipedia.analytics.eventplatform.ArticleLinkPreviewInteractionEvent
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
 import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
-import org.wikipedia.analytics.eventplatform.PlacesEvent
 import org.wikipedia.analytics.metricsplatform.ArticleLinkPreviewInteraction
 import org.wikipedia.auth.AccountUtil
 import org.wikipedia.commons.FilePageActivity
@@ -385,7 +384,6 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
     override fun onPageLoadComplete() {
         removeTransitionAnimState()
         maybeShowThemeTooltip()
-        maybeShowPlacesTooltip()
     }
 
     override fun onPageDismissBottomSheet() {
@@ -678,35 +676,6 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
             .show()
     }
 
-    private fun maybeShowPlacesTooltip() {
-        if (!Prefs.showOneTimePlacesPageOnboardingTooltip ||
-            pageFragment.page?.pageProperties?.geo == null || isTooltipShowing) {
-            return
-        }
-        enqueueTooltip {
-            FeedbackUtil.getTooltip(
-                this,
-                StringUtil.fromHtml(getString(R.string.places_article_menu_tooltip_message)),
-                arrowAnchorPadding = -DimenUtil.roundedDpToPx(7f),
-                topOrBottomMargin = -8,
-                aboveOrBelow = false,
-                autoDismiss = false,
-                showDismissButton = true
-            ).apply {
-                PlacesEvent.logImpression("article_more_tooltip")
-                setOnBalloonDismissListener {
-                    PlacesEvent.logAction("dismiss_click", "article_more_tooltip")
-                    isTooltipShowing = false
-                    Prefs.showOneTimePlacesPageOnboardingTooltip = false
-                }
-                isTooltipShowing = true
-                BreadCrumbLogEvent.logTooltipShown(this@PageActivity, binding.pageToolbarButtonShowOverflowMenu)
-                showAlignBottom(binding.pageToolbarButtonShowOverflowMenu)
-                setCurrentTooltip(this)
-            }
-        }
-    }
-
     private fun maybeShowThemeTooltip() {
         if (!Prefs.showOneTimeCustomizeToolbarTooltip) {
             return

diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.kt
@@ -25,6 +25,7 @@ import org.wikipedia.activity.FragmentUtil.getCallback
 import org.wikipedia.analytics.eventplatform.ArticleLinkPreviewInteractionEvent
 import org.wikipedia.analytics.eventplatform.PlacesEvent
 import org.wikipedia.analytics.metricsplatform.ArticleLinkPreviewInteraction
+import org.wikipedia.auth.AccountUtil
 import org.wikipedia.bridge.JavaScriptActionHandler
 import org.wikipedia.databinding.DialogLinkPreviewBinding
 import org.wikipedia.dataclient.page.PageSummary
@@ -204,7 +205,7 @@ class LinkPreviewDialog : ExtendedBottomSheetDialogFragment(), LinkPreviewErrorV
         popupMenu.inflate(R.menu.menu_link_preview)
         popupMenu.menu.findItem(R.id.menu_link_preview_add_to_list).isVisible = !viewModel.fromPlaces
         popupMenu.menu.findItem(R.id.menu_link_preview_share_page).isVisible = !viewModel.fromPlaces
-        popupMenu.menu.findItem(R.id.menu_link_preview_watch).isVisible = viewModel.fromPlaces
+        popupMenu.menu.findItem(R.id.menu_link_preview_watch).isVisible = viewModel.fromPlaces && AccountUtil.isLoggedIn
         popupMenu.menu.findItem(R.id.menu_link_preview_watch).title = getString(if (viewModel.isWatched) R.string.menu_page_unwatch else R.string.menu_page_watch)
         popupMenu.menu.findItem(R.id.menu_link_preview_open_in_new_tab).isVisible = viewModel.fromPlaces
         popupMenu.menu.findItem(R.id.menu_link_preview_view_on_map).isVisible = !viewModel.fromPlaces && viewModel.location != null

diff --git a/app/src/main/java/org/wikipedia/search/SearchFragment.kt b/app/src/main/java/org/wikipedia/search/SearchFragment.kt
@@ -160,26 +160,13 @@ class SearchFragment : Fragment(), SearchResultsFragment.Callback, RecentSearche
             binding.searchLanguageScrollView.setUpLanguageScrollTabData(app.languageState.appLanguageCodes, pos, this)
             binding.searchLangButton.visibility = View.GONE
         } else {
-            maybeShowMultilingualSearchTooltip()
             binding.searchLanguageScrollViewContainer.visibility = View.GONE
             binding.searchLangButton.visibility = View.VISIBLE
             initLangButton()
             recentSearchesFragment.onLangCodeChanged()
         }
     }
 
-    private fun maybeShowMultilingualSearchTooltip() {
-        if (Prefs.isMultilingualSearchTooltipShown) {
-            binding.searchLangButton.postDelayed({
-                if (isAdded) {
-                    FeedbackUtil.showTooltip(requireActivity(), binding.searchLangButton, getString(R.string.tool_tip_lang_button),
-                            aboveOrBelow = false, autoDismiss = false)
-                }
-            }, 500)
-            Prefs.isMultilingualSearchTooltipShown = false
-        }
-    }
-
     override fun onDestroyView() {
         binding.searchCabView.setOnCloseListener(null)
         binding.searchCabView.setOnQueryTextListener(null)

diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.kt b/app/src/main/java/org/wikipedia/settings/Prefs.kt
@@ -364,10 +364,6 @@ object Prefs {
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_reading_lists_first_time_sync, true)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_reading_lists_first_time_sync, value)
 
-    var isMultilingualSearchTooltipShown
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_multilingual_search_tooltip_shown, true)
-        set(enabled) = PrefsIoUtil.setBoolean(R.string.preference_key_multilingual_search_tooltip_shown, enabled)
-
     var shouldShowRemoveChineseVariantPrompt
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_remove_chinese_variant_prompt, true)
         set(enabled) = PrefsIoUtil.setBoolean(R.string.preference_key_show_remove_chinese_variant_prompt, enabled)
@@ -695,14 +691,6 @@ object Prefs {
         get() = PrefsIoUtil.getString(R.string.preference_key_places_wiki_code, WikipediaApp.instance.appOrSystemLanguageCode).orEmpty()
         set(value) = PrefsIoUtil.setString(R.string.preference_key_places_wiki_code, value)
 
-    var showOneTimePlacesPageOnboardingTooltip
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_places_page_onboarding_tooltip, true)
-        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_places_page_onboarding_tooltip, value)
-
-    var showOneTimePlacesMainNavOnboardingTooltip
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_places_main_nav_onboarding_tooltip_shown, true)
-        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_places_main_nav_onboarding_tooltip_shown, value)
-
     var placesLastLocationAndZoomLevel: Pair<Location, Double>?
         get() {
             // latitude|longitude|zoomLevel

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -391,8 +391,7 @@
   <string name="page_view_in_browser">اعرض الصفحة في المتصفح</string>
   <string name="tool_tip_toc_title">الوصول السريع لجدول المحتويات</string>
   <string name="tool_tip_toc_text">يمكنك الآن التحرك لليسار لفتح جدول المحتويات، وأيضا النقر والجر على زر الدحرجة هذا للقفز سريعا إلى أقسام مختلفة من مقالة.</string>
-  <string name="tool_tip_lang_button">يمكنك الآن البحث وقراءة لغات ويكيبيديا المتعددة في التطبيق.\n\nاضغط على الأيقونة لإضافة المزيد من اللغات.</string>
-  <string name="error_response_malformed">الاستجابة من الملقم لم تكن مهيأة بشكل صحيح.</string>
+    <string name="error_response_malformed">الاستجابة من الملقم لم تكن مهيأة بشكل صحيح.</string>
   <string name="error_unknown">حدث خطأ غير معروف.</string>
   <string name="format_error_server_message">الرسالة: \"%s\"</string>
   <string name="address_copied">نُسخ المسار إلى الحافظة.</string>

diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
@@ -282,8 +282,7 @@
   <string name="page_view_in_browser">Ver la páxina nel navegador</string>
   <string name="tool_tip_toc_title">Accesu rápidu a la tabla de conteníu</string>
   <string name="tool_tip_toc_text">Agora pués esmucir a la izquierda p\'abrir la tabla de conteníu, y tamién tocar y abasnar esti botón de desplazamientu para saltar rápido a distintes secciones d\'un artículu.</string>
-  <string name="tool_tip_lang_button">Agora puedes buscar y lleer Wikipedia en distintos idiomes na app.\n\n\nToca l\'iconu p\'añadir más idiomes.</string>
-  <string name="error_response_malformed">La respuesta del sirvidor nun tenía un formatu correutu.</string>
+    <string name="error_response_malformed">La respuesta del sirvidor nun tenía un formatu correutu.</string>
   <string name="error_unknown">Hebo un error desconocíu.</string>
   <string name="format_error_server_message">Mensaxe: «%s»</string>
   <string name="address_copied">Direición copiada al cartafueyu.</string>

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -351,8 +351,7 @@
   <string name="page_view_in_browser">Brauzerdə göstər</string>
   <string name="tool_tip_toc_title">Mündəricat</string>
   <string name="tool_tip_toc_text">İndi məzmunu açmaq üçün sola sürüşdürə və eyni zamanda bir məqalənin fərqli hissələrinə sürətlə keçmək üçün bu sürüşdürücü düyməsini vurub sürükləyə bilərsiniz.</string>
-  <string name="tool_tip_lang_button">Artıq bir çox Vikipediya dillərində axtarış edib oxuya bilərsiniz.\n\nDaha çox dil əlavə etmək üçün ikonaya toxunun.</string>
-  <string name="error_response_malformed">Serverdən gələn cavab düzgün formatda deyil.</string>
+    <string name="error_response_malformed">Serverdən gələn cavab düzgün formatda deyil.</string>
   <string name="error_unknown">Bilinməyən bir xəta yarandı.</string>
   <string name="format_error_server_message">Mesaj: \"%s\"</string>
   <string name="address_copied">Ünvan kopyalandı.</string>

diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -347,8 +347,7 @@
   <string name="page_view_in_browser">Prikaži stranicu u pregledaču</string>
   <string name="tool_tip_toc_title">Sadržaj brzog pristupa</string>
   <string name="tool_tip_toc_text">Sada možete prevlačiti ulevo da biste otvorili sadržaj, a zatim dodirnuti i prevući dugme ovog pomerača da biste brzo prešli na druge odeljke članka.</string>
-  <string name="tool_tip_lang_button">Sada možete da pretražujete i čitate Vikipediju na više jezika u aplikaciji.\n\n\nDodirnite ikonu da biste dodali još jezika.</string>
-  <string name="error_response_malformed">Odgovor servera nije ispravno formatiran.</string>
+    <string name="error_response_malformed">Odgovor servera nije ispravno formatiran.</string>
   <string name="error_unknown">Došlo je do nepoznate greške.</string>
   <string name="format_error_server_message">Poruka: „%s”</string>
   <string name="address_copied">Adresa je kopirana u ostavu.</string>

diff --git a/app/src/main/res/values-b+tt+Cyrl/strings.xml b/app/src/main/res/values-b+tt+Cyrl/strings.xml
@@ -351,8 +351,7 @@
   <string name="page_view_in_browser">Браузердагы битне карарга</string>
   <string name="tool_tip_toc_title">Мәкалә исеменә тиз керү</string>
   <string name="tool_tip_toc_text">Сез мәкаләнең исемен ачар, шулай ук төрле бүлекләренә тиз арада күчү өчен, әлеге әйләндерү төймәсенә басып һәм күчереп, сул кулыгыз белән сулга таба йөртә аласыз.</string>
-  <string name="tool_tip_lang_button">Хәзер сез кушымтада Википедиянең берничә телендә эзли һәм укый аласыз.\n\nӨстәмә телләр өстәр өчен тамгага басыгыз.</string>
-  <string name="error_response_malformed">Сервер җавабы дөрес форматланмаган.</string>
+    <string name="error_response_malformed">Сервер җавабы дөрес форматланмаган.</string>
   <string name="error_unknown">Билгесез хата килеп чыкты.</string>
   <string name="format_error_server_message">Хәбәр: «%s»</string>
   <string name="address_copied">Адрес алмашу буферына күчерелгән.</string>

diff --git a/app/src/main/res/values-ba/strings.xml b/app/src/main/res/values-ba/strings.xml
@@ -369,8 +369,7 @@
   <string name="page_view_in_browser">Браузерҙа битте ҡарау</string>
   <string name="tool_tip_toc_title">Йөкмәткегә тиҙ инеү</string>
   <string name="tool_tip_toc_text">Һеҙ, йөкмәткене асыу өсөн, бармаҡ менән экранды һулға күсерә һәм мәҡәләнең төрлө бүлектәренә тиҙ күсеү өсөн слайдерҙы тотоп әйләндерә алаһығыҙ.</string>
-  <string name="tool_tip_lang_button">Ҡушымтала Википедияның бер нисә телендә эҙләй һәм уҡый алаһығыҙ.\n\n\nКүберәк тел өҫтәү өсөн билдәгә баҫығыҙ.</string>
-  <string name="error_response_malformed">Серверҙың яуабы яңылыш форматланған</string>
+    <string name="error_response_malformed">Серверҙың яуабы яңылыш форматланған</string>
   <string name="error_unknown">Билдәһеҙ хата барлыҡҡа килде.</string>
   <string name="format_error_server_message">Хәбәр: «%s»</string>
   <string name="address_copied">Адрес алмашыу буферына күсерелгән</string>

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
@@ -383,7 +383,6 @@
   <string name="page_view_in_browser">Прагляд старонкі ў браўзеры</string>
   <string name="tool_tip_toc_title">Хуткі доступ да зместу</string>
   <string name="tool_tip_toc_text">Цяпер вы можаце правесці пальцам улева, каб адкрыць змест, а таксама націснуць і перацягнуць гэтую кнопку скролера, каб хутка пераходзіць да розных раздзелаў артыкула.</string>
-  <string name="tool_tip_lang_button">Цяпер вы можаце шукаць і чытаць на некалькіх мовах Вікіпедыі ў дадатку.\n\n\n\nНацісніце на значок, каб дадаць больш моў.</string>
   <string name="error_response_malformed">Адказ сервера быў некарэктна адфарматаваны.</string>
   <string name="error_unknown">Адбылася невядомая памылка.</string>
   <string name="format_error_server_message">Паведамленне: \"%s\"</string>
@@ -1767,8 +1766,6 @@
   <string name="places_filter_title">Фільтраваць па мовам</string>
   <string name="places_toggle_buttons_map">Мапа</string>
   <string name="places_toggle_buttons_list">Спіс</string>
-  <string name="places_nav_tab_tooltip_message">Даследуйце артыкулы Вікіпедыі вакол вас з дапамогаю Месцаў</string>
-  <string name="places_article_menu_tooltip_message">Націсніце «Паглядзець на мапе», каб даведацца пра месцазнаходжанне гэтага артыкула</string>
   <string name="places_survey_very_satisfied_option">Вельмі задаволены</string>
   <string name="places_survey_very_unsatisfied_option">Вельмі незадаволены</string>
   <string name="places_survey_dialog_title">Дапамажыце палепшыць \"Месцы\"</string>

diff --git a/app/src/main/res/values-bew/strings.xml b/app/src/main/res/values-bew/strings.xml
@@ -345,8 +345,7 @@
   <string name="page_view_in_browser">Deleng halaman di pengubek</string>
   <string name="tool_tip_toc_title">Aksès lekas daptar isi</string>
   <string name="tool_tip_toc_text">Lu sekarang bisa mingsèrin ke kèbot bakal ngebuka daptar isi, èn juga\' teken-tarik di ni tombol pengglincir biar lekas loncat ke bagèan laèn deri makalah.</string>
-  <string name="tool_tip_lang_button">Lu sekarang bisa nyari èn ngebaca dalem banyak basa Wikipédi di aplikasi.\n\nTeken lambang bakal nambah lebi banyak basa.</string>
-  <string name="error_response_malformed">Waroan deri pengladèn kaga\' bener kepormatnya.</string>
+    <string name="error_response_malformed">Waroan deri pengladèn kaga\' bener kepormatnya.</string>
   <string name="error_unknown">Ada kengabluan nyang kaga\' ditauin kejadian.</string>
   <string name="format_error_server_message">Pesen: \"%s\"</string>
   <string name="address_copied">Aderès dijiplak ke papan jalan.</string>