Minimal re-sync to Tusky 23 plus minimum changes to build for Android API 34.
This commit is contained in:
parent
cbd1268339
commit
992160717b
43 changed files with 84 additions and 82 deletions
|
|
@ -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}_" +
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
||||
<activity
|
||||
android:name=".SplashActivity"
|
||||
|
|
|
|||
|
|
@ -143,7 +143,9 @@ class PreferencesActivity :
|
|||
super.onSaveInstanceState(outState)
|
||||
}
|
||||
|
||||
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
|
||||
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
|
||||
sharedPreferences ?: return
|
||||
key ?: return
|
||||
when (key) {
|
||||
"appTheme" -> {
|
||||
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 {
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ class ViewVideoFragment : ViewMediaFragment() {
|
|||
}
|
||||
|
||||
override fun onFling(
|
||||
e1: MotionEvent,
|
||||
e1: MotionEvent?,
|
||||
e2: MotionEvent,
|
||||
velocityX: Float,
|
||||
velocityY: Float
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -265,14 +265,14 @@ class GraphView @JvmOverloads constructor(
|
|||
|
||||
private fun dataSpacing(data: List<Any>) = 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)
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">موقع المشروع :\n
|
||||
https://chinwag.org</string>
|
||||
https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">تقارير الأخطاء و طلبات التحسينات على :\n
|
||||
https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">الملف الشخصي لتوسكي</string>
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@
|
|||
<string name="about_tusky_version">Tusky %s</string>
|
||||
<string name="about_powered_by_tusky">Зроблена Tusky</string>
|
||||
<string name="about_project_site">Вэбсайт праекту:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_account">Профіль Tusky</string>
|
||||
<string name="post_share_content">Падзяліцца зместам допісу</string>
|
||||
<string name="post_share_link">Падзяліцца спасылкай на допіс</string>
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
<string name="about_bug_feature_request_site">Доклади за грешки и заявки за функции:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">Уебсайт на проекта:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_license">Tusky е свободен софтуер с отворен код. Той е лицензиран под Общият публичен лиценз на GNU Версия 3. Можете да видите лиценза тук: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_powered_by_tusky">Осъществено от Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
<string name="about_bug_feature_request_site">বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ:
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">প্রকল্প ওয়েবসাইট:
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_tusky_license">টাস্কি মুক্ত এবং ওপেন সোর্স সফ্টওয়্যার। এটি GNU জেনারেল পাবলিক লাইসেন্স সংস্করণ 3 এর অধীনে লাইসেন্সযুক্ত। আপনি এখানে লাইসেন্স দেখতে পারেন: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_tusky_version">টাস্কি %s</string>
|
||||
<string name="about_title_activity">সম্পর্কিত</string>
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">প্রকল্প ওয়েবসাইট:
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ:
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">টাস্কির প্রোফাইল</string>
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@
|
|||
<string name="about_bug_feature_request_site">ڕاپۆرتەکانی هەڵەکان و داواکاریەکانی تایبەتمەندی:
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">وێبسایتی پڕۆژە:
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_tusky_license">توسکی سۆفتوێری ئازاد و سەرچاوەی کراوەیە مۆڵەتدراوە بە پێ نامەی گشتی GNU Public Version 3. دەتوانیت لێرە مۆڵەتەکە نیشان بدەی: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_powered_by_tusky">لەلایەن تاسکیەوە دەست کراوە بە</string>
|
||||
<string name="about_tusky_version">توسکی %s</string>
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Gwefan y project:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Adrodd ar wallau a cheisiadau nodweddion:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Proffil Tusky</string>
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Website des Projekts:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Fehlermeldungen und Verbesserungsvorschläge:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Profil von Tusky</string>
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">پایگاه وب پروژه :
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">گزارش مشکلات و درخواست ویژگیها:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">نمایهٔ تاسکی</string>
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@
|
|||
\n
|
||||
\nIs féidir tuilleadh faisnéise a fháil ag <a href="https://joinmastodon.org"> joinmastodon.org </a>. </string>
|
||||
<string name="about_project_site">Suíomh Gréasáin an tionscadail:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Tuarascálacha ar fhabhtanna & iarratais ar ghnéithe:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="post_media_video">Físeán</string>
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@
|
|||
<string name="about_bug_feature_request_site">Aithrisean air bugaichean ⁊ iarrtasan air gleusan:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">Làrach-lìn a’ phròiseict:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_powered_by_tusky">Le cumhachd Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
<string name="description_account_locked">Cunntas glaiste</string>
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@
|
|||
<string name="about_bug_feature_request_site">Informar de fallos e solicitar funcións:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">Web do proxecto:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_powered_by_tusky">Desenvolta por Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<string name="about_bug_feature_request_site">बग रिपोर्ट और सुविधा अनुरोध:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">परियोजना की वेबसाइट:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_license">टस्की स्वतंत्र और ओपन-सोर्स सॉफ्टवेयर है। यह GNU जनरल पब्लिक लाइसेंस संस्करण 3 के तहत लाइसेंस प्राप्त है। आप लाइसेंस यहां देख सकते हैं: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_powered_by_tusky">टस्की द्वारा संचालित</string>
|
||||
<string name="about_tusky_version">टस्की %s</string>
|
||||
|
|
@ -406,4 +406,4 @@
|
|||
<string name="error_media_upload_image_or_video">फोटो और वीडियो दोनों को एक ही पोस्ट से अटैच नहीं किया जा सकता है।</string>
|
||||
<string name="error_loading_account_details">खाता विवरण लोड करने में विफल रहा</string>
|
||||
<string name="error_could_not_load_login_page">लॉगिन पेज लोड नहीं किया जा सका।</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@
|
|||
<string name="about_powered_by_tusky">Keyrir á Tusky</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_project_site">Vefsvæði verkefnisins:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Villutilkynningar og beiðnir um nýja eiginleika:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Notandasnið Tusky</string>
|
||||
|
|
@ -657,4 +657,4 @@
|
|||
<string name="help_empty_home">Þetta er <b>tímalínan þín</b>. 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.</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Sito web del progetto:\n
|
||||
https://chinwag.org</string>
|
||||
https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Segnala problemi e richiedi funzionalità:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Profilo di Tusky</string>
|
||||
|
|
@ -688,4 +688,4 @@
|
|||
<string name="error_missing_edits">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 <a href="https://github.com/mastodon/mastodon/issues/25398">problema Mastodon #25398</a>.</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@
|
|||
<string name="pref_post_text_size">Teɣzi n weḍṛis</string>
|
||||
<string name="about_powered_by_tusky">Yettwamdemmar s Tusky</string>
|
||||
<string name="about_project_site">Asmel Web n usenfaṛ:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="abbreviated_hours_ago">%dsr</string>
|
||||
<string name="abbreviated_minutes_ago">%dtsd</string>
|
||||
<string name="abbreviated_seconds_ago">%dtsn</string>
|
||||
|
|
@ -274,4 +274,4 @@
|
|||
<string name="pref_title_show_boosts">Sken-d beṭuyat</string>
|
||||
<string name="hashtags">Ihacṭagen</string>
|
||||
<string name="notification_follow_request_name">Isuturen n teḍfeṛt</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">프로젝트 홈페이지:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">버그 신고/건의사항:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Tusky 공식 계정</string>
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@
|
|||
<string name="conversation_2_recipients">%1$s un %2$s</string>
|
||||
<string name="description_post_cw">Satura brīdinājums: %s</string>
|
||||
<string name="about_project_site">Projekta vietne:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="a11y_label_loading_thread">Ielādē pavedienu</string>
|
||||
<string name="confirmation_hashtag_unfollowed">pārtraukta sekošana #%s</string>
|
||||
<string name="confirmation_domain_unmuted">%s atcelta slēpšana</string>
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@
|
|||
<string name="notification_mention_descriptions">Varsler om nye nevnelser</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_project_site">Hjemmeside:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="abbreviated_in_years">om %dy</string>
|
||||
<string name="compose_active_account_description">Poster som %1$s</string>
|
||||
<plurals name="hint_describe_for_visually_impaired">
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Projectwebsite:\n
|
||||
https://chinwag.org</string>
|
||||
https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Foutmeldingen & nieuwe functies aanvragen:\n
|
||||
https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Tusky\'s profiel</string>
|
||||
|
|
@ -651,4 +651,4 @@
|
|||
<string name="label_filter_title">Titel</string>
|
||||
<string name="load_newest_notifications">Laad nieuwste meldingen</string>
|
||||
<string name="compose_delete_draft">Verwijder concept\?</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Site do projeto:\n
|
||||
https://chinwag.org</string>
|
||||
https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Reporte bugs e solicite funcionalidades:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Perfil do Tusky</string>
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@
|
|||
<string name="filter_dialog_update_button">Atualizar</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_project_site">Página do projeto:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Reporte de erros e pedidos de funcionalidades:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Perfil do Tusky</string>
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@
|
|||
<!-- note to translators: the url can be changed to link to the localized version of the license -->
|
||||
<string name="about_project_site">
|
||||
Веб-сайт проекта:\n
|
||||
https://chinwag.org</string>
|
||||
https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Отчеты об ошибках и ваши пожелания:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Профиль Tusky</string>
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@
|
|||
<string name="about_bug_feature_request_site">अशुद्धीनामावेदनं वैशिष्ट्यनिवेदनञ्च
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">प्रकल्पस्य जालसूत्रम् :
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_license">टस्कीत्यनावृतस्रोतो निःशुल्कतन्त्रांशः। GNU General Public License Version 3 इत्यनेनाऽनुज्ञापितः। अत्राऽनुज्ञापत्रं द्रष्टुं शक्यते:-https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_powered_by_tusky">टस्कीत्यनेनाऽऽश्रितः</string>
|
||||
<string name="about_tusky_version">टस्की %s</string>
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@
|
|||
<string name="action_mute">නිහඬ කරන්න</string>
|
||||
<string name="about_tusky_version">ටුස්කි %s</string>
|
||||
<string name="about_project_site">වියමන අඩවිය:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="action_accept">පිළිගන්න</string>
|
||||
<string name="abbreviated_in_hours">පැ. %d කින්</string>
|
||||
<string name="create_poll_title">මතවිමසුම</string>
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
<string name="about_tusky_version">Tusky %s</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_project_site">Spletna stran projekta:
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">Poročila o napakah in želje za nove funkcije:
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Profil Tusky</string>
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@
|
|||
<string name="about_bug_feature_request_site">รายงานช่องโหว่ และ ขอฟีเจอร์ (ภาษาอังกฤษ):
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">เว็บไซต์โปรเจกต์:
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_tusky_license">Tusky คือซอฟต์แวร์เสรีและโอเพนซอร์ส ภายใต้สัญญาอนุญาต GNU General Public License Version 3 ดูสัญญาที่ : https://www.gnu.org/licenses/gpl-3.0.ja.html</string>
|
||||
<string name="about_powered_by_tusky">ขับเคลื่อนด้วย Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@
|
|||
* the url can be changed to link to the localized version of the license.
|
||||
-->
|
||||
<string name="about_project_site">Projenin internet sitesi:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_bug_feature_request_site">& özellik istekleri hata raporları:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_tusky_account">Tusky\'nin Profili</string>
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@
|
|||
<string name="about_bug_feature_request_site">Звіти про вади та запити функцій:
|
||||
\n https://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">Вебсайт проєкту:
|
||||
\n https://chinwag.org</string>
|
||||
\n https://chinwag.au</string>
|
||||
<string name="about_tusky_license">Tusky — вільне та відкрите програмне забезпечення. Ліцензовано загальною громадською ліцензією GNU версії 3, ви можете переглянути ліцензію тут: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
|
||||
<string name="about_powered_by_tusky">Створено Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@
|
|||
<string name="about_bug_feature_request_site">Báo lỗi và đề xuất tính năng
|
||||
\nhttps://git.chinwag.org/chinwag/chinwag-android/issues</string>
|
||||
<string name="about_project_site">Trang chủ
|
||||
\nhttps://chinwag.org</string>
|
||||
\nhttps://chinwag.au</string>
|
||||
<string name="about_tusky_license">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</string>
|
||||
<string name="about_powered_by_tusky">Powered by Tusky</string>
|
||||
<string name="about_tusky_version">Tusky %s</string>
|
||||
|
|
@ -656,4 +656,4 @@
|
|||
<string name="notification_listenable_worker_description">Thông báo khi Tusky hoạt động ngầm</string>
|
||||
<string name="notification_notification_worker">Đang nạp thông báo…</string>
|
||||
<string name="notification_prune_cache">Bảo trì bộ nhớ đệm…</string>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="tusky_website" translatable="false">https://chinwag.org</string>
|
||||
<string name="tusky_website" translatable="false">https://chinwag.au</string>
|
||||
<string name="about_app_version">%1$s %2$s</string>
|
||||
|
||||
<string name="oauth_scheme" translatable="false">oauth2redirect</string>
|
||||
|
|
|
|||
|
|
@ -402,7 +402,7 @@
|
|||
-->
|
||||
<string name="about_project_site">
|
||||
Project website:\n
|
||||
https://chinwag.org
|
||||
https://chinwag.au
|
||||
</string>
|
||||
<string name="about_bug_feature_request_site">
|
||||
Bug reports & feature requests:\n
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ allprojects {
|
|||
|
||||
plugins.withType(JavaBasePlugin).configureEach {
|
||||
java {
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(11)
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,3 +18,4 @@ android.defaults.buildfeatures.shaders=false
|
|||
android.enableR8.fullMode=true
|
||||
android.nonTransitiveRClass=true
|
||||
android.useAndroidX=true
|
||||
android.nonFinalResIds=false
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -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
|
||||
|
|
|
|||
27
gradlew
vendored
27
gradlew
vendored
|
|
@ -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" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue