Merge branch 'develop' into nikclayton-patch-1

tuskyapp · Jul 20, 2023 · 472287a · 472287a
2 parents 96721c3 + e4c2476
commit 472287a
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 28 deletions.
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt
@@ -40,7 +40,7 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
 import javax.inject.Inject
 
-class SearchActivity : BottomSheetActivity(), HasAndroidInjector, MenuProvider {
+class SearchActivity : BottomSheetActivity(), HasAndroidInjector, MenuProvider, SearchView.OnQueryTextListener {
     @Inject
     lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
@@ -91,8 +91,6 @@ class SearchActivity : BottomSheetActivity(), HasAndroidInjector, MenuProvider {
         searchViewMenuItem.expandActionView()
         val searchView = searchViewMenuItem.actionView as SearchView
         setupSearchView(searchView)
-
-        searchView.setQuery(viewModel.currentQuery, false)
     }
 
     override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
@@ -150,9 +148,23 @@ class SearchActivity : BottomSheetActivity(), HasAndroidInjector, MenuProvider {
         val pxBuffer = ((48 * 2) * resources.displayMetrics.density).toInt()
         searchView.maxWidth = pxScreenWidth - pxBuffer
 
+        // Keep text that was entered also when switching to a different tab (before the search is executed)
+        searchView.setOnQueryTextListener(this)
+        searchView.setQuery(viewModel.currentSearchFieldContent ?: "", false)
+
         searchView.requestFocus()
     }
 
+    override fun onQueryTextSubmit(query: String?): Boolean {
+        return false
+    }
+
+    override fun onQueryTextChange(newText: String?): Boolean {
+        viewModel.currentSearchFieldContent = newText
+
+        return false
+    }
+
     override fun androidInjector() = androidInjector
 
     companion object {

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
@@ -45,6 +45,7 @@ class SearchViewModel @Inject constructor(
 ) : ViewModel() {
 
     var currentQuery: String = ""
+    var currentSearchFieldContent: String? = null
 
     val activeAccount: AccountEntity?
         get() = accountManager.activeAccount

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/trending/viewmodel/TrendingViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/trending/viewmodel/TrendingViewModel.kt
@@ -82,22 +82,26 @@ class TrendingViewModel @Inject constructor(
 
         mastodonApi.trendingTags().fold(
             { tagResponse ->
-                val homeFilters = deferredFilters.await().getOrNull()?.filter { filter ->
-                    filter.context.contains(Filter.Kind.HOME.kind)
-                }
-                val tags = tagResponse
-                    .filter { tag ->
-                        homeFilters?.none { filter ->
-                            filter.keywords.any { keyword -> keyword.keyword.equals(tag.name, ignoreCase = true) }
-                        } ?: false
-                    }
-                    .sortedByDescending { tag -> tag.history.sumOf { it.uses.toLongOrNull() ?: 0 } }
-                    .toViewData()
 
-                val firstTag = tagResponse.first()
-                val header = TrendingViewData.Header(firstTag.start(), firstTag.end())
+                val firstTag = tagResponse.firstOrNull()
+                _uiState.value = if (firstTag == null) {
+                    TrendingUiState(emptyList(), LoadingState.LOADED)
+                } else {
+                    val homeFilters = deferredFilters.await().getOrNull()?.filter { filter ->
+                        filter.context.contains(Filter.Kind.HOME.kind)
+                    }
+                    val tags = tagResponse
+                        .filter { tag ->
+                            homeFilters?.none { filter ->
+                                filter.keywords.any { keyword -> keyword.keyword.equals(tag.name, ignoreCase = true) }
+                            } ?: false
+                        }
+                        .sortedByDescending { tag -> tag.history.sumOf { it.uses.toLongOrNull() ?: 0 } }
+                        .toViewData()
 
-                _uiState.value = TrendingUiState(listOf(header) + tags, LoadingState.LOADED)
+                    val header = TrendingViewData.Header(firstTag.start(), firstTag.end())
+                    TrendingUiState(listOf(header) + tags, LoadingState.LOADED)
+                }
             },
             { error ->
                 Log.w(TAG, "failed loading trending tags", error)

diff --git a/app/src/main/res/layout/fragment_view_thread.xml b/app/src/main/res/layout/fragment_view_thread.xml
@@ -37,8 +37,8 @@
 
                 <com.keylesspalace.tusky.view.BackgroundMessageView
                     android:id="@+id/statusView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_gravity="center"
                     android:visibility="gone" />
             </FrameLayout>

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
@@ -54,7 +54,7 @@
     <string name="action_compose">Creu</string>
     <string name="action_login">Mewngofnodi â Tusky</string>
     <string name="action_logout">Allgofnodi</string>
-    <string name="action_logout_confirm">Ydych chi\'n siŵr eich bod am allgofnodi o\'r cyfrif %1$s?</string>
+    <string name="action_logout_confirm">Ydych chi\'n siŵr eich bod am allgofnodi o\'r cyfrif %1$s\? Bydd hyn yn dileu\'r holl ddata lleol, gan gynnwys drafftiau a chyfeiriadau.</string>
     <string name="action_follow">Dilyn</string>
     <string name="action_unfollow">Dad-ddilyn</string>
     <string name="action_block">Rhwystro</string>
@@ -712,4 +712,14 @@
 \n
 \nI archwilio cyfrifon gallwch un ai eu darganfod o fewn un o\'r llinellau amser eraill. Er enghraifft, mae llinell amser eich enghraifft chi [iconics gmd_group]. Neu gallwch eu chwilio yn ôl eu henw [iconics gmd_search]; er enghraifft, chwilio am Tusky i ganfod ein cyfrif Mastodon.</string>
     <string name="pref_title_show_stat_inline">Dangos ystadegau postiadau mewn llinell amser</string>
-</resources>
+    <string name="pref_ui_text_size">Maint testun rhyngwyneb</string>
+    <string name="notification_listenable_worker_name">Gweithgaredd cefndirol</string>
+    <string name="notification_listenable_worker_description">Hysbysiadau pan fydd Tusky\'n gweithio\'n y cefndir</string>
+    <string name="notification_notification_worker">Yn estyn hysbysiadau…</string>
+    <string name="notification_prune_cache">Cynnal a chadw\'r storfan…</string>
+    <string name="error_missing_edits">Mae\'r gweinydd yn gwybod fod y postiad wedi ei olygu, ond nid oes ganddo gopi o\'r golygiadau, felly nid oes modd eu dangos i chi.
+\n
+\nHwn yw <a href="https://github.com/mastodon/mastodon/issues/25398">mater Mastodon #25398</a>.</string>
+    <string name="load_newest_notifications">Llwytho\'r hysbys diweddaraf</string>
+    <string name="compose_delete_draft">Dileu\'r drafft\?</string>
+</resources>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
@@ -468,7 +468,7 @@
     <string name="action_view_mutes">Cleachdaichean mùchte</string>
     <string name="action_view_bookmarks">Comharran-lìn</string>
     <string name="action_view_profile">Pròifil</string>
-    <string name="action_logout_confirm">A bheil thu cinnteach gu bheil thu airson clàradh a-mach às a’ chunntas %1$s\?</string>
+    <string name="action_logout_confirm">A bheil thu cinnteach gu bheil thu airson clàradh a-mach à %1$s\? Thèid gach dàta ionadail a’ chunntais a sguabadh às, a’ gabhail a-staigh nan dreachdan is roghainnean.</string>
     <string name="action_unfavourite">Thoir air falbh o na h-annsachdan</string>
     <string name="action_bookmark">Cuir ris na comharran-lìn</string>
     <string name="action_favourite">Cuir ris na h-annsachdan</string>

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
@@ -50,7 +50,7 @@
     <string name="action_block">Bloquear</string>
     <string name="action_unfollow">Deixar de seguir</string>
     <string name="action_follow">Seguir</string>
-    <string name="action_logout_confirm">Tes a certeza de que queres pechar sesión da conta %1$s\?</string>
+    <string name="action_logout_confirm">Tes a certeza de querer pechar a sesión %1$s\? Isto eliminará todos os datos locais da conta, incluíndo borradores e preferencias.</string>
     <string name="action_logout">Pechar sesión</string>
     <string name="action_login">Acceder con Tusky</string>
     <string name="action_compose">Redactar</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -60,7 +60,7 @@
     <string name="action_compose">Oluştur</string>
     <string name="action_login">Tusky ile giriş yap</string>
     <string name="action_logout">Oturumu kapat</string>
-    <string name="action_logout_confirm">Bu %1$s oturumu sonlandırmak istediğinizden emin misiniz\?</string>
+    <string name="action_logout_confirm">Bu %1$s\? oturumu sonlandırmak istediğinizden emin misiniz\?</string>
     <string name="action_follow">Takip et</string>
     <string name="action_unfollow">Takibi bırak</string>
     <string name="action_block">Engelle</string>

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -166,6 +166,7 @@
         <item>gab.com</item>
         <item>gab.ai</item>
         <item>spinster.xyz</item>
+        <item>truthsocial.com</item>
     </string-array>
 
     <string name="rick_roll_url">https://www.youtube.com/watch?v=dQw4w9WgXcQ</string>

diff --git a/app/src/test/java/com/keylesspalace/tusky/util/AbsoluteTimeFormatterTest.kt b/app/src/test/java/com/keylesspalace/tusky/util/AbsoluteTimeFormatterTest.kt
@@ -1,12 +1,35 @@
 package com.keylesspalace.tusky.util
 
+import org.junit.AfterClass
 import org.junit.Assert.assertEquals
+import org.junit.BeforeClass
 import org.junit.Test
 import java.time.Instant
-import java.util.Date
-import java.util.TimeZone
+import java.util.*
 
 class AbsoluteTimeFormatterTest {
+    companion object {
+        /** Default locale before this test started */
+        private lateinit var locale: Locale
+
+        /**
+         * Ensure the Locale is ENGLISH so that tests against literal strings like
+         * "Apr" later, even if the test host's locale is e.g. FRENCH which would
+         * normally report "avr.".
+         */
+        @BeforeClass
+        @JvmStatic
+        fun beforeClass() {
+            locale = Locale.getDefault()
+            Locale.setDefault(Locale.ENGLISH)
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun afterClass() {
+            Locale.setDefault(locale)
+        }
+    }
 
     private val formatter = AbsoluteTimeFormatter(TimeZone.getTimeZone("UTC"))
     private val now = Date.from(Instant.parse("2022-04-11T00:00:00.00Z"))

diff --git a/fastlane/metadata/android/fa/changelogs/112.txt b/fastlane/metadata/android/fa/changelogs/112.txt
@@ -0,0 +1,6 @@
+تاسکی ۲۳٫۰ بتا ۲
+
+رفع اشکال‌ها:
+
+- فروپاشی بالقوه هنگام ویرایش زمینه‌های نمایه
+- فهرست بافتار بزرگ هنگام ویرایش شرح تصاویر
diff --git a/fastlane/metadata/android/fa/changelogs/113.txt b/fastlane/metadata/android/fa/changelogs/113.txt
@@ -0,0 +1,15 @@
+تاسکی ۲۳٫۰
+
+ویژگی‌های جدید:
+
+- ترجیح جدید برای مقیاس متن میانای کاربری
+
+رفع اشکال‌ها:
+
+- ذخیرهٔ درست اطّلاعات حساب
+- «گرفتن» آگاهی‌ها روی افزاره‌های با نگارش اندروید کم‌تر از ۱۱
+- مشکل امکان فراموشی توانایی رونوشت و جای‌گذاری در زمینه‌های متنی اندروید
+- تجاوز نکردن از لیهٔ صفحه هنگام دیدن «تفاوت‌ها» در تاریخچهٔ ویرایش
+- فرونپاشیدن در صورت نبودن تاریخچهٔ ویرایش فرسته روی کارساز
+- نمایش درست اموجی‌های نامربّعی
+- فروپاشی احتمالی هنگام ویرایش زمینه‌های نمایه
diff --git a/fastlane/metadata/android/gl/changelogs/103.txt b/fastlane/metadata/android/gl/changelogs/103.txt
@@ -1,4 +1,4 @@
-Tusky 22.0
+Tusky 22.0 beta 1
 
 Características incluídas:
 

diff --git a/fastlane/metadata/android/sv/changelogs/112.txt b/fastlane/metadata/android/sv/changelogs/112.txt
@@ -0,0 +1,6 @@
+Tusky 23.0 beta 2
+
+Fixar:
+
+- Potentiell krasch vid redigering av profilfält
+- Överdimensionerad snabbmeny när du redigerar bildbeskrivningar
diff --git a/fastlane/metadata/android/vi/changelogs/111.txt b/fastlane/metadata/android/vi/changelogs/111.txt
@@ -0,0 +1,15 @@
+Tusky 23.0 beta 1
+
+Mới:
+
+- Tăng cỡ chữ
+
+Sửa:
+
+- Lưu đúng thông tin tài khoản
+- "đẩy" thông báo trên Android 11 trở xuống
+- Sửa lỗi Android quên copy/paste
+- Hiện "diffs" trong lịch sử sửa tút
+- Sửa lỗi crash
+- Thêm nút "Xóa" khi sửa bộ lọc
+- Hiện đúng emoji không vuông
diff --git a/fastlane/metadata/android/vi/changelogs/112.txt b/fastlane/metadata/android/vi/changelogs/112.txt
@@ -0,0 +1,6 @@
+Tusky 23.0 beta 2
+
+Sửa:
+
+- Sửa crash khi sửa hồ sơ
+- Mở rộng menu khi sửa mô tả hình ảnh
diff --git a/fastlane/metadata/android/vi/changelogs/113.txt b/fastlane/metadata/android/vi/changelogs/113.txt
@@ -0,0 +1,13 @@
+Tusky 23.0
+
+Mới:
+- Thu phóng chữ trên giao diện
+
+Sửa:
+- Lưu thông tin tài khoản chính xác
+- "đẩy" thông báo trên Android 11
+- Lỗi copy/paste không được
+- Xem lịch sử sửa tút
+- Không crash khi máy chủ của bạn không có lịch sử sửa
+- Hiện emoji không vuông chính xác
+- Lỗi crash khi sửa hồ sơ
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ autodispose = "2.1.1"
 bouncycastle = "1.70"
 conscrypt = "2.5.2"
 coroutines = "1.7.2"
-dagger = "2.46.1"
+dagger = "2.47"
 diffx = "1.1.1"
 emoji2 = "1.3.0"
 espresso = "3.5.1"