prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Koitharu
2025-02-24 19:28:31 +02:00
parent 1fa470fd00
commit 30d1d47cdc
7 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -19,8 +19,8 @@ android {
applicationId 'org.koitharu.kotatsu'
minSdk = 21
targetSdk = 35
versionCode = 1001
versionName = '8.0-b1'
versionCode = 1002
versionName = '8.0-b2'
generatedDensities = []
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
ksp {

1
app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
View File

@@ -83,7 +83,6 @@ open class BaseApp : Application(), Configuration.Provider {
return
}
AppCompatDelegate.setDefaultNightMode(settings.theme)
AppCompatDelegate.setApplicationLocales(settings.appLocales)
// TLS 1.3 support for Android < 10
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
Security.insertProviderAt(Conscrypt.newProvider(), 1)

15
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
View File

@@ -1,14 +1,16 @@
package org.koitharu.kotatsu.core.ui
import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.graphics.Color
import android.os.Build
import android.os.Bundle
import android.view.KeyEvent
import android.view.View
import android.widget.Toast
import androidx.annotation.CallSuper
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.Toolbar
import androidx.core.app.ActivityCompat
@@ -47,10 +49,17 @@ abstract class BaseActivity<B : ViewBinding> :
@JvmField
val actionModeDelegate = ActionModeDelegate()
private var defaultStatusBarColor = Color.TRANSPARENT
private lateinit var entryPoint: BaseActivityEntryPoint
override fun attachBaseContext(newBase: Context) {
entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(newBase.applicationContext)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
AppCompatDelegate.setApplicationLocales(entryPoint.settings.appLocales)
}
super.attachBaseContext(newBase)
}
override fun onCreate(savedInstanceState: Bundle?) {
val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(this)
val settings = entryPoint.settings
isAmoledTheme = settings.isAmoledTheme
setTheme(settings.colorScheme.styleResId)

4
app/src/main/res/color-v23/bg_dim_bottomsheet.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.78" android:color="?colorSurfaceContainerLow" />
</selector>

5
app/src/main/res/color/bg_dim_bottomsheet.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- https://stackoverflow.com/questions/54685474/theme-attributes-in-color-selector-for-api-22 -->
<item android:color="@color/dim2" />
</selector>

2
app/src/main/res/layout/activity_details.xml
View File

@@ -322,7 +322,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/bg_dim_bottomsheet"
android:background="?colorSurfaceContainerLow"
android:elevation="9dp"
tools:layout_height="10dp" />

2
gradle/libs.versions.toml
View File

@@ -31,7 +31,7 @@ material = "1.13.0-alpha10"
moshi = "1.15.2"
okhttp = "4.12.0"
okio = "3.10.2"
parsers = "00a769bfd5"
parsers = "1.6"
preference = "1.2.1"
recyclerview = "1.4.0"
room = "2.6.1"