-
Notifications
You must be signed in to change notification settings - Fork 4
Migrate to Android Gradle Plugin 9 and upgrade packages #60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d651b81
chore: 🤖 upgrade to agp 9
ricky9667 5b31d3b
chore: 🤖 upgrade packages
ricky9667 a1994b7
refactor: 💡 replace hilt with koin
ricky9667 e878488
fix: 🐛 add xmls for icon replacement
ricky9667 f272e67
fix: 🐛 fix failing ui tests after package upgrade
ricky9667 ac7655a
chore: 🤖 upgrade gradle wrapper version
ricky9667 d674b4b
refactor: 💡 refactor Routes and NavHost
ricky9667 8647019
style: 💄 lint xml file
ricky9667 a834699
docs: ✏️ add comments
ricky9667 7dfb902
refactor: 💡 use koin to manage KeyboardViewModel
ricky9667 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 15 additions & 3 deletions
18
app/src/main/java/com/rickyhu/hushkeyboard/HushApplication.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| package com.rickyhu.hushkeyboard | ||
|
|
||
| import android.app.Application | ||
| import dagger.hilt.android.HiltAndroidApp | ||
| import com.rickyhu.hushkeyboard.di.appModule | ||
| import org.koin.android.ext.koin.androidContext | ||
| import org.koin.core.context.GlobalContext | ||
| import org.koin.core.context.startKoin | ||
| import org.koin.core.context.stopKoin | ||
|
|
||
| @HiltAndroidApp | ||
| class HushApplication : Application() | ||
| class HushApplication : Application() { | ||
| override fun onCreate() { | ||
| super.onCreate() | ||
| if (GlobalContext.getOrNull() != null) stopKoin() | ||
ricky9667 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| startKoin { | ||
| androidContext(this@HushApplication) | ||
| modules(appModule) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
app/src/main/java/com/rickyhu/hushkeyboard/di/AppModule.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.rickyhu.hushkeyboard.di | ||
|
|
||
| import com.rickyhu.hushkeyboard.data.SettingsRepository | ||
| import com.rickyhu.hushkeyboard.keyboard.KeyboardViewModel | ||
| import com.rickyhu.hushkeyboard.main.MainViewModel | ||
| import com.rickyhu.hushkeyboard.settings.SettingsViewModel | ||
| import org.koin.android.ext.koin.androidContext | ||
| import org.koin.core.module.dsl.viewModel | ||
| import org.koin.dsl.module | ||
|
|
||
| val appModule = | ||
| module { | ||
| single { SettingsRepository(androidContext()) } | ||
| viewModel { MainViewModel(get()) } | ||
| viewModel { SettingsViewModel(get()) } | ||
| viewModel { KeyboardViewModel(get()) } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
app/src/main/java/com/rickyhu/hushkeyboard/keyboard/KeyboardViewModelFactory.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.rickyhu.hushkeyboard.keyboard | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import com.rickyhu.hushkeyboard.data.SettingsRepository | ||
|
|
||
| class KeyboardViewModelFactory( | ||
| private val settingsRepository: SettingsRepository, | ||
| ) : ViewModelProvider.Factory { | ||
| override fun <T : ViewModel> create(modelClass: Class<T>): T { | ||
| if (modelClass.isAssignableFrom(KeyboardViewModel::class.java)) { | ||
| @Suppress("UNCHECKED_CAST") | ||
| return KeyboardViewModel(settingsRepository) as T | ||
| } | ||
| throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,34 @@ | ||
| package com.rickyhu.hushkeyboard.service | ||
|
|
||
| import android.view.View | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import androidx.lifecycle.ViewModelStore | ||
| import androidx.lifecycle.ViewModelStoreOwner | ||
| import androidx.lifecycle.setViewTreeLifecycleOwner | ||
| import androidx.savedstate.SavedStateRegistryController | ||
| import androidx.savedstate.SavedStateRegistryOwner | ||
| import androidx.savedstate.setViewTreeSavedStateRegistryOwner | ||
| import com.rickyhu.hushkeyboard.data.SettingsRepository | ||
| import com.rickyhu.hushkeyboard.keyboard.HushKeyboardView | ||
| import com.rickyhu.hushkeyboard.keyboard.KeyboardViewModel | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import javax.inject.Inject | ||
| import com.rickyhu.hushkeyboard.keyboard.KeyboardViewModelFactory | ||
| import org.koin.android.ext.android.inject | ||
|
|
||
| @AndroidEntryPoint | ||
| class HushIMEService : | ||
| LifecycleInputMethodService(), | ||
| SavedStateRegistryOwner { | ||
| @Inject | ||
| SavedStateRegistryOwner, | ||
| ViewModelStoreOwner { | ||
| private val settingsRepository: SettingsRepository by inject() | ||
| lateinit var viewModel: KeyboardViewModel | ||
|
|
||
| private val savedStateRegistryController = SavedStateRegistryController.create(this) | ||
| override val savedStateRegistry = savedStateRegistryController.savedStateRegistry | ||
|
|
||
| override val lifecycle = dispatcher.lifecycle | ||
|
|
||
| private val _viewModelStore = ViewModelStore() | ||
| override val viewModelStore: ViewModelStore get() = _viewModelStore | ||
|
|
||
| override fun onCreateInputView(): View { | ||
| val view = HushKeyboardView(this) | ||
| window.window?.decorView.let { decorView -> | ||
|
|
@@ -34,5 +41,15 @@ class HushIMEService : | |
| override fun onCreate() { | ||
| super.onCreate() | ||
| savedStateRegistryController.performRestore(null) | ||
| viewModel = | ||
| ViewModelProvider( | ||
| owner = this, | ||
| factory = KeyboardViewModelFactory(settingsRepository), | ||
| )[KeyboardViewModel::class.java] | ||
|
||
| } | ||
|
|
||
| override fun onDestroy() { | ||
| super.onDestroy() | ||
| _viewModelStore.clear() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Java version has been downgraded from 21 to 17. While this increases compatibility, please ensure this change is intentional and necessary. Java 21 is the latest LTS version and offers significant performance and feature improvements. If the downgrade is required for specific compatibility reasons, those reasons should be documented in the PR description or commit message.