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

Fix locale changing

Browse Source
This commit is contained in:
Koitharu
2025-02-24 19:49:51 +02:00
parent 30d1d47cdc
commit e98f5b9d54
13 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
View File

@@ -1,10 +1,16 @@
package org.koitharu.kotatsu.core.ui
import android.content.Context
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleService
import leakcanary.AppWatcher
abstract class BaseService : LifecycleService() {
override fun attachBaseContext(newBase: Context) {
super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
}
override fun onDestroy() {
super.onDestroy()
AppWatcher.objectWatcher.watch(

7
app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
View File

@@ -6,6 +6,7 @@ import android.os.Build
import android.provider.SearchRecentSuggestions
import android.text.Html
import androidx.collection.arraySetOf
import androidx.core.content.ContextCompat
import androidx.room.InvalidationTracker
import androidx.work.WorkManager
import coil3.ImageLoader
@@ -76,6 +77,12 @@ interface AppModule {
companion object {
@Provides
@LocalizedAppContext
fun provideLocalizedContext(
@ApplicationContext context: Context,
): Context = ContextCompat.getContextForLanguage(context)
@Provides
@Singleton
fun provideNetworkState(

13
app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt Normal file
View File

@@ -0,0 +1,13 @@
package org.koitharu.kotatsu.core
import javax.inject.Qualifier
@Qualifier
@Target(
AnnotationTarget.FUNCTION,
AnnotationTarget.PROPERTY_GETTER,
AnnotationTarget.PROPERTY_SETTER,
AnnotationTarget.VALUE_PARAMETER,
AnnotationTarget.FIELD,
)
annotation class LocalizedAppContext

4
app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt
View File

@@ -19,11 +19,11 @@ import coil3.size.Scale
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.ErrorReporterReceiver
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.model.LocalMangaSource
import org.koitharu.kotatsu.core.nav.AppRouter
import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
@@ -43,7 +43,7 @@ private const val CHANNEL_ID_SILENT = "download_bg"
private const val GROUP_ID = "downloads"
class DownloadNotificationFactory @AssistedInject constructor(
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
private val workManager: WorkManager,
private val coil: ImageLoader,
@Assisted private val uuid: UUID,

3
app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt
View File

@@ -18,6 +18,7 @@ import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
@@ -42,7 +43,7 @@ import javax.inject.Singleton
@Singleton
class MangaSourcesRepository @Inject constructor(
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
private val db: MangaDatabase,
private val settings: AppSettings,
) {

3
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeViewModel.kt
View File

@@ -7,6 +7,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.MutableStateFlow
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.ui.BaseViewModel
import org.koitharu.kotatsu.core.util.LocaleComparator
import org.koitharu.kotatsu.core.util.ext.mapSortedByCount
@@ -25,7 +26,7 @@ import javax.inject.Inject
@HiltViewModel
class WelcomeViewModel @Inject constructor(
private val repository: MangaSourcesRepository,
@ApplicationContext context: Context,
@LocalizedAppContext context: Context,
) : BaseViewModel() {
private val allSources = repository.allMangaSources

3
app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt
View File

@@ -28,6 +28,7 @@ import okhttp3.OkHttpClient
import okhttp3.Request
import okio.use
import org.jetbrains.annotations.Blocking
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.image.BitmapDecoderCompat
import org.koitharu.kotatsu.core.network.CommonHeaders
import org.koitharu.kotatsu.core.network.MangaHttpClient
@@ -71,7 +72,7 @@ import kotlin.coroutines.CoroutineContext
@ActivityRetainedScoped
class PageLoader @Inject constructor(
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
lifecycle: ActivityRetainedLifecycle,
@MangaHttpClient private val okHttp: OkHttpClient,
private val cache: PagesCache,

3
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
View File

@@ -25,6 +25,7 @@ import okio.buffer
import okio.openZip
import okio.sink
import okio.source
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.image.BitmapDecoderCompat
import org.koitharu.kotatsu.core.os.OpenDocumentTreeHelper
import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -46,7 +47,7 @@ import kotlin.coroutines.resume
class PageSaveHelper @AssistedInject constructor(
@Assisted activityResultCaller: ActivityResultCaller,
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
private val settings: AppSettings,
private val pageLoaderProvider: Provider<PageLoader>,
) : ActivityResultCallback<Uri?> {

3
app/src/main/kotlin/org/koitharu/kotatsu/settings/search/SettingsSearchHelper.kt
View File

@@ -10,6 +10,7 @@ import androidx.preference.get
import dagger.Reusable
import dagger.hilt.android.qualifiers.ApplicationContext
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.settings.AppearanceSettingsFragment
import org.koitharu.kotatsu.settings.DownloadsSettingsFragment
import org.koitharu.kotatsu.settings.NetworkSettingsFragment
@@ -28,7 +29,7 @@ import javax.inject.Inject
@Reusable
@SuppressLint("RestrictedApi")
class SettingsSearchHelper @Inject constructor(
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
) {
fun inflatePreferences(): List<SettingsItem> {

3
app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/manage/SourcesListProducer.kt
View File

@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.db.TABLE_SOURCES
import org.koitharu.kotatsu.core.model.getTitle
import org.koitharu.kotatsu.core.model.isNsfw
@@ -31,7 +32,7 @@ import javax.inject.Inject
@ViewModelScoped
class SourcesListProducer @Inject constructor(
lifecycle: ViewModelLifecycle,
@ApplicationContext private val context: Context,
@LocalizedAppContext private val context: Context,
private val repository: MangaSourcesRepository,
private val settings: AppSettings,
) : InvalidationTracker.Observer(TABLE_SOURCES) {

3
app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackerNotificationHelper.kt
View File

@@ -16,6 +16,7 @@ import coil3.ImageLoader
import coil3.request.ImageRequest
import dagger.hilt.android.qualifiers.ApplicationContext
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.LocalizedAppContext
import org.koitharu.kotatsu.core.nav.AppRouter
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
@@ -26,7 +27,7 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
import javax.inject.Inject
class TrackerNotificationHelper @Inject constructor(
@ApplicationContext private val applicationContext: Context,
@LocalizedAppContext private val applicationContext: Context,
private val settings: AppSettings,
private val coil: ImageLoader,
) {

9
app/src/nightly/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
View File

@@ -1,5 +1,12 @@
package org.koitharu.kotatsu.core.ui
import android.content.Context
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleService
abstract class BaseService : LifecycleService()
abstract class BaseService : LifecycleService() {
override fun attachBaseContext(newBase: Context) {
super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
}
}

9
app/src/release/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
View File

@@ -1,5 +1,12 @@
package org.koitharu.kotatsu.core.ui
import android.content.Context
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleService
abstract class BaseService : LifecycleService()
abstract class BaseService : LifecycleService() {
override fun attachBaseContext(newBase: Context) {
super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
}
}