Skip to content

Commit 367f34e

Browse files
LennoardLennoard
committed
added design module
1 parent 9118c44 commit 367f34e

86 files changed

Lines changed: 589 additions & 369 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle.kts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
android {
14-
compileSdk = 31
14+
compileSdk = 32
1515
compileOptions {
1616
sourceCompatibility = JavaVersion.VERSION_1_8
1717
targetCompatibility = JavaVersion.VERSION_1_8
@@ -38,7 +38,7 @@ android {
3838
defaultConfig {
3939
applicationId = "com.androidvip.sysctlgui"
4040
minSdk = 21
41-
targetSdk = 31
41+
targetSdk = 32
4242
versionCode = 10
4343
versionName = "1.1.0"
4444
vectorDrawables.useSupportLibrary = true
@@ -112,17 +112,18 @@ dependencies {
112112
implementation(project(":domain"))
113113
implementation(project(":data"))
114114
implementation(project(":common:utils"))
115+
implementation(project(":common:design"))
115116

116117
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
117118
implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
118119
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2")
119120

120121
implementation("io.insert-koin:koin-android:3.1.3")
121122

122-
implementation("androidx.appcompat:appcompat:1.4.1")
123-
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
124-
implementation("androidx.core:core-ktx:1.7.0")
125-
implementation("androidx.core:core-splashscreen:1.0.0-beta01")
123+
implementation("androidx.appcompat:appcompat:1.6.0-alpha05")
124+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
125+
implementation("androidx.core:core-ktx:1.8.0")
126+
implementation("androidx.core:core-splashscreen:1.0.0")
126127
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
127128
implementation("androidx.navigation:navigation-fragment-ktx:2.4.0")
128129
implementation("androidx.navigation:navigation-ui-ktx:2.4.0")
@@ -131,7 +132,7 @@ dependencies {
131132
implementation("androidx.room:room-ktx:2.4.0")
132133
implementation("androidx.room:room-runtime:2.4.0")
133134

134-
implementation("com.google.android.material:material:1.6.0-alpha02")
135+
implementation("com.google.android.material:material:1.7.0-alpha03")
135136
implementation("com.google.code.gson:gson:2.8.6")
136137

137138
implementation("com.getkeepsafe.taptargetview:taptargetview:1.13.3")

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ abstract class BaseSearchActivity<Binding : ViewBinding>(
1919
WindowCompat.setDecorFitsSystemWindows(window, false)
2020
}
2121

22-
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
22+
override fun onCreateOptionsMenu(menu: Menu): Boolean {
2323
menuInflater.inflate(R.menu.menu_search, menu)
2424
setUpSearchView(menu)
2525

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsFragment.kt‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import androidx.fragment.app.Fragment
1111
import com.androidvip.sysctlgui.R
1212
import com.androidvip.sysctlgui.data.models.SettingsItem
1313
import com.androidvip.sysctlgui.databinding.FragmentExportOptionsBinding
14+
import com.androidvip.sysctlgui.design.ModalBottomSheet
1415
import com.androidvip.sysctlgui.helpers.OnSettingsItemClickedListener
1516
import com.androidvip.sysctlgui.toast
16-
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1717
import org.koin.androidx.viewmodel.ext.android.viewModel
1818

1919
class ExportOptionsFragment : Fragment(), OnSettingsItemClickedListener {
@@ -87,12 +87,12 @@ class ExportOptionsFragment : Fragment(), OnSettingsItemClickedListener {
8787
is ExportOptionsViewEffect.ExportUserParams -> requestExportFile(RC_EXPORT_USER_PARAMS)
8888
is ExportOptionsViewEffect.RestoreRuntimeParams -> requestImportFile(RC_RESTORE_PARAMS)
8989
is ExportOptionsViewEffect.BackupRuntimeParams -> requestExportFile(RC_BACKUP_PARAMS)
90-
is ExportOptionsViewEffect.ShowImportError -> showErrorDialog(it.messageRes)
91-
is ExportOptionsViewEffect.ShowImportSuccess -> showSuccessDialog(
90+
is ExportOptionsViewEffect.ShowImportError -> showErrorModal(it.messageRes)
91+
is ExportOptionsViewEffect.ShowImportSuccess -> showSuccessModal(
9292
getString(R.string.import_success_message, it.paramCount)
9393
)
94-
is ExportOptionsViewEffect.ShowExportError -> showErrorDialog(it.messageRes)
95-
is ExportOptionsViewEffect.ShowExportSuccess -> showSuccessDialog(
94+
is ExportOptionsViewEffect.ShowExportError -> showErrorModal(it.messageRes)
95+
is ExportOptionsViewEffect.ShowExportSuccess -> showSuccessModal(
9696
getString(R.string.export_success_message)
9797
)
9898
}
@@ -123,26 +123,24 @@ class ExportOptionsFragment : Fragment(), OnSettingsItemClickedListener {
123123
startActivityForResult(intent, requestCode)
124124
}
125125

126-
private fun showErrorDialog(@StringRes messageRes: Int) {
127-
MaterialAlertDialogBuilder(requireContext())
128-
.setTitle(R.string.error)
129-
.setMessage(messageRes)
130-
.setIcon(R.drawable.ic_close)
131-
.create()
132-
.also { dialog ->
133-
if (isAdded) dialog.show()
134-
}
126+
private fun showErrorModal(@StringRes messageRes: Int) {
127+
ModalBottomSheet.newInstance(
128+
getString(R.string.error),
129+
getString(messageRes),
130+
getString(android.R.string.ok)
131+
).also {
132+
if (isAdded) it.show(childFragmentManager, "sheet")
133+
}
135134
}
136135

137-
private fun showSuccessDialog(message: String) {
138-
MaterialAlertDialogBuilder(requireContext())
139-
.setTitle(R.string.done)
140-
.setMessage(message)
141-
.setIcon(R.drawable.ic_check)
142-
.create()
143-
.also { dialog ->
144-
if (isAdded) dialog.show()
145-
}
136+
private fun showSuccessModal(message: String) {
137+
ModalBottomSheet.newInstance(
138+
getString(R.string.done),
139+
message,
140+
getString(android.R.string.ok)
141+
).also {
142+
if (isAdded) it.show(childFragmentManager, "sheet")
143+
}
146144
}
147145

148146
companion object {

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/HomeItemAdapter.kt‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditKernelParamActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ class EditKernelParamActivity : AppCompatActivity() {
7676
supportFinishAfterTransition()
7777
}
7878

79-
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
79+
override fun onCreateOptionsMenu(menu: Menu): Boolean {
8080
if (this::kernelParameter.isInitialized.not()) {
8181
return false
8282
}
8383
menuInflater.inflate(R.menu.menu_edit_params, menu)
84-
menu?.findItem(R.id.action_favorite)?.let {
84+
menu.findItem(R.id.action_favorite)?.let {
8585
if (kernelParameter.favorite) {
8686
it.setIcon(R.drawable.ic_favorite_selected)
8787
} else {
8888
it.setIcon(R.drawable.ic_favorite_unselected)
8989
}
9090
}
9191

92-
menu?.findItem(R.id.action_tasker)?.let {
92+
menu.findItem(R.id.action_tasker)?.let {
9393
if (isTaskerInstalled()) {
9494
it.isVisible = true
9595
if (kernelParameter.taskerParam) {

‎app/src/main/res/drawable/ic_action_tasker_add.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
2+
android:width="@dimen/d24"
3+
android:height="@dimen/d24"
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66

‎app/src/main/res/drawable/ic_action_tasker_remove.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
2+
android:width="@dimen/d24"
3+
android:height="@dimen/d24"
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66

‎app/src/main/res/drawable/ic_backup_params.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
2+
android:width="@dimen/d24"
3+
android:height="@dimen/d24"
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path

‎app/src/main/res/drawable/ic_check.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
2+
android:width="@dimen/d24"
3+
android:height="@dimen/d24"
44
android:viewportWidth="24.0"
55
android:viewportHeight="24.0">
66
<path

‎app/src/main/res/drawable/ic_close.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
2+
android:width="@dimen/d24"
3+
android:height="@dimen/d24"
44
android:viewportWidth="24.0"
55
android:viewportHeight="24.0">
66
<path

0 commit comments

Comments
 (0)