From fde23f25d209778736f89c44bb0a3fb837c615f4 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 7 Feb 2020 20:23:36 +0100 Subject: [PATCH 01/55] fix mixup of search params in SearchDataSource.loadRange (#1666) --- .../components/search/adapter/SearchDataSource.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt index f02038db..f170f35e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt @@ -62,7 +62,7 @@ class SearchDataSource( resolve = true, limit = params.requestedLoadSize, offset = 0, - following =false) + following = false) .subscribe( { data -> val res = parser(data) @@ -84,10 +84,16 @@ class SearchDataSource( override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback) { networkState.postValue(NetworkState.LOADING) retry = null - if(source.exhausted) { + if (source.exhausted) { return callback.onResult(emptyList()) } - mastodonApi.searchObservable(searchType.apiParameter, searchRequest, true, params.loadSize, params.startPosition, false) + mastodonApi.searchObservable( + query = searchRequest, + type = searchType.apiParameter, + resolve = true, + limit = params.loadSize, + offset = params.startPosition, + following = false) .subscribe( { data -> // Working around Mastodon bug where exact match is returned no matter @@ -101,7 +107,7 @@ class SearchDataSource( } else { parser(data) } - if(res.isEmpty()) { + if (res.isEmpty()) { source.exhausted = true } callback.onResult(res) From 88b8eca16aac9399a727f03261026b91d910c293 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 7 Feb 2020 20:23:51 +0100 Subject: [PATCH 02/55] fix crash when Account.displayName is null (#1667) --- app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt | 2 +- .../tusky/components/conversation/ConversationEntity.kt | 2 +- app/src/main/java/com/keylesspalace/tusky/entity/Account.kt | 4 ++-- .../com/keylesspalace/tusky/repository/TimelineRepository.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index d2868631..4a1caaa2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -458,7 +458,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI loadAvatar(movedAccount.avatar, accountMovedAvatar, avatarRadius, animateAvatar) - accountMovedText.text = getString(R.string.account_moved_description, movedAccount.displayName) + accountMovedText.text = getString(R.string.account_moved_description, movedAccount.name) // this is necessary because API 19 can't handle vector compound drawables val movedIcon = ContextCompat.getDrawable(this, R.drawable.ic_briefcase)?.mutate() diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt index a59df12b..7c4ed108 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt @@ -166,7 +166,7 @@ fun Account.toEntity() = ConversationAccountEntity( id, username, - displayName, + displayName.orEmpty(), avatar, emojis ?: emptyList() ) diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt index 71518573..62990758 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt @@ -31,7 +31,7 @@ data class Account( val id: String, @SerializedName("username") val localUsername: String, @SerializedName("acct") val username: String, - @SerializedName("display_name") val displayName: String, + @SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract val note: @WriteWith() Spanned, val url: String, val avatar: String, @@ -49,7 +49,7 @@ data class Account( ) : Parcelable { val name: String - get() = if (displayName.isEmpty()) { + get() = if (displayName.isNullOrEmpty()) { localUsername } else displayName diff --git a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt index 7cdc9ac9..06c001c9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt +++ b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt @@ -298,7 +298,7 @@ fun Account.toEntity(accountId: Long, gson: Gson): TimelineAccountEntity { timelineUserId = accountId, localUsername = localUsername, username = username, - displayName = displayName, + displayName = displayName.orEmpty(), url = url, avatar = avatar, emojis = gson.toJson(emojis), From 035329fe4c89c71be2e2ac458b253997cb3c1d8c Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 7 Feb 2020 20:24:17 +0100 Subject: [PATCH 03/55] revert colorPrimaryDark back for the dark theme (#1669) --- app/src/main/res/values-night/theme_colors.xml | 2 +- app/src/main/res/values/colors.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml index 133dfbfc..03fc6a06 100644 --- a/app/src/main/res/values-night/theme_colors.xml +++ b/app/src/main/res/values-night/theme_colors.xml @@ -2,7 +2,7 @@ @color/tusky_grey_30 - @color/tusky_grey_10 + @color/tusky_grey_25 @color/tusky_grey_20 @color/tusky_grey_10 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 81c5b7ed..9bcff9f2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,7 @@ #070b14 #16191f #282c37 + #313543 #444b5d #596378 #6e7b92 @@ -22,6 +23,7 @@ #d9e1e8 #e9edf2 + #8c2b90d9 #8f000000 #44000000 From f550b1634157a46e28e72b7ccebbdf9f117e53e6 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Thu, 6 Feb 2020 18:27:03 +0000 Subject: [PATCH 04/55] Translated using Weblate (Kabyle) Currently translated at 24.7% (101 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/ Translated using Weblate (Kabyle) Currently translated at 23.2% (95 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/ Translated using Weblate (Kabyle) Currently translated at 11.5% (47 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/ Translated using Weblate (Kabyle) Currently translated at 11.2% (46 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/ --- app/src/main/res/values-kab/strings.xml | 64 +++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 18771c32..9f0b4203 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -50,4 +50,68 @@ Ur teɛiḍ ara irewwayen. + Tella-d tucḍa. + Tilγa + D acu i ttummant\? + + Ticraḍ + Rnu γer ticraḍ + Ticraḍ + Sgugem %s + Bder + Sekles + Ẓreg + Sefsex + Anasiw n imujiyen + Rnu iccer + Nγel aseγwen + Ldi amzun d %s + Bḍu amzun d… + Bḍu aseγwen n tijewwiq s… + Bḍu tijewwiqt d… + Anta tummant\? + d-acu i gellan d amaynut\? + Nadi… + + Tiririn… + Tugna n umaγnu + Sider + Kkes tijewwiqt-a\? + Ẓreg tilγa + Agrudem + Aceɛlal + Aberkan + Tutlayt + Iccaren + Apṛuksi + %1$s, %2$s, %3$s d %4$d nniḍen + %1$s, %2$s, akked %3$s + %1$s akked %2$s + Tusky %s + Amaγnu n Tusky + + Tugniwin + Tibidyutin + + Yeṭafaṛ-ik-id + Kkes + Lqem + Rnu amiḍan + Rnu yiwen umiḍan amaynut n Maṣṭudun + + Aru + + Tummant-ik·im %s ur tesɛi ara imujiyen udmawanen + Ldi tijewwiqt + CC-BY 4.0 + CC-BY-SA 4.0 + + Senṭeḍ + + Imiḍanen yettwasgugmen + Imiḍanen yettusḥebsen + Tiγula yettwaffren + Isuturen n teḍfeṛt + Taγwalt + Sfeḍ From 65487f8ac126ca805fd8c9ed402077e520af12b5 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 6 Feb 2020 18:27:04 +0000 Subject: [PATCH 05/55] Translated using Weblate (Dutch) Currently translated at 100.0% (409 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nl/ --- app/src/main/res/values-nl/strings.xml | 28 +++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f88cd153..f4e3ae8e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -441,7 +441,7 @@ Verder naar %s Het rapporteren is mislukt Het ophalen van toots is mislukt - Deze rapportage wordt naar jouw servermoderator(en) gestuurd. Je kunt een uitleg geven over waarom je het account hieronder wilt rapporteren: + De rapportage wordt naar de moderator(en) van jouw server gestuurd. Je kunt hieronder een uitleg geven waarom je dit account rapporteert: Het account is van een andere server. Wil je ook een geanonimiseerde kopie van de rapportage daarnaartoe sturen\? Meldingenfilter tonen @@ -459,4 +459,30 @@ Keuze %d Bewerk +Geluidsbestanden moeten minder dan 40MB zijn. + Bladwijzers + Ingeplande toots + Bladwijzer + Bewerken + Bladwijzers + Poll toevoegen + Ingeplande toots + Ingeplande toot + Herstellen + Wazige kleurovergangen voor verborgen media tonen + + Powered by Tusky + Altijd toots met tekstwaarschuwingen uitklappen + Als bladwijzer toegevoegd + Kies een lijst + Lijst + Accounts + Zoeken mislukt + + Poll + Fout tijdens opzoeken toot %s + + Je hebt nog geen concepten. + Je hebt nog geen ingeplande toots. + From 8d5f61133a9e6b16f11d8b91b642983f990217b5 Mon Sep 17 00:00:00 2001 From: nailyk Date: Thu, 6 Feb 2020 18:27:04 +0000 Subject: [PATCH 06/55] Translated using Weblate (French) Currently translated at 100.0% (409 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/ --- app/src/main/res/values-fr/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d9426a3d..49cf48b2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -331,9 +331,9 @@ Détacher Épingler - <b>%1$s</b> Favoris - <b>%1$s</b> Favoris - + %1$s Favori + %1$s Favoris + <b>%s</b> Boost <b>%s</b> Boosts @@ -381,8 +381,8 @@ Effacer et ré-écrire ce pouet \? - %s vote - %s votes + %s voix + %s voix %s restant Termine à %s From 2c86cdc36fea92e4f553a4a0ff7022947d4c8222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Thu, 6 Feb 2020 18:27:04 +0000 Subject: [PATCH 07/55] Translated using Weblate (Icelandic) Currently translated at 100.0% (409 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/ --- app/src/main/res/values-is/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index b4b7a95b..12e3dac2 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -23,7 +23,7 @@ Mistókst að fá innskráningarteikn. Stöðufærslan er of löng! Skráin verður að vera minni en 8MB. - Myndskeiðasskrár verða að vera minni en 40MB. + Myndskeiðaskrár verða að vera minni en 40MB. Þessa tegund skrár er ekki hægt að senda inn. Ekki var hægt að opna skrána. Krafist er heimilda til að lesa gögn. @@ -507,4 +507,5 @@ Þú ert ekki með nein drög. Þú ert ekki með neinar áætlaðar stöðufærslur. - +Hljóðskrár verða að vera minni en 40MB. + From 8061a5184a34e9137b0b6b9a5e041e4cedc70292 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Thu, 6 Feb 2020 18:27:04 +0000 Subject: [PATCH 08/55] Translated using Weblate (Swedish) Currently translated at 100.0% (409 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/ --- app/src/main/res/values-sv/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8dcb8eb0..ee5abe7b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -480,4 +480,6 @@ Du har inga schemalagda statusar. - +Ljudfiler måste vara mindre än 40MB. + Du har inga utkast. + From 207d37b05c90ddd70a6aec14ccafe093b416f52e Mon Sep 17 00:00:00 2001 From: ati3 Date: Thu, 6 Feb 2020 18:27:04 +0000 Subject: [PATCH 09/55] Translated using Weblate (Slovak) Currently translated at 12.0% (49 of 409 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sk/ --- app/src/main/res/values-sk/strings.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 75f1c473..7eb541dd 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -28,4 +28,27 @@ Nahlásiť používateľa @%s Rýchla odpoveď Odpovedať + Čo je server\? + + Obľúbené + O aplikácii + Vyskytla sa chyba v sieti! Prosím skontrolujte svoje pripojenie a skúste to znova! + Toto nemôže byť prázdne. + Autorizácia bola zamietnutá. + Nepodarilo sa získať prihlasovací token. + Súbor musí byť menší ako 8 MB. + Videosúbory musia byť menšie ako 40 MB. + Audio súbory musia byť menšie ako 40 MB. + Súbor sa nepodarilo otvoriť. + Domov + Panely + Vytvoriť záložku + Sledovať + Prestať sledovať + Blokovať + Odblokovať + Nahlásiť + Upraviť + Vymazať + Vymazať a prepísať From dcad4ff33cfce2ad09e9108a50ecc45494e7c27b Mon Sep 17 00:00:00 2001 From: dani Date: Wed, 29 Jan 2020 18:44:54 +0000 Subject: [PATCH 10/55] Translated using Weblate (German) Currently translated at 71.4% (5 of 7 strings) Translation: Tusky/Tusky-app Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/de/ --- fastlane/metadata/android/de/changelogs/61.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fastlane/metadata/android/de/changelogs/61.txt diff --git a/fastlane/metadata/android/de/changelogs/61.txt b/fastlane/metadata/android/de/changelogs/61.txt new file mode 100644 index 00000000..89093f91 --- /dev/null +++ b/fastlane/metadata/android/de/changelogs/61.txt @@ -0,0 +1,7 @@ +Tusky v7.0 + +- Unterstützung für das Anzeigen von Umfragen, Abstimmen und Umfragebenachrichtigungen +- Neue Knöpfe um den Benachrichtigungstab zu filtern und alle Benachrichtigungen zu löschen +- Lösche & erstelle deine Toots neu +- es wird auf dem Profilbild angezeigt, ob es sich bei einem Account um einen Bot handelt (kann in den Einstellungen ausgeschaltet werden) +- Neue Übersetzungen: Norwegisch Bokmål und Slovenisch. From bb43af1389bef28165f91c1ec331c10858d656d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isak=20Holmstr=C3=B6m?= Date: Sat, 1 Feb 2020 14:17:04 +0000 Subject: [PATCH 11/55] Translated using Weblate (Swedish) Currently translated at 85.7% (6 of 7 strings) Translation: Tusky/Tusky-app Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/sv/ --- fastlane/metadata/android/sv/changelogs/61.txt | 2 +- fastlane/metadata/android/sv/changelogs/68.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/sv/changelogs/68.txt diff --git a/fastlane/metadata/android/sv/changelogs/61.txt b/fastlane/metadata/android/sv/changelogs/61.txt index 5b292d46..5171bad0 100644 --- a/fastlane/metadata/android/sv/changelogs/61.txt +++ b/fastlane/metadata/android/sv/changelogs/61.txt @@ -1,6 +1,6 @@ Tusky v7.0 -- Support för att visa undersökningar, rösta och notifikationer +- Stöd för att visa undersökningar, rösta och notifikationer - Nya knappar för ett filtrera notifikationsfliken och att ta bort alla notifieringar - Radera & skriv ny toot - Ny indikator som visar om kontot är en bot vid profilbilden (kan stängas av under inställningar) diff --git a/fastlane/metadata/android/sv/changelogs/68.txt b/fastlane/metadata/android/sv/changelogs/68.txt new file mode 100644 index 00000000..f10831f8 --- /dev/null +++ b/fastlane/metadata/android/sv/changelogs/68.txt @@ -0,0 +1,3 @@ +Tusky v9.1 + +Denna release garanterar kompatibilitet med Mastodon 3 och ökar prestanda och stabilitet. From c1b29462142bb14260a37203ca04a2b32ecff1e4 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 6 Feb 2020 18:57:23 +0000 Subject: [PATCH 12/55] Translated using Weblate (Dutch) Currently translated at 71.4% (5 of 7 strings) Translation: Tusky/Tusky-app Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/nl/ --- fastlane/metadata/android/nl/changelogs/61.txt | 7 +++++++ fastlane/metadata/android/nl/changelogs/67.txt | 9 +++++++++ fastlane/metadata/android/nl/changelogs/68.txt | 3 +++ fastlane/metadata/android/nl/short_description.txt | 1 + fastlane/metadata/android/nl/title.txt | 1 + 5 files changed, 21 insertions(+) create mode 100644 fastlane/metadata/android/nl/changelogs/61.txt create mode 100644 fastlane/metadata/android/nl/changelogs/67.txt create mode 100644 fastlane/metadata/android/nl/changelogs/68.txt create mode 100644 fastlane/metadata/android/nl/short_description.txt create mode 100644 fastlane/metadata/android/nl/title.txt diff --git a/fastlane/metadata/android/nl/changelogs/61.txt b/fastlane/metadata/android/nl/changelogs/61.txt new file mode 100644 index 00000000..ea498467 --- /dev/null +++ b/fastlane/metadata/android/nl/changelogs/61.txt @@ -0,0 +1,7 @@ +Tusky v7.0 + +- Support for displaying polls, voting and poll notifications +- New buttons to filter the notification tab and to delete all notifications +- delete & redraft your own toots +- new indicator that shows if an account is a bot on the profile image (can be turned off in the preferences) +- New translations: Norwegian Bokmål and Slovenian. diff --git a/fastlane/metadata/android/nl/changelogs/67.txt b/fastlane/metadata/android/nl/changelogs/67.txt new file mode 100644 index 00000000..4a130c0d --- /dev/null +++ b/fastlane/metadata/android/nl/changelogs/67.txt @@ -0,0 +1,9 @@ +Tusky v9.0 + +- You can now create Polls from Tusky +- Improved search +- New option in Account Preferences to always expand content warnings +- Avatars in the navigation drawer have now a rounded square shape +- It is now possible to report users even when they never posted a status +- Tusky will now refuse to connect over cleartext connections on Android 6+ +- A lot of other small improvements and bug fixes diff --git a/fastlane/metadata/android/nl/changelogs/68.txt b/fastlane/metadata/android/nl/changelogs/68.txt new file mode 100644 index 00000000..61b9e752 --- /dev/null +++ b/fastlane/metadata/android/nl/changelogs/68.txt @@ -0,0 +1,3 @@ +Tusky v9.1 + +This release ensures compatibility with Mastodon 3 and improves performance and stability. diff --git a/fastlane/metadata/android/nl/short_description.txt b/fastlane/metadata/android/nl/short_description.txt new file mode 100644 index 00000000..a158d9f3 --- /dev/null +++ b/fastlane/metadata/android/nl/short_description.txt @@ -0,0 +1 @@ +Een multi-accountclient voor het sociale netwerk Mastodon diff --git a/fastlane/metadata/android/nl/title.txt b/fastlane/metadata/android/nl/title.txt new file mode 100644 index 00000000..0238ffc0 --- /dev/null +++ b/fastlane/metadata/android/nl/title.txt @@ -0,0 +1 @@ +Tusky From 5324258c2ecab61b138545b786b8773d2bfebff6 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 7 Feb 2020 20:52:22 +0100 Subject: [PATCH 13/55] change dialog background color (#1670) --- app/src/main/res/values/styles.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 66c5899b..f961a9c3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -91,6 +91,7 @@ diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 5de7712a..3dd3e30f 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -13,6 +13,7 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f961a9c3..14d8e102 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -63,6 +63,7 @@ @color/iconColor @drawable/status_divider + @color/dividerColor @color/textColorDisabled @@ -71,7 +72,7 @@ @color/iconColor @color/textColorTertiary @color/textColorTertiary - @color/colorBackgroundAccent + ?attr/dividerColor @color/white @color/white @@ -115,6 +116,7 @@ @@ -137,11 +139,12 @@ @color/tusky_grey_10 @color/tusky_grey_40 - @color/tusky_grey_05 + @color/tusky_grey_20 + + @color/tusky_grey_10 @color/black @color/tusky_grey_40 - @color/tusky_grey_05