diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java index 1e48e289a..a40c5f7da 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java @@ -69,6 +69,8 @@ public interface IntentConstants { String INTENT_ACTION_PEBBLE_NOTIFICATION = "com.getpebble.action.SEND_NOTIFICATION"; String BROADCAST_NOTIFICATION_DELETED = INTENT_PACKAGE_PREFIX + "NOTIFICATION_DELETED"; + String BROADCAST_PROMOTIONS_ACCEPTED = INTENT_PACKAGE_PREFIX + "PROMOTIONS_ACCEPTED"; + String BROADCAST_PROMOTIONS_DENIED = INTENT_PACKAGE_PREFIX + "PROMOTIONS_DENIED"; String EXTRA_LATITUDE = "latitude"; String EXTRA_LONGITUDE = "longitude"; diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 4d3005310..c5d86fcc9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -39,6 +39,7 @@ import android.os.Build import android.os.Bundle import android.support.annotation.StringRes import android.support.v4.app.Fragment +import android.support.v4.app.NotificationCompat import android.support.v4.view.GravityCompat import android.support.v4.view.ViewCompat import android.support.v4.view.ViewPager.OnPageChangeListener @@ -98,6 +99,7 @@ import org.mariotaku.twidere.model.notification.NotificationChannelSpec import org.mariotaku.twidere.provider.TwidereDataStore.Activities import org.mariotaku.twidere.provider.TwidereDataStore.Messages.Conversations import org.mariotaku.twidere.provider.TwidereDataStore.Statuses +import org.mariotaku.twidere.receiver.NotificationReceiver import org.mariotaku.twidere.service.StreamingService import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback @@ -857,6 +859,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp || promotionsEnabledKey in preferences) { return } + val intent = Intent(this, PremiumDashboardActivity::class.java) val contentIntent = PendingIntent.getActivity(this, 0, intent, 0) val builder = NotificationChannelSpec.appNotices.notificationBuilder(this) @@ -864,8 +867,21 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp builder.setSmallIcon(R.drawable.ic_stat_gift) builder.setTicker(getString(R.string.message_ticker_promotions_reward)) builder.setContentTitle(getString(R.string.title_promotions_reward)) - builder.setContentText(getString(R.string.message_promotions_reward)) + builder.setContentText(getString(R.string.message_ticker_promotions_reward)) builder.setContentIntent(contentIntent) + builder.setStyle(NotificationCompat.BigTextStyle(builder) + .setBigContentTitle(getString(R.string.title_promotions_reward)) + .bigText(getString(R.string.message_promotions_reward))) + builder.addAction(R.drawable.ic_action_confirm, getString(R.string.action_enable), + PendingIntent.getBroadcast(this, 0, Intent(this, + NotificationReceiver::class.java).setAction(BROADCAST_PROMOTIONS_ACCEPTED) + .putExtra(EXTRA_NOTIFICATION_ID, NOTIFICATION_ID_PROMOTIONS_OFFER), + PendingIntent.FLAG_ONE_SHOT)) + builder.addAction(R.drawable.ic_action_cancel, getString(R.string.action_no_thanks), + PendingIntent.getBroadcast(this, 0, Intent(this, + NotificationReceiver::class.java).setAction(BROADCAST_PROMOTIONS_DENIED) + .putExtra(EXTRA_NOTIFICATION_ID, NOTIFICATION_ID_PROMOTIONS_OFFER), + PendingIntent.FLAG_ONE_SHOT)) notificationManager.notify(NOTIFICATION_ID_PROMOTIONS_OFFER, builder.build()) } @@ -1010,7 +1026,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp builder.setPositiveButton(android.R.string.ok) { _, _ -> kPreferences[defaultAutoRefreshKey] = true } - builder.setNegativeButton(R.string.no_thanks) { _, _ -> + builder.setNegativeButton(R.string.action_no_thanks) { _, _ -> kPreferences[defaultAutoRefreshKey] = false } val dialog = builder.create() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/NotificationReceiver.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/NotificationReceiver.kt index 8788e1771..7548d8b3a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/NotificationReceiver.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/NotificationReceiver.kt @@ -23,11 +23,13 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import org.mariotaku.abstask.library.TaskStarter +import org.mariotaku.kpreferences.set import org.mariotaku.ktextension.toLongOr import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.annotation.NotificationType import org.mariotaku.twidere.annotation.ReadPositionTag import org.mariotaku.twidere.constant.IntentConstants.BROADCAST_NOTIFICATION_DELETED +import org.mariotaku.twidere.constant.promotionsEnabledKey import org.mariotaku.twidere.model.UserKey import org.mariotaku.twidere.task.twitter.message.BatchMarkMessageReadTask import org.mariotaku.twidere.util.Utils @@ -39,38 +41,55 @@ import org.mariotaku.twidere.util.dagger.DependencyHolder class NotificationReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - val action = intent.action ?: return - when (action) { + when (intent.action) { BROADCAST_NOTIFICATION_DELETED -> { - val uri = intent.data ?: return - val holder = DependencyHolder.get(context) - @NotificationType - val notificationType = uri.getQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE) - val accountKey = uri.getQueryParameter(QUERY_PARAM_ACCOUNT_KEY)?.let(UserKey::valueOf) - val paramReadPosition = uri.getQueryParameter(QUERY_PARAM_READ_POSITION) - when (notificationType) { - NotificationType.HOME_TIMELINE -> { - val positionTag = Utils.getReadPositionTagWithAccount(ReadPositionTag.HOME_TIMELINE, - accountKey) - val manager = holder.readStateManager - manager.setPosition(positionTag, paramReadPosition.toLongOr(-1L)) - } - NotificationType.INTERACTIONS -> { - val positionTag = Utils.getReadPositionTagWithAccount(ReadPositionTag.ACTIVITIES_ABOUT_ME, - accountKey) - val manager = holder.readStateManager - manager.setPosition(positionTag, paramReadPosition.toLongOr(-1L)) - } - NotificationType.DIRECT_MESSAGES -> { - if (accountKey == null) return - val appContext = context.applicationContext - val task = BatchMarkMessageReadTask(appContext, accountKey, - paramReadPosition.toLongOr(-1L)) - TaskStarter.execute(task) - } - } + handleNotificationDeleted(intent, context) + } + BROADCAST_PROMOTIONS_ACCEPTED -> { + setPromotionsEnabled(context, intent, true) + } + BROADCAST_PROMOTIONS_DENIED -> { + setPromotionsEnabled(context, intent, false) } } } + private fun handleNotificationDeleted(intent: Intent, context: Context) { + val uri = intent.data ?: return + val holder = DependencyHolder.get(context) + @NotificationType + val notificationType = uri.getQueryParameter(QUERY_PARAM_NOTIFICATION_TYPE) + val accountKey = uri.getQueryParameter(QUERY_PARAM_ACCOUNT_KEY)?.let(UserKey::valueOf) + val paramReadPosition = uri.getQueryParameter(QUERY_PARAM_READ_POSITION) + when (notificationType) { + NotificationType.HOME_TIMELINE -> { + val positionTag = Utils.getReadPositionTagWithAccount(ReadPositionTag.HOME_TIMELINE, + accountKey) + val manager = holder.readStateManager + manager.setPosition(positionTag, paramReadPosition.toLongOr(-1L)) + } + NotificationType.INTERACTIONS -> { + val positionTag = Utils.getReadPositionTagWithAccount(ReadPositionTag.ACTIVITIES_ABOUT_ME, + accountKey) + val manager = holder.readStateManager + manager.setPosition(positionTag, paramReadPosition.toLongOr(-1L)) + } + NotificationType.DIRECT_MESSAGES -> { + if (accountKey == null) return + val appContext = context.applicationContext + val task = BatchMarkMessageReadTask(appContext, accountKey, + paramReadPosition.toLongOr(-1L)) + TaskStarter.execute(task) + } + } + } + + private fun setPromotionsEnabled(context: Context, intent: Intent, enabled: Boolean) { + val holder = DependencyHolder.get(context) + holder.preferences[promotionsEnabledKey] = enabled + val notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + if (notificationId != -1) { + holder.notificationManager.cancel(notificationId) + } + } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/DependencyHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/DependencyHolder.kt index 830e913d0..cbf7686b5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/DependencyHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/DependencyHolder.kt @@ -28,10 +28,7 @@ import okhttp3.Dns import org.mariotaku.kpreferences.KPreferences import org.mariotaku.restfu.http.RestHttpClient import org.mariotaku.twidere.model.DefaultFeatures -import org.mariotaku.twidere.util.ActivityTracker -import org.mariotaku.twidere.util.ExternalThemeManager -import org.mariotaku.twidere.util.ReadStateManager -import org.mariotaku.twidere.util.UserColorNameManager +import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.media.MediaPreloader import org.mariotaku.twidere.util.media.ThumborWrapper import org.mariotaku.twidere.util.premium.ExtraFeaturesService @@ -91,6 +88,9 @@ class DependencyHolder internal constructor(context: Context) { @Inject lateinit var extraFeaturesService: ExtraFeaturesService internal set + @Inject + lateinit var notificationManager: NotificationManagerWrapper + internal set init { GeneralComponent.get(context).inject(this) diff --git a/twidere/src/main/res-localized/values-ar/strings.xml b/twidere/src/main/res-localized/values-ar/strings.xml index 3586c0553..314019a9d 100644 --- a/twidere/src/main/res-localized/values-ar/strings.xml +++ b/twidere/src/main/res-localized/values-ar/strings.xml @@ -365,7 +365,7 @@ لا محتوى ولا تبويبة ولا تبويبة - لا، شكرا + لا، شكرا لم أجد مستخدمًا لا شيء %s راسلك مباشرة. diff --git a/twidere/src/main/res-localized/values-ast/strings.xml b/twidere/src/main/res-localized/values-ast/strings.xml index 125ed710b..bd3c1ac87 100644 --- a/twidere/src/main/res-localized/values-ast/strings.xml +++ b/twidere/src/main/res-localized/values-ast/strings.xml @@ -607,7 +607,7 @@ Convertilu a un tuit normal amiesta una caráuter estra. Ensin conteníu Ensin llingüetes Ensin llingüetes - Non, gracies + Non, gracies Nun s\'alcontró usuariu dalu Ensin sufixu de versión Dengún diff --git a/twidere/src/main/res-localized/values-ca/strings.xml b/twidere/src/main/res-localized/values-ca/strings.xml index 48200254d..5da55f0aa 100644 --- a/twidere/src/main/res-localized/values-ca/strings.xml +++ b/twidere/src/main/res-localized/values-ca/strings.xml @@ -385,7 +385,7 @@ Sense contingut No hi ha pestanyes No hi ha pestanyes - No, gràcies + No, gràcies No s\'ha trobat cap usuari Versió sense sufix Cap diff --git a/twidere/src/main/res-localized/values-cs/strings.xml b/twidere/src/main/res-localized/values-cs/strings.xml index a3f35b833..9514d3a75 100644 --- a/twidere/src/main/res-localized/values-cs/strings.xml +++ b/twidere/src/main/res-localized/values-cs/strings.xml @@ -221,7 +221,7 @@ Poloha není k dispozici Žádné pravidlo Žádný obsah - Ne, děkuji + Ne, děkuji Nenalezen žádný uživatel Světlá barva diff --git a/twidere/src/main/res-localized/values-de/strings.xml b/twidere/src/main/res-localized/values-de/strings.xml index bb192705c..a7af99225 100644 --- a/twidere/src/main/res-localized/values-de/strings.xml +++ b/twidere/src/main/res-localized/values-de/strings.xml @@ -626,7 +626,7 @@ Kein Inhalt Kein Tab Kein Tab - Nein, danke + Nein, danke Kein Benutzer gefunden Kein Versionszusatz Nichts diff --git a/twidere/src/main/res-localized/values-es/strings.xml b/twidere/src/main/res-localized/values-es/strings.xml index aee244bfb..f1567dbd4 100644 --- a/twidere/src/main/res-localized/values-es/strings.xml +++ b/twidere/src/main/res-localized/values-es/strings.xml @@ -626,7 +626,7 @@ Sin contenido Sin pestaña Sin pestañas - No, gracias + No, gracias Ningún usuario encontrado Sin versión de sufijo Ninguno diff --git a/twidere/src/main/res-localized/values-fa/strings.xml b/twidere/src/main/res-localized/values-fa/strings.xml index b02687215..32976e543 100644 --- a/twidere/src/main/res-localized/values-fa/strings.xml +++ b/twidere/src/main/res-localized/values-fa/strings.xml @@ -611,7 +611,7 @@ بدون محتوا بدون زبانه بدون زبانه - نه، ممنون + نه، ممنون هیچ کاربری پیدا نشد بدون پسوند نگارش هیچ‌کدام diff --git a/twidere/src/main/res-localized/values-fi/strings.xml b/twidere/src/main/res-localized/values-fi/strings.xml index 2de699b06..aab550965 100644 --- a/twidere/src/main/res-localized/values-fi/strings.xml +++ b/twidere/src/main/res-localized/values-fi/strings.xml @@ -376,7 +376,7 @@ Ei sisältöä Ei välilehteä Ei välilehteä - Ei kiitos + Ei kiitos Käyttäjää ei löytynyt Ei versiojälkiliitettä Ei mitään diff --git a/twidere/src/main/res-localized/values-fr/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml index 989fabf86..329e9e7f1 100644 --- a/twidere/src/main/res-localized/values-fr/strings.xml +++ b/twidere/src/main/res-localized/values-fr/strings.xml @@ -626,7 +626,7 @@ Aucun contenu Aucun onglet Aucun onglet - Non, merci + Non, merci Aucun utilisateur trouvé Pas de suffixe de version Aucun diff --git a/twidere/src/main/res-localized/values-gl/strings.xml b/twidere/src/main/res-localized/values-gl/strings.xml index b901b53b1..ae522baba 100644 --- a/twidere/src/main/res-localized/values-gl/strings.xml +++ b/twidere/src/main/res-localized/values-gl/strings.xml @@ -640,7 +640,7 @@ Sen contido Sen lapelas Sen lapelas - Non, grazas + Non, grazas Non se atopou o usuario Sen sufixo de versión Ningún diff --git a/twidere/src/main/res-localized/values-hr/strings.xml b/twidere/src/main/res-localized/values-hr/strings.xml index ec5db12a7..884f8ca59 100644 --- a/twidere/src/main/res-localized/values-hr/strings.xml +++ b/twidere/src/main/res-localized/values-hr/strings.xml @@ -325,7 +325,7 @@ Nema sadržaja Nema tabova Nema tabova - Ne, hvala + Ne, hvala Korisnik nije pronađen Nema sufiksa verzije Ništa diff --git a/twidere/src/main/res-localized/values-hu/strings.xml b/twidere/src/main/res-localized/values-hu/strings.xml index f958dbf7a..4b63c2008 100644 --- a/twidere/src/main/res-localized/values-hu/strings.xml +++ b/twidere/src/main/res-localized/values-hu/strings.xml @@ -644,7 +644,7 @@ Nincs tartalom Nincs fül Nincs fül - Köszönöm, nem + Köszönöm, nem Nem található felhasználó Nincs verzió utótag Semmi diff --git a/twidere/src/main/res-localized/values-in/strings.xml b/twidere/src/main/res-localized/values-in/strings.xml index bb67715fd..f2846e525 100644 --- a/twidere/src/main/res-localized/values-in/strings.xml +++ b/twidere/src/main/res-localized/values-in/strings.xml @@ -497,7 +497,7 @@ Tidak ada konten Tidak terdapat tab Tidak ada tab - Tidak, terima kasih + Tidak, terima kasih Tidak menemukan pengguna Tidak ada akhiran versi Tidak ada diff --git a/twidere/src/main/res-localized/values-it/strings.xml b/twidere/src/main/res-localized/values-it/strings.xml index fe59c1447..4a5372c93 100644 --- a/twidere/src/main/res-localized/values-it/strings.xml +++ b/twidere/src/main/res-localized/values-it/strings.xml @@ -378,7 +378,7 @@ Nessun contenuto Nessun tab Nessun tab - No, grazie + No, grazie Nessun utente trovato Nessuna versione supportata Nessuno diff --git a/twidere/src/main/res-localized/values-ja/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml index ddf1c9945..cc7e01040 100644 --- a/twidere/src/main/res-localized/values-ja/strings.xml +++ b/twidere/src/main/res-localized/values-ja/strings.xml @@ -650,7 +650,7 @@ コンテンツなし タブ無し タブ無し - いいえ、結構です + いいえ、結構です ユーザーが見つかりません。 バージョンサフィックスなし なし diff --git a/twidere/src/main/res-localized/values-ko/strings.xml b/twidere/src/main/res-localized/values-ko/strings.xml index 13dc16e32..c3693ef57 100644 --- a/twidere/src/main/res-localized/values-ko/strings.xml +++ b/twidere/src/main/res-localized/values-ko/strings.xml @@ -597,7 +597,7 @@ 내용 없음 탭 없음 탭 없음 - 아뇨, 괜찮습니다 + 아뇨, 괜찮습니다 사용자를 찾을 수 없음 버전 접미사 없음 없음 diff --git a/twidere/src/main/res-localized/values-nl/strings.xml b/twidere/src/main/res-localized/values-nl/strings.xml index b277d04ee..8c0a10d42 100644 --- a/twidere/src/main/res-localized/values-nl/strings.xml +++ b/twidere/src/main/res-localized/values-nl/strings.xml @@ -390,7 +390,7 @@ Geen inhoud Geen tabblad Geen tab - Nee, bedankt + Nee, bedankt Geen gebruiker gevonden Geen versie-achtervoegsel Geen diff --git a/twidere/src/main/res-localized/values-no/strings.xml b/twidere/src/main/res-localized/values-no/strings.xml index 4383081b0..bea13c66c 100644 --- a/twidere/src/main/res-localized/values-no/strings.xml +++ b/twidere/src/main/res-localized/values-no/strings.xml @@ -340,7 +340,7 @@ Ingen innhold Ingen faner Ingen faner - Nei, takk + Nei, takk Fant ingen bruker Ingen versjonssuffiks Ingen diff --git a/twidere/src/main/res-localized/values-pl/strings.xml b/twidere/src/main/res-localized/values-pl/strings.xml index 7bdf9be39..9efa7ed2e 100644 --- a/twidere/src/main/res-localized/values-pl/strings.xml +++ b/twidere/src/main/res-localized/values-pl/strings.xml @@ -405,7 +405,7 @@ Brak zawartości Brak kart Brak kart - Nie, dziękuję + Nie, dziękuję Brak przyrostka wersji Brak %s wysłał/a Ci wiadomość. diff --git a/twidere/src/main/res-localized/values-pt/strings.xml b/twidere/src/main/res-localized/values-pt/strings.xml index b3462036f..f3c49e36c 100644 --- a/twidere/src/main/res-localized/values-pt/strings.xml +++ b/twidere/src/main/res-localized/values-pt/strings.xml @@ -462,7 +462,7 @@ Nenhum conteúdo Sem abas Sem abas - Não, obrigado + Não, obrigado Nenhum usuário encontrado Sem sufixo de versão Nenhum diff --git a/twidere/src/main/res-localized/values-ru/strings.xml b/twidere/src/main/res-localized/values-ru/strings.xml index e96be756a..b8065a96f 100644 --- a/twidere/src/main/res-localized/values-ru/strings.xml +++ b/twidere/src/main/res-localized/values-ru/strings.xml @@ -505,7 +505,7 @@ Нет содержимого Нет вкладок Нет вкладок - Нет, спасибо + Нет, спасибо Пользователь не найден Нет суффикса версии Никак diff --git a/twidere/src/main/res-localized/values-sv/strings.xml b/twidere/src/main/res-localized/values-sv/strings.xml index f8fca1226..77a7415b5 100644 --- a/twidere/src/main/res-localized/values-sv/strings.xml +++ b/twidere/src/main/res-localized/values-sv/strings.xml @@ -590,7 +590,7 @@ Inget innehåll Ingen flik Ingen flik - Nej tack + Nej tack Ingen användare hittat Ingen versionssuffix Ingen diff --git a/twidere/src/main/res-localized/values-th/strings.xml b/twidere/src/main/res-localized/values-th/strings.xml index 3f18982d7..cbecb0ee4 100644 --- a/twidere/src/main/res-localized/values-th/strings.xml +++ b/twidere/src/main/res-localized/values-th/strings.xml @@ -626,7 +626,7 @@ ไม่มีเนื้อหา ไม่มีแถบ ไม่มีแถบ - ไม่, ขอบคุณ + ไม่, ขอบคุณ ไม่พบผู้ใช้ ไม่มีเลขเวอร์ชั่นต่อท้าย ไม่มี diff --git a/twidere/src/main/res-localized/values-tr/strings.xml b/twidere/src/main/res-localized/values-tr/strings.xml index e4547b629..f74592f7e 100644 --- a/twidere/src/main/res-localized/values-tr/strings.xml +++ b/twidere/src/main/res-localized/values-tr/strings.xml @@ -455,7 +455,7 @@ İçerik yok Sekme yok Sekme yok - Hayır, teşekkürler + Hayır, teşekkürler Kullanıcı bulunamadı Düzeltme yok Hiçbiri diff --git a/twidere/src/main/res-localized/values-uk/strings.xml b/twidere/src/main/res-localized/values-uk/strings.xml index 369b6282a..da8a8462a 100644 --- a/twidere/src/main/res-localized/values-uk/strings.xml +++ b/twidere/src/main/res-localized/values-uk/strings.xml @@ -391,7 +391,7 @@ Немає вмісту Вкладки відсутні Нема вкладок - Ні, дякую + Ні, дякую Користувача не знайдено Без суфіксу версії Нічого diff --git a/twidere/src/main/res-localized/values-zh-rCN/strings.xml b/twidere/src/main/res-localized/values-zh-rCN/strings.xml index 28fe71848..c0e1499ed 100644 --- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml @@ -1,4 +1,23 @@ + + 帐号选项 @@ -654,7 +673,7 @@ 没有内容 没有标签页 没有标签页 - 不用了,谢谢 + 不用了,谢谢 没有找到用户 没有版本后缀 diff --git a/twidere/src/main/res-localized/values-zh-rHK/strings.xml b/twidere/src/main/res-localized/values-zh-rHK/strings.xml index 31338b33d..07a4a48ea 100644 --- a/twidere/src/main/res-localized/values-zh-rHK/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rHK/strings.xml @@ -1,4 +1,23 @@ + + 帳戶選項 @@ -643,7 +662,7 @@ 沒有內容 沒有標籤頁 沒有標籤頁 - 不用了,謝謝 + 不用了,謝謝 沒有找到使用者 沒有版本後綴 diff --git a/twidere/src/main/res-localized/values-zh/strings.xml b/twidere/src/main/res-localized/values-zh/strings.xml index 3cafe0cce..7a7952b56 100644 --- a/twidere/src/main/res-localized/values-zh/strings.xml +++ b/twidere/src/main/res-localized/values-zh/strings.xml @@ -643,7 +643,7 @@ 沒有內容 沒有標籤頁 沒有標籤頁 - 不用了,謝謝 + 不用了,謝謝 沒有找到使用者 沒有版本後綴 diff --git a/twidere/src/main/res/layout/activity_request_permissions.xml b/twidere/src/main/res/layout/activity_request_permissions.xml index 951dc9b31..629127a6c 100644 --- a/twidere/src/main/res/layout/activity_request_permissions.xml +++ b/twidere/src/main/res/layout/activity_request_permissions.xml @@ -110,7 +110,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:gravity="center" - android:text="@string/no_thanks"/> + android:text="@string/action_no_thanks"/> \ No newline at end of file diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml index 90cc90c71..e1ca7f33f 100644 --- a/twidere/src/main/res/values/strings.xml +++ b/twidere/src/main/res/values/strings.xml @@ -83,6 +83,7 @@ Mute notifications %1$s, saved at %2$s Next + No, thanks Open in browser Pick color Purchase @@ -779,7 +780,6 @@ No content No tab No tab - No, thanks No user found No version suffix