Skip to content

Commit 5e38daf

Browse files
authored
Merge pull request #26 from Lennoard/feature/backup
Feature/backup
2 parents 2e9d899 + 37a2ee8 commit 5e38daf

55 files changed

Lines changed: 1188 additions & 651 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/src/main/AndroidManifest.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
android:label="@string/edit_params"
2929
android:theme="@style/AppTheme.NoActionBar" />
3030
<activity
31-
android:name=".ui.MainActivity"
31+
android:name=".ui.main.MainActivity"
3232
android:label="@string/app_name"
3333
android:theme="@style/AppTheme.NoActionBar" />
3434
<activity
@@ -40,6 +40,10 @@
4040
<activity
4141
android:name=".ui.params.user.ManageOnStartUpParamsActivity"
4242
android:label="@string/manage_parameters" />
43+
<activity
44+
android:name=".ui.export.ExportOptionsActivity"
45+
android:label="@string/export_options"
46+
android:theme="@style/AppTheme.NoActionBar" />
4347
<activity
4448
android:name=".ui.SplashActivity"
4549
android:theme="@style/AppTheme.NoActionBar">
@@ -103,7 +107,7 @@
103107
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
104108

105109
<intent-filter>
106-
<action android:name="android.service.quicksettings.action.QS_TILE"/>
110+
<action android:name="android.service.quicksettings.action.QS_TILE" />
107111
</intent-filter>
108112
</service>
109113
<service
@@ -113,7 +117,7 @@
113117
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
114118

115119
<intent-filter>
116-
<action android:name="android.service.quicksettings.action.QS_TILE"/>
120+
<action android:name="android.service.quicksettings.action.QS_TILE" />
117121
</intent-filter>
118122
</service>
119123
</application>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.androidvip.sysctlgui.data.models
2+
3+
import androidx.annotation.DrawableRes
4+
import androidx.annotation.StringRes
5+
6+
data class SettingsItem(
7+
@StringRes val titleRes: Int,
8+
@StringRes val descriptionRes: Int,
9+
@DrawableRes val iconRes: Int
10+
)

app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.androidvip.sysctlgui.di
22

3+
import com.androidvip.sysctlgui.ui.export.ExportOptionsViewModel
4+
import com.androidvip.sysctlgui.ui.main.MainViewModel
35
import com.androidvip.sysctlgui.ui.params.browse.BrowseParamsViewModel
46
import com.androidvip.sysctlgui.ui.params.list.ListParamsViewModel
57
import com.androidvip.sysctlgui.ui.params.user.UserParamsViewModel
@@ -13,6 +15,8 @@ internal val presentationModules = module {
1315
viewModel { BrowseParamsViewModel(get(), Dispatchers.IO) }
1416
viewModel { ListParamsViewModel(get()) }
1517
viewModel { UserParamsViewModel(get(), get(), get()) }
18+
viewModel { MainViewModel() }
19+
viewModel { ExportOptionsViewModel(get(), get(), get()) }
1620

1721
single { FavoriteWidgetParamUpdater(androidContext()).getListener() }
1822
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.androidvip.sysctlgui.helpers
2+
3+
import com.androidvip.sysctlgui.data.models.SettingsItem
4+
5+
interface OnSettingsItemClickedListener {
6+
fun onSettingsItemClicked(item: SettingsItem, position: Int)
7+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.androidvip.sysctlgui.helpers
2+
3+
import androidx.recyclerview.widget.DiffUtil
4+
import com.androidvip.sysctlgui.data.models.SettingsItem
5+
6+
internal object SettingsItemDiffCallback : DiffUtil.ItemCallback<SettingsItem>() {
7+
override fun areItemsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean {
8+
return oldItem.titleRes == newItem.titleRes
9+
}
10+
11+
override fun areContentsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean {
12+
return oldItem == newItem
13+
}
14+
}

app/src/main/kotlin/com/androidvip/sysctlgui/ui/MainActivity.kt

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

app/src/main/kotlin/com/androidvip/sysctlgui/ui/SplashActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import com.androidvip.sysctlgui.domain.repository.AppPrefs
1616
import com.androidvip.sysctlgui.domain.usecase.PerformDatabaseMigrationUseCase
1717
import com.androidvip.sysctlgui.goAway
1818
import com.androidvip.sysctlgui.helpers.Actions
19+
import com.androidvip.sysctlgui.ui.main.MainActivity
1920
import com.androidvip.sysctlgui.ui.params.browse.KernelParamBrowserActivity
2021
import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
2122
import com.androidvip.sysctlgui.ui.params.list.KernelParamListActivity

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import androidx.recyclerview.widget.RecyclerView
66
abstract class BaseViewHolder<T>(
77
binding: ViewDataBinding
88
) : RecyclerView.ViewHolder(binding.root) {
9-
abstract fun bind(item: T)
10-
}
9+
abstract fun bind(item: T, position: Int)
10+
}

0 commit comments

Comments
 (0)