Skip to content

Commit 85d8fc3

Browse files
konnovdevkonnovdev
committed
Update app to API 34
This commit contains changes that are needed for the app to work on API 34
1 parent a3fb501 commit 85d8fc3

File tree

15 files changed

+273
-235
lines changed

15 files changed

+273
-235
lines changed

‎app/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
}
1010

1111
android {
12+
namespace = "net.chineseguide.jukuu"
1213
compileSdkVersion(Application.maxApi)
1314
defaultConfig {
1415
applicationId = Application.id
@@ -19,7 +20,7 @@ android {
1920
}
2021
viewBinding.isEnabled = true
2122
lintOptions {
22-
setLintConfig(file("lint.xml"))
23+
lintConfig = (file("lint.xml"))
2324
isCheckDependencies = true
2425
isCheckGeneratedSources = true
2526
isWarningsAsErrors = true
@@ -42,7 +43,6 @@ dependencies {
4243
implementation(Libraries.kotlinStdlib)
4344

4445
implementation(Libraries.daggerHiltCore)
45-
implementation(Libraries.hiltLifecycleViewModel)
4646
kapt(Libraries.daggerHiltAnnotationProcessor)
4747
kapt(Libraries.hiltAndroidxCompiler)
4848

‎app/src/main/AndroidManifest.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<application
99
android:name="net.chineseguide.jukuu.ui.App"
10-
android:allowBackup="false"
1110
android:icon="@mipmap/ic_launcher"
1211
android:label="@string/app_name"
1312
android:networkSecurityConfig="@xml/jukuu_http_protocol_workaround"
@@ -18,8 +17,8 @@
1817

1918
<activity
2019
android:name="net.chineseguide.jukuu.ui.main.MainActivity"
21-
android:label="@string/app_name"
22-
android:windowSoftInputMode="adjustPan|stateHidden">
20+
android:windowSoftInputMode="adjustPan|stateHidden"
21+
android:exported="true">
2322
<intent-filter>
2423
<action android:name="android.intent.action.MAIN" />
2524

‎app/src/main/java/net/chineseguide/jukuu/di/AppModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import dagger.Binds
55
import dagger.Module
66
import dagger.Provides
77
import dagger.hilt.InstallIn
8-
import dagger.hilt.android.components.ApplicationComponent
98
import dagger.hilt.android.qualifiers.ApplicationContext
9+
import dagger.hilt.components.SingletonComponent
1010
import net.chineseguide.jukuu.ui.App
1111
import javax.inject.Singleton
1212

1313
@Module
14-
@InstallIn(ApplicationComponent::class)
14+
@InstallIn(SingletonComponent::class)
1515
interface AppModule {
1616

1717
companion object {

‎app/src/main/java/net/chineseguide/jukuu/di/DataModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package net.chineseguide.jukuu.di
33
import dagger.Binds
44
import dagger.Module
55
import dagger.hilt.InstallIn
6-
import dagger.hilt.android.components.ApplicationComponent
6+
import dagger.hilt.components.SingletonComponent
77
import net.chineseguide.jukuu.data.api.SentenceApi
88
import net.chineseguide.jukuu.data.api.SentenceApiImpl
99
import net.chineseguide.jukuu.data.datasource.SentenceRemoteDataSource
@@ -13,7 +13,7 @@ import net.chineseguide.jukuu.domain.repository.SentenceRepository
1313
import javax.inject.Singleton
1414

1515
@Module
16-
@InstallIn(ApplicationComponent::class)
16+
@InstallIn(SingletonComponent::class)
1717
interface DataModule {
1818

1919
@Singleton

‎app/src/main/java/net/chineseguide/jukuu/di/LoggerModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package net.chineseguide.jukuu.di
33
import dagger.Binds
44
import dagger.Module
55
import dagger.hilt.InstallIn
6-
import dagger.hilt.android.components.ApplicationComponent
6+
import dagger.hilt.components.SingletonComponent
77
import net.chineseguide.jukuu.presentation.ErrorLogger
88
import net.chineseguide.jukuu.presentation.ErrorLoggerImpl
99
import javax.inject.Singleton
1010

1111
@Module
12-
@InstallIn(ApplicationComponent::class)
12+
@InstallIn(SingletonComponent::class)
1313
interface LoggerModule {
1414

1515
@Singleton

‎app/src/main/java/net/chineseguide/jukuu/navigation/Screens.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package net.chineseguide.jukuu.navigation
22

33
import net.chineseguide.jukuu.R
44

5-
const val homeScreen = R.id.homeFragment
6-
const val settingsScreen = R.id.settingsFragment
5+
val homeScreen = R.id.homeFragment
6+
val settingsScreen = R.id.settingsFragment

‎app/src/main/java/net/chineseguide/jukuu/presentation/home/HomeViewModel.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.chineseguide.jukuu.presentation.home
22

3-
import androidx.hilt.lifecycle.ViewModelInject
43
import androidx.lifecycle.LiveData
54
import androidx.lifecycle.MutableLiveData
65
import androidx.lifecycle.ViewModel
76
import androidx.lifecycle.viewModelScope
7+
import dagger.hilt.android.lifecycle.HiltViewModel
88
import kotlinx.coroutines.Dispatchers.IO
99
import kotlinx.coroutines.Dispatchers.Main
1010
import kotlinx.coroutines.launch
@@ -13,8 +13,10 @@ import net.chineseguide.jukuu.domain.entity.Sentence
1313
import net.chineseguide.jukuu.domain.usecase.GetNextSentencesUseCase
1414
import net.chineseguide.jukuu.domain.usecase.GetSentenceCollectionUseCase
1515
import net.chineseguide.jukuu.presentation.ErrorLogger
16+
import javax.inject.Inject
1617

17-
class HomeViewModel @ViewModelInject constructor(
18+
@HiltViewModel
19+
class HomeViewModel @Inject constructor(
1820
private val getSentenceCollectionUseCase: GetSentenceCollectionUseCase,
1921
private val getNextSentencesUseCase: GetNextSentencesUseCase,
2022
private val errorLogger: ErrorLogger

‎app/src/main/java/net/chineseguide/jukuu/presentation/home/sentence/dialog/SentencesViewModel.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package net.chineseguide.jukuu.presentation.home.sentence.dialog
22

3-
import androidx.hilt.Assisted
4-
import androidx.hilt.lifecycle.ViewModelInject
53
import androidx.lifecycle.LiveData
64
import androidx.lifecycle.MutableLiveData
75
import androidx.lifecycle.SavedStateHandle
86
import androidx.lifecycle.ViewModel
7+
import dagger.hilt.android.lifecycle.HiltViewModel
98
import net.chineseguide.jukuu.domain.entity.Sentence
9+
import javax.inject.Inject
1010

11-
class SentencesViewModel @ViewModelInject constructor(
12-
@Assisted private val savedStateHandle: SavedStateHandle
11+
@HiltViewModel
12+
class SentencesViewModel @Inject constructor(
13+
savedStateHandle: SavedStateHandle
1314
) : ViewModel() {
1415

1516
private val _clipboardText = MutableLiveData<String>()

‎app/src/main/java/net/chineseguide/jukuu/presentation/main/MainViewModel.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package net.chineseguide.jukuu.presentation.main
22

3-
import androidx.hilt.lifecycle.ViewModelInject
43
import androidx.lifecycle.ViewModel
4+
import dagger.hilt.android.lifecycle.HiltViewModel
55
import net.chineseguide.jukuu.navigation.Router
66
import net.chineseguide.jukuu.navigation.homeScreen
77
import net.chineseguide.jukuu.navigation.settingsScreen
8+
import javax.inject.Inject
89

9-
class MainViewModel @ViewModelInject constructor(
10+
@HiltViewModel
11+
class MainViewModel @Inject constructor(
1012
private val router: Router
1113
) : ViewModel() {
1214

‎buildSrc/src/main/java/Application.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Application {
22
const val id = "net.chineseguide.jukuu"
33
const val minApi = 19
4-
const val maxApi = 30
4+
const val maxApi = 34
55
const val versionCode = 1
66
const val versionName = "0.9.0"
77
}

‎buildSrc/src/main/java/Dependencies.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Versions {
2-
const val gradleAndroidPlugin = "3.6.0"
3-
const val kotlin = "1.3.61"
4-
const val daggerHilt = "2.28-alpha"
2+
const val gradleAndroidPlugin = "8.0.0"
3+
const val kotlin = "1.9.22"
4+
const val daggerHilt = "2.48"
55
const val hiltLifecycleViewModel = "1.0.0-alpha01"
66

77
const val jsoup = "1.13.1"
@@ -12,7 +12,7 @@ object Versions {
1212
const val coordinatorLayout = "1.1.0"
1313
const val fragment = "1.2.2"
1414
const val lifecycle = "2.2.0"
15-
const val navigation = "2.3.0-alpha04"
15+
const val navigation = "2.5.0"
1616

1717
const val googleServices = "4.3.4"
1818
const val crashlyticsGradle = "2.4.1"
@@ -36,7 +36,6 @@ object Libraries {
3636

3737
const val daggerHiltCore = "com.google.dagger:hilt-android:${Versions.daggerHilt}"
3838
const val daggerHiltAnnotationProcessor = "com.google.dagger:hilt-android-compiler:${Versions.daggerHilt}"
39-
const val hiltLifecycleViewModel = "androidx.hilt:hilt-lifecycle-viewmodel:${Versions.hiltLifecycleViewModel}"
4039
const val hiltAndroidxCompiler = "androidx.hilt:hilt-compiler:${Versions.hiltLifecycleViewModel}"
4140

4241
const val jsoup = "org.jsoup:jsoup:${Versions.jsoup}"

‎gradle/wrapper/gradle-wrapper.jar

3.83 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)