diff --git a/.idea/dictionaries/PC.xml b/.idea/dictionaries/PC.xml index e38eab1b9..b3436f116 100644 --- a/.idea/dictionaries/PC.xml +++ b/.idea/dictionaries/PC.xml @@ -70,6 +70,7 @@ furiya gles gogh + halfffff heebo homescreen hsiafan @@ -85,6 +86,7 @@ kislay kmgtpe kulinich + kyoya lato launchable launcheable @@ -171,6 +173,7 @@ thru tidelift timedlock + tommynok topjohnwu transbinary transitionseverywhere @@ -187,6 +190,7 @@ viewmodels vinci vinodel + vrifox vterm waleedon wantarray diff --git a/app/build.gradle b/app/build.gradle index 77c3f891f..834c68e51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ plugins { android { compileSdkVersion 33 - def appVersionCode = 45 + def appVersionCode = 46 def appVersionName = "build_$appVersionCode (alpha)" buildFeatures { @@ -93,8 +93,8 @@ dependencies { // Test testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' // Kotlin implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' diff --git a/app/src/main/assets/html/translation.html b/app/src/main/assets/html/translation.html index 3e2e7909b..75c3cb66a 100644 --- a/app/src/main/assets/html/translation.html +++ b/app/src/main/assets/html/translation.html @@ -43,6 +43,12 @@

Russian


+

Turkish

+(tr) +

Kyoya • kyoya

+ +
+

Arabic

(ar) • Not supported anymore

أحمد البحيري • wowo774455

diff --git a/app/src/main/java/app/simple/inure/extensions/activities/BaseActivity.kt b/app/src/main/java/app/simple/inure/extensions/activities/BaseActivity.kt index fb011940a..ee799c105 100644 --- a/app/src/main/java/app/simple/inure/extensions/activities/BaseActivity.kt +++ b/app/src/main/java/app/simple/inure/extensions/activities/BaseActivity.kt @@ -25,7 +25,7 @@ import app.simple.inure.R import app.simple.inure.database.instances.StackTraceDatabase import app.simple.inure.decorations.transitions.compat.DetailsTransitionArc import app.simple.inure.dialogs.miscellaneous.Error.Companion.showError -import app.simple.inure.dialogs.miscellaneous.Warning +import app.simple.inure.dialogs.miscellaneous.Warning.Companion.showWarning import app.simple.inure.popups.behavior.PopupArcType import app.simple.inure.popups.behavior.PopupTransitionType import app.simple.inure.preferences.AppearancePreferences @@ -289,23 +289,15 @@ open class BaseActivity : AppCompatActivity(), ThemeChangedListener, android.con } open fun showWarning(warning: String) { - val p0 = Warning.newInstance(warning) - p0.setOnWarningCallbackListener(object : Warning.Companion.WarningCallbacks { - override fun onDismiss() { - onBackPressedDispatcher.onBackPressed() - } - }) - p0.show(supportFragmentManager, "warning") + supportFragmentManager.showWarning(warning).setOnWarningCallbackListener { + onBackPressedDispatcher.onBackPressed() + } } open fun showWarning(@StringRes warning: Int) { - val p0 = Warning.newInstance(warning) - p0.setOnWarningCallbackListener(object : Warning.Companion.WarningCallbacks { - override fun onDismiss() { - onBackPressedDispatcher.onBackPressed() - } - }) - p0.show(supportFragmentManager, "warning") + supportFragmentManager.showWarning(warning).setOnWarningCallbackListener { + onBackPressedDispatcher.onBackPressed() + } } override fun onSharedPreferenceChanged(sharedPreferences: android.content.SharedPreferences?, key: String?) { diff --git a/app/src/main/java/app/simple/inure/extensions/fragments/ScopedBottomSheetFragment.kt b/app/src/main/java/app/simple/inure/extensions/fragments/ScopedBottomSheetFragment.kt index ad51c052d..dc98e3a55 100644 --- a/app/src/main/java/app/simple/inure/extensions/fragments/ScopedBottomSheetFragment.kt +++ b/app/src/main/java/app/simple/inure/extensions/fragments/ScopedBottomSheetFragment.kt @@ -13,7 +13,7 @@ import app.simple.inure.R import app.simple.inure.constants.BundleConstants import app.simple.inure.constants.Misc import app.simple.inure.dialogs.miscellaneous.Error.Companion.showError -import app.simple.inure.dialogs.miscellaneous.Warning +import app.simple.inure.dialogs.miscellaneous.Warning.Companion.showWarning import app.simple.inure.preferences.BehaviourPreferences import app.simple.inure.preferences.SharedPreferences.getSharedPreferences import app.simple.inure.preferences.SharedPreferences.registerSharedPreferenceChangeListener @@ -174,22 +174,14 @@ abstract class ScopedBottomSheetFragment : BottomSheetDialogFragment(), } open fun showWarning(warning: String) { - val p0 = Warning.newInstance(warning) - p0.setOnWarningCallbackListener(object : Warning.Companion.WarningCallbacks { - override fun onDismiss() { - dismiss() - } - }) - p0.show(parentFragmentManager, "warning") + childFragmentManager.showWarning(warning).setOnWarningCallbackListener { + dismiss() + } } open fun showWarning(@StringRes warning: Int) { - val p0 = Warning.newInstance(warning) - p0.setOnWarningCallbackListener(object : Warning.Companion.WarningCallbacks { - override fun onDismiss() { - dismiss() - } - }) - p0.show(parentFragmentManager, "warning") + childFragmentManager.showWarning(warning).setOnWarningCallbackListener { + dismiss() + } } } \ No newline at end of file