diff --git a/app/build.gradle b/app/build.gradle index fe7f676f..8f263303 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,15 +24,15 @@ final def SUPPORT_ACCOUNT_URL = "https://social.chinwag.org/@ChinwagNews" final def REGISTER_ACCOUNT_URL = "https://chinwag.org/auth/sign_up" android { - compileSdk 33 + compileSdk 34 namespace "com.keylesspalace.tusky" defaultConfig { applicationId APP_ID namespace "com.keylesspalace.tusky" - minSdk 23 - targetSdk 33 - versionCode 90 - versionName "23.0-CW0" + minSdk 24 + targetSdk 34 + versionCode 91 + versionName "23.0-CW1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -105,10 +105,10 @@ android { } // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed. // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } + //compileOptions { + // sourceCompatibility JavaVersion.VERSION_11 + // targetCompatibility JavaVersion.VERSION_11 + //} applicationVariants.configureEach { variant -> variant.outputs.configureEach { outputFileName = "Tusky_${variant.versionName}_${variant.versionCode}_${gitSha}_" + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ff58a00..e2d29c88 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,8 @@ android:supportsRtl="true" android:theme="@style/TuskyTheme" android:usesCleartextTraffic="false" - android:localeConfig="@xml/locales_config"> + android:localeConfig="@xml/locales_config" + android:enableOnBackInvokedCallback="true"> { val theme = sharedPreferences.getNonNullString("appTheme", APP_THEME_DEFAULT) @@ -151,11 +153,11 @@ class PreferencesActivity : setAppNightMode(theme) restartActivitiesOnBackPressedCallback.isEnabled = true - this.restartCurrentActivity() + this.recreate() } PrefKeys.UI_TEXT_SCALE_RATIO -> { restartActivitiesOnBackPressedCallback.isEnabled = true - this.restartCurrentActivity() + this.recreate() } "statusTextSize", "absoluteTimeView", "showBotOverlay", "animateGifAvatars", "useBlurhash", "showSelfUsername", "showCardsInTimelines", "confirmReblogs", "confirmFavourites", @@ -168,16 +170,6 @@ class PreferencesActivity : } } - private fun restartCurrentActivity() { - intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK - val savedInstanceState = Bundle() - saveInstanceState(savedInstanceState) - intent.putExtras(savedInstanceState) - startActivityWithSlideInAnimation(intent) - finish() - overridePendingTransition(R.anim.fade_in, R.anim.fade_out) - } - override fun androidInjector() = androidInjector companion object { diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt index 68dc6687..85f65905 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt @@ -208,7 +208,7 @@ class ViewVideoFragment : ViewMediaFragment() { } override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float diff --git a/app/src/main/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt b/app/src/main/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt index 4caf47c1..0c60a04c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt @@ -347,21 +347,21 @@ class ClickableSpanTextView @JvmOverloads constructor( return firstDiff < secondDiff } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) // Paint span boundaries. Optimised out on release builds, or debug builds where // showSpanBoundaries is false. if (BuildConfig.DEBUG && showSpanBoundaries) { - canvas?.save() + canvas.save() for (entry in delegateRects) { - canvas?.drawRect(entry.key, paddingDebugPaint) + canvas.drawRect(entry.key, paddingDebugPaint) } for (entry in spanRects) { - canvas?.drawRect(entry.key, spanDebugPaint) + canvas.drawRect(entry.key, spanDebugPaint) } - canvas?.restore() + canvas.restore() } } diff --git a/app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt b/app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt index 937db93a..6915bde2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt @@ -265,14 +265,14 @@ class GraphView @JvmOverloads constructor( private fun dataSpacing(data: List) = width.toFloat() / max(data.size - 1, 1).toFloat() - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) if (primaryLinePath.isEmpty && width > 0) { initializeVertices() } - canvas?.apply { + canvas.apply { drawRect(sizeRect, graphPaint) val pointDistance = dataSpacing(primaryLineData) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 576b1bdc..00574513 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -231,7 +231,7 @@ * the url can be changed to link to the localized version of the license. --> موقع المشروع :\n - https://chinwag.org + https://chinwag.au تقارير الأخطاء و طلبات التحسينات على :\n https://git.chinwag.org/chinwag/chinwag-android/issues الملف الشخصي لتوسكي diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index c7c050cf..96783323 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -312,7 +312,7 @@ Tusky %s Зроблена Tusky Вэбсайт праекту: -\n https://chinwag.org +\n https://chinwag.au Профіль Tusky Падзяліцца зместам допісу Падзяліцца спасылкай на допіс diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 03b77d6c..5244d002 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -190,7 +190,7 @@ Доклади за грешки и заявки за функции: \n https://git.chinwag.org/chinwag/chinwag-android/issues Уебсайт на проекта: -\n https://chinwag.org +\n https://chinwag.au Tusky е свободен софтуер с отворен код. Той е лицензиран под Общият публичен лиценз на GNU Версия 3. Можете да видите лиценза тук: https://www.gnu.org/licenses/gpl-3.0.en.html Осъществено от Tusky Tusky %s diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 14ac89b5..a9923dec 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -104,7 +104,7 @@ বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ: \nhttps://git.chinwag.org/chinwag/chinwag-android/issues প্রকল্প ওয়েবসাইট: -\nhttps://chinwag.org +\nhttps://chinwag.au টাস্কি মুক্ত এবং ওপেন সোর্স সফ্টওয়্যার। এটি GNU জেনারেল পাবলিক লাইসেন্স সংস্করণ 3 এর অধীনে লাইসেন্সযুক্ত। আপনি এখানে লাইসেন্স দেখতে পারেন: https://www.gnu.org/licenses/gpl-3.0.en.html টাস্কি %s সম্পর্কিত diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index f85e852f..5e97ca40 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -237,7 +237,7 @@ * the url can be changed to link to the localized version of the license. --> প্রকল্প ওয়েবসাইট: -\nhttps://chinwag.org +\nhttps://chinwag.au বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ: \nhttps://git.chinwag.org/chinwag/chinwag-android/issues টাস্কির প্রোফাইল diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 0fcbb43d..60a9c83b 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -434,7 +434,7 @@ ڕاپۆرتەکانی هەڵەکان و داواکاریەکانی تایبەتمەندی: \nhttps://git.chinwag.org/chinwag/chinwag-android/issues وێبسایتی پڕۆژە: -\nhttps://chinwag.org +\nhttps://chinwag.au توسکی سۆفتوێری ئازاد و سەرچاوەی کراوەیە مۆڵەتدراوە بە پێ نامەی گشتی GNU Public Version 3. دەتوانیت لێرە مۆڵەتەکە نیشان بدەی: https://www.gnu.org/licenses/gpl-3.0.en.html لەلایەن تاسکیەوە دەست کراوە بە توسکی %s diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index b5c3e517..70b41aa8 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -204,7 +204,7 @@ * the url can be changed to link to the localized version of the license. --> Gwefan y project: -\n https://chinwag.org +\n https://chinwag.au Adrodd ar wallau a cheisiadau nodweddion: \n https://git.chinwag.org/chinwag/chinwag-android/issues Proffil Tusky diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 37618837..d63f2603 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -230,7 +230,7 @@ * the url can be changed to link to the localized version of the license. --> Website des Projekts: -\n https://chinwag.org +\n https://chinwag.au Fehlermeldungen und Verbesserungsvorschläge: \n https://git.chinwag.org/chinwag/chinwag-android/issues Profil von Tusky diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0e5ce76b..4e54a134 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -203,7 +203,7 @@ * the url can be changed to link to the localized version of the license. --> پایگاه وب پروژه : -\n https://chinwag.org +\n https://chinwag.au گزارش مشکلات و درخواست ویژگی‌ها: \n https://git.chinwag.org/chinwag/chinwag-android/issues نمایهٔ تاسکی diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index a0a1975d..12756241 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -262,7 +262,7 @@ \n \nIs féidir tuilleadh faisnéise a fháil ag joinmastodon.org . Suíomh Gréasáin an tionscadail: -\n https://chinwag.org +\n https://chinwag.au Tuarascálacha ar fhabhtanna & iarratais ar ghnéithe: \n https://git.chinwag.org/chinwag/chinwag-android/issues Físeán diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index d84526bb..d88b66cc 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -327,7 +327,7 @@ Aithrisean air bugaichean ⁊ iarrtasan air gleusan: \n https://git.chinwag.org/chinwag/chinwag-android/issues Làrach-lìn a’ phròiseict: -\n https://chinwag.org +\n https://chinwag.au Le cumhachd Tusky Tusky %s Cunntas glaiste diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f487f7c3..a29048bb 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -309,7 +309,7 @@ Informar de fallos e solicitar funcións: \n https://git.chinwag.org/chinwag/chinwag-android/issues Web do proxecto: -\n https://chinwag.org +\n https://chinwag.au Tusky é software libre e de código aberto. Está baixo a licenza GNU General Public License Version 3. Podes ver a licenza aquí: https://www.gnu.org/licenses/gpl-3.0.en.html Desenvolta por Tusky Tusky %s diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f7ddbfdc..1de43f58 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -66,7 +66,7 @@ बग रिपोर्ट और सुविधा अनुरोध: \n https://git.chinwag.org/chinwag/chinwag-android/issues परियोजना की वेबसाइट: -\n https://chinwag.org +\n https://chinwag.au टस्की स्वतंत्र और ओपन-सोर्स सॉफ्टवेयर है। यह GNU जनरल पब्लिक लाइसेंस संस्करण 3 के तहत लाइसेंस प्राप्त है। आप लाइसेंस यहां देख सकते हैं: https://www.gnu.org/licenses/gpl-3.0.en.html टस्की द्वारा संचालित टस्की %s @@ -406,4 +406,4 @@ फोटो और वीडियो दोनों को एक ही पोस्ट से अटैच नहीं किया जा सकता है। खाता विवरण लोड करने में विफल रहा लॉगिन पेज लोड नहीं किया जा सका। - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 12b937ca..3e3c19c7 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -250,7 +250,7 @@ Keyrir á Tusky Tusky er frjáls hugbúnaður með opinn grunnkóða. Hann er gefinn út með GNU General Public notkunarleyfi, útgáfu 3. Þú getur skoðað notkunarleyfið hér: https://www.gnu.org/licenses/gpl-3.0.en.html Vefsvæði verkefnisins: -\n https://chinwag.org +\n https://chinwag.au Villutilkynningar og beiðnir um nýja eiginleika: \n https://git.chinwag.org/chinwag/chinwag-android/issues Notandasnið Tusky @@ -657,4 +657,4 @@ Þetta er tímalínan þín. Hún sýnir nýlegar færslur þeirra sem þú fylgist með. \n \nTil að skoða hvað aðrir eru að gera getur þú til dæmis uppgötvað viðkomandi í einni af hinum tímalínunum. Til dæmis á staðværu tímalínu netþjónsins þíns [iconics gmd_group]. Eða að þú leitar að þeim eftir nafni [iconics gmd_search]; til dæmis geturðu leitað að Tusky til að finna Mastodon-aðganginn okkar. - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 47ef39c9..060d7f25 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -232,7 +232,7 @@ * the url can be changed to link to the localized version of the license. --> Sito web del progetto:\n - https://chinwag.org + https://chinwag.au Segnala problemi e richiedi funzionalità: \n https://git.chinwag.org/chinwag/chinwag-android/issues Profilo di Tusky @@ -688,4 +688,4 @@ Il tuo server sa che questo post è stato modificato, ma non ha una copia delle modifiche, quindi non ti può essere mostrato. \n \nQuesto è il problema Mastodon #25398. - \ No newline at end of file + diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index b58f1bb3..5da92e76 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -219,7 +219,7 @@ Teɣzi n weḍṛis Yettwamdemmar s Tusky Asmel Web n usenfaṛ: -\n https://chinwag.org +\n https://chinwag.au %dsr %dtsd %dtsn @@ -274,4 +274,4 @@ Sken-d beṭuyat Ihacṭagen Isuturen n teḍfeṛt - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 881d7966..925ae685 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -242,7 +242,7 @@ * the url can be changed to link to the localized version of the license. --> 프로젝트 홈페이지: -\n https://chinwag.org +\n https://chinwag.au 버그 신고/건의사항: \n https://git.chinwag.org/chinwag/chinwag-android/issues Tusky 공식 계정 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 868ffa49..0aafb278 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -465,7 +465,7 @@ %1$s un %2$s Satura brīdinājums: %s Projekta vietne: -\n https://chinwag.org +\n https://chinwag.au Ielādē pavedienu pārtraukta sekošana #%s %s atcelta slēpšana diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index cca5a3aa..af410365 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -255,7 +255,7 @@ Varsler om nye nevnelser Tusky er fri og åpen kildekode. Applikasjonen er lisensiert under GNU General Public License versjon 3. Du kan se lisensen her: https://www.gnu.org/licenses/gpl-3.0.en.html Hjemmeside: -\n https://chinwag.org +\n https://chinwag.au om %dy Poster som %1$s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1b4abcac..13500212 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -228,7 +228,7 @@ * the url can be changed to link to the localized version of the license. --> Projectwebsite:\n - https://chinwag.org + https://chinwag.au Foutmeldingen & nieuwe functies aanvragen:\n https://git.chinwag.org/chinwag/chinwag-android/issues Tusky\'s profiel @@ -651,4 +651,4 @@ Titel Laad nieuwste meldingen Verwijder concept\? - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 62125a80..a8cc5994 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -216,7 +216,7 @@ * the url can be changed to link to the localized version of the license. --> Site do projeto:\n - https://chinwag.org + https://chinwag.au Reporte bugs e solicite funcionalidades: \n https://git.chinwag.org/chinwag/chinwag-android/issues Perfil do Tusky diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 04cffbac..23efa751 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -282,7 +282,7 @@ Atualizar Tusky é um software livre e de código aberto, licenciado com a versão 3 da GNU General Public License. Pode ler a licença aqui: https://www.gnu.org/licenses/gpl-3.0.pt-br.html Página do projeto: -\n https://chinwag.org +\n https://chinwag.au Reporte de erros e pedidos de funcionalidades: \n https://git.chinwag.org/chinwag/chinwag-android/issues Perfil do Tusky diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d54c6ad4..e4c8a5bc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -233,7 +233,7 @@ Веб-сайт проекта:\n - https://chinwag.org + https://chinwag.au Отчеты об ошибках и ваши пожелания: \n https://git.chinwag.org/chinwag/chinwag-android/issues Профиль Tusky diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml index 65c73ad8..7c3d633c 100644 --- a/app/src/main/res/values-sa/strings.xml +++ b/app/src/main/res/values-sa/strings.xml @@ -235,7 +235,7 @@ अशुद्धीनामावेदनं वैशिष्ट्यनिवेदनञ्च \n https://git.chinwag.org/chinwag/chinwag-android/issues प्रकल्पस्य जालसूत्रम् : -\n https://chinwag.org +\n https://chinwag.au टस्कीत्यनावृतस्रोतो निःशुल्कतन्त्रांशः। GNU General Public License Version 3 इत्यनेनाऽनुज्ञापितः। अत्राऽनुज्ञापत्रं द्रष्टुं शक्यते:-https://www.gnu.org/licenses/gpl-3.0.en.html टस्कीत्यनेनाऽऽश्रितः टस्की %s diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 538c8f9b..942e027a 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -167,7 +167,7 @@ නිහඬ කරන්න ටුස්කි %s වියමන අඩවිය: -\n https://chinwag.org +\n https://chinwag.au පිළිගන්න පැ. %d කින් මතවිමසුම diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 1e5d91d9..080ee4f2 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -210,7 +210,7 @@ Tusky %s Tusky je prosta in odprtokodna programska oprema. Licencirana je pod licenco GNU General Public License različice 3. Licenco si lahko ogledate tukaj: https://www.gnu.org/licenses/gpl-3.0.en.html Spletna stran projekta: -\nhttps://chinwag.org +\nhttps://chinwag.au Poročila o napakah in želje za nove funkcije: \nhttps://git.chinwag.org/chinwag/chinwag-android/issues Profil Tusky diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1a2c50a8..b2d1b343 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -179,7 +179,7 @@ รายงานช่องโหว่ และ ขอฟีเจอร์ (ภาษาอังกฤษ): \nhttps://git.chinwag.org/chinwag/chinwag-android/issues เว็บไซต์โปรเจกต์: -\nhttps://chinwag.org +\nhttps://chinwag.au Tusky คือซอฟต์แวร์เสรีและโอเพนซอร์ส ภายใต้สัญญาอนุญาต GNU General Public License Version 3 ดูสัญญาที่ : https://www.gnu.org/licenses/gpl-3.0.ja.html ขับเคลื่อนด้วย Tusky Tusky %s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index fc03d7df..516d674b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -214,7 +214,7 @@ * the url can be changed to link to the localized version of the license. --> Projenin internet sitesi: -\n https://chinwag.org +\n https://chinwag.au & özellik istekleri hata raporları: \n https://git.chinwag.org/chinwag/chinwag-android/issues Tusky\'nin Profili diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 77c69442..6e1c1a89 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -320,7 +320,7 @@ Звіти про вади та запити функцій: \n https://git.chinwag.org/chinwag/chinwag-android/issues Вебсайт проєкту: -\n https://chinwag.org +\n https://chinwag.au Tusky — вільне та відкрите програмне забезпечення. Ліцензовано загальною громадською ліцензією GNU версії 3, ви можете переглянути ліцензію тут: https://www.gnu.org/licenses/gpl-3.0.en.html Створено Tusky Tusky %s diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 58d59678..76f7c4d1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -271,7 +271,7 @@ Báo lỗi và đề xuất tính năng \nhttps://git.chinwag.org/chinwag/chinwag-android/issues Trang chủ -\nhttps://chinwag.org +\nhttps://chinwag.au Tusky là phần mềm mã nguồn mở, được phân phối với giấy phép GNU General Public License Version 3. Bạn có thể tham khảo thêm tại: https://www.gnu.org/licenses/gpl-3.0.en.html Powered by Tusky Tusky %s @@ -656,4 +656,4 @@ Thông báo khi Tusky hoạt động ngầm Đang nạp thông báo… Bảo trì bộ nhớ đệm… - \ No newline at end of file + diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index e9aba6ac..eb16b6ef 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,6 +1,6 @@ - https://chinwag.org + https://chinwag.au %1$s %2$s oauth2redirect diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d737350c..50278b2c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -402,7 +402,7 @@ --> Project website:\n - https://chinwag.org + https://chinwag.au Bug reports & feature requests:\n diff --git a/build.gradle b/build.gradle index 7689e2fb..fb0ac019 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ allprojects { plugins.withType(JavaBasePlugin).configureEach { java { - toolchain.languageVersion = JavaLanguageVersion.of(11) + toolchain.languageVersion = JavaLanguageVersion.of(17) } } } diff --git a/gradle.properties b/gradle.properties index f7cd3016..93953b2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,3 +18,4 @@ android.defaults.buildfeatures.shaders=false android.enableR8.fullMode=true android.nonTransitiveRClass=true android.useAndroidX=true +android.nonFinalResIds=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 768f8bf5..a2140ab0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "7.4.2" +agp = "8.9.0" androidx-activity = "1.7.2" androidx-appcompat = "1.6.1" androidx-browser = "1.5.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \