Merge pull request #26 from Lennoard/feature/backup

Feature/backup
Lennoard · Nov 20, 2021 · 5e38daf · 5e38daf
2 parents 2e9d899 + 37a2ee8
commit 5e38daf
Show file tree

Hide file tree

Showing 55 changed files with 1,188 additions and 651 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
             android:label="@string/edit_params"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.main.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
@@ -40,6 +40,10 @@
         <activity
             android:name=".ui.params.user.ManageOnStartUpParamsActivity"
             android:label="@string/manage_parameters" />
+        <activity
+            android:name=".ui.export.ExportOptionsActivity"
+            android:label="@string/export_options"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.SplashActivity"
             android:theme="@style/AppTheme.NoActionBar">
@@ -103,7 +107,7 @@
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
 
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
         <service
@@ -113,7 +117,7 @@
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
 
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
     </application>

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/data/models/SettingsItem.kt
@@ -0,0 +1,10 @@
+package com.androidvip.sysctlgui.data.models
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+data class SettingsItem(
+    @StringRes val titleRes: Int,
+    @StringRes val descriptionRes: Int,
+    @DrawableRes val iconRes: Int
+)
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/di/PresentationModule.kt
@@ -1,5 +1,7 @@
 package com.androidvip.sysctlgui.di
 
+import com.androidvip.sysctlgui.ui.export.ExportOptionsViewModel
+import com.androidvip.sysctlgui.ui.main.MainViewModel
 import com.androidvip.sysctlgui.ui.params.browse.BrowseParamsViewModel
 import com.androidvip.sysctlgui.ui.params.list.ListParamsViewModel
 import com.androidvip.sysctlgui.ui.params.user.UserParamsViewModel
@@ -13,6 +15,8 @@ internal val presentationModules = module {
     viewModel { BrowseParamsViewModel(get(), Dispatchers.IO) }
     viewModel { ListParamsViewModel(get()) }
     viewModel { UserParamsViewModel(get(), get(), get()) }
+    viewModel { MainViewModel() }
+    viewModel { ExportOptionsViewModel(get(), get(), get()) }
 
     single { FavoriteWidgetParamUpdater(androidContext()).getListener() }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/OnSettingsItemClickedListener.kt
@@ -0,0 +1,7 @@
+package com.androidvip.sysctlgui.helpers
+
+import com.androidvip.sysctlgui.data.models.SettingsItem
+
+interface OnSettingsItemClickedListener {
+    fun onSettingsItemClicked(item: SettingsItem, position: Int)
+}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/SettingsItemDiffCallback.kt
@@ -0,0 +1,14 @@
+package com.androidvip.sysctlgui.helpers
+
+import androidx.recyclerview.widget.DiffUtil
+import com.androidvip.sysctlgui.data.models.SettingsItem
+
+internal object SettingsItemDiffCallback : DiffUtil.ItemCallback<SettingsItem>() {
+    override fun areItemsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean {
+        return oldItem.titleRes == newItem.titleRes
+    }
+
+    override fun areContentsTheSame(oldItem: SettingsItem, newItem: SettingsItem): Boolean {
+        return oldItem == newItem
+    }
+}
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/MainActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/MainActivity.kt
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/SplashActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/SplashActivity.kt
@@ -16,6 +16,7 @@ import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.PerformDatabaseMigrationUseCase
 import com.androidvip.sysctlgui.goAway
 import com.androidvip.sysctlgui.helpers.Actions
+import com.androidvip.sysctlgui.ui.main.MainActivity
 import com.androidvip.sysctlgui.ui.params.browse.KernelParamBrowserActivity
 import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
 import com.androidvip.sysctlgui.ui.params.list.KernelParamListActivity

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseViewHolder.kt
@@ -6,5 +6,5 @@ import androidx.recyclerview.widget.RecyclerView
 abstract class BaseViewHolder<T>(
     binding: ViewDataBinding
 ) : RecyclerView.ViewHolder(binding.root) {
-    abstract fun bind(item: T)
-}
+    abstract fun bind(item: T, position: Int)
+}