[build]: refactored app a little once again

F0x1d · Nov 3, 2024 · 2d98830 · 2d98830
1 parent 8266e12
commit 2d98830
Show file tree

Hide file tree

Showing 244 changed files with 2,151 additions and 1,673 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,10 +15,28 @@ android {
 }
 
 dependencies {
+    implementation(projects.feature.appsPicker.api)
+    implementation(projects.feature.appsPicker.impl)
+
+    implementation(projects.feature.crashes.appsList)
+    implementation(projects.feature.crashes.details)
     implementation(projects.feature.crashes.impl)
+    implementation(projects.feature.crashes.list)
+
+    implementation(projects.feature.filters.edit)
     implementation(projects.feature.filters.impl)
+    implementation(projects.feature.filters.list)
+
+    implementation(projects.feature.logging.extendedCopy)
     implementation(projects.feature.logging.impl)
+    implementation(projects.feature.logging.list)
+    implementation(projects.feature.logging.search)
+    implementation(projects.feature.logging.service)
+
+    implementation(projects.feature.recordings.details)
     implementation(projects.feature.recordings.impl)
+    implementation(projects.feature.recordings.list)
+
     implementation(projects.feature.settings)
     implementation(projects.feature.setup)
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:enableOnBackInvokedCallback="true">
 
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".presentation.ui.activity.MainActivity"
             android:windowSoftInputMode="adjustResize"
             android:launchMode="singleInstance"
             android:exported="true">
@@ -30,7 +30,7 @@
         </activity>
 
         <activity
-            android:name=".ui.activity.OpenFileActivity"
+            android:name=".presentation.ui.activity.OpenFileActivity"
             android:documentLaunchMode="always"
             android:excludeFromRecents="true"
             android:theme="@style/Theme.LogFox.Translucent"

diff --git a/app/src/main/kotlin/com/f0x1d/logfox/coil/AppIconFetcher.kt b/app/src/main/kotlin/com/f0x1d/logfox/coil/AppIconFetcher.kt
@@ -8,7 +8,7 @@ import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.request.Options
 import com.f0x1d.logfox.arch.di.IODispatcher
-import com.f0x1d.logfox.model.InstalledApp
+import com.f0x1d.logfox.feature.apps.picker.InstalledApp
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -35,9 +35,9 @@ class AppIconFetcher(
     class Factory @Inject constructor(
         @ApplicationContext private val context: Context,
         @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-    ) : Fetcher.Factory<InstalledApp> {
+    ) : Fetcher.Factory<com.f0x1d.logfox.feature.apps.picker.InstalledApp> {
         override fun create(
-            data: InstalledApp,
+            data: com.f0x1d.logfox.feature.apps.picker.InstalledApp,
             options: Options,
             imageLoader: ImageLoader,
         ): Fetcher = AppIconFetcher(

diff --git a/app/src/main/kotlin/com/f0x1d/logfox/di/logs/MainActivityPendingIntentProviderModule.kt b/app/src/main/kotlin/com/f0x1d/logfox/di/logs/MainActivityPendingIntentProviderModule.kt
@@ -3,8 +3,8 @@ package com.f0x1d.logfox.di.logs
 import android.app.PendingIntent
 import android.content.Context
 import com.f0x1d.logfox.arch.makeActivityPendingIntent
-import com.f0x1d.logfox.feature.logging.impl.service.MainActivityPendingIntentProvider
-import com.f0x1d.logfox.ui.activity.MainActivity
+import com.f0x1d.logfox.feature.logging.service.presentation.MainActivityPendingIntentProvider
+import com.f0x1d.logfox.presentation.ui.activity.MainActivity
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

diff --git a/app/src/main/kotlin/com/f0x1d/logfox/di/settings/LoggingServiceDelegateModule.kt b/app/src/main/kotlin/com/f0x1d/logfox/di/settings/LoggingServiceDelegateModule.kt
diff --git a/app/src/main/kotlin/com/f0x1d/logfox/presentation/MainAction.kt b/app/src/main/kotlin/com/f0x1d/logfox/presentation/MainAction.kt
@@ -0,0 +1,5 @@
+package com.f0x1d.logfox.presentation
+
+sealed interface MainAction {
+    data object OpenSetup : MainAction
+}
diff --git a/app/src/main/kotlin/com/f0x1d/logfox/presentation/MainState.kt b/app/src/main/kotlin/com/f0x1d/logfox/presentation/MainState.kt
@@ -0,0 +1,3 @@
+package com.f0x1d.logfox.presentation
+
+data object MainState
diff --git a/...m/f0x1d/logfox/viewmodel/MainViewModel.kt → ...0x1d/logfox/presentation/MainViewModel.kt b/...m/f0x1d/logfox/viewmodel/MainViewModel.kt → ...0x1d/logfox/presentation/MainViewModel.kt
@@ -1,12 +1,10 @@
-package com.f0x1d.logfox.viewmodel
+package com.f0x1d.logfox.presentation
 
 import android.app.Application
 import android.content.Intent
 import com.f0x1d.logfox.arch.hasPermissionToReadLogs
 import com.f0x1d.logfox.arch.startForegroundServiceAvailable
 import com.f0x1d.logfox.arch.viewmodel.BaseViewModel
-import com.f0x1d.logfox.arch.viewmodel.Event
-import com.f0x1d.logfox.feature.logging.impl.service.LoggingService
 import com.f0x1d.logfox.preferences.shared.AppPreferences
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -15,8 +13,10 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     private val appPreferences: AppPreferences,
     application: Application,
-): BaseViewModel(application) {
-
+) : BaseViewModel<MainState, MainAction>(
+    initialStateProvider = { MainState },
+    application = application,
+) {
     var askedNotificationsPermission
         get() = appPreferences.askedNotificationsPermission
         set(value) { appPreferences.askedNotificationsPermission = value }
@@ -29,16 +29,14 @@ class MainViewModel @Inject constructor(
 
     private fun load() {
         if (ctx.hasPermissionToReadLogs) {
-            Intent(ctx, LoggingService::class.java).let {
+            Intent(ctx, com.f0x1d.logfox.feature.logging.service.presentation.LoggingService::class.java).let {
                 if (startForegroundServiceAvailable)
                     ctx.startForegroundService(it)
                 else
                     ctx.startService(it)
             }
         } else {
-            sendEvent(OpenSetup)
+            sendAction(MainAction.OpenSetup)
         }
     }
 }
-
-data object OpenSetup : Event
diff --git a/.../f0x1d/logfox/ui/activity/MainActivity.kt → .../presentation/ui/activity/MainActivity.kt b/.../f0x1d/logfox/ui/activity/MainActivity.kt → .../presentation/ui/activity/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.ui.activity
+package com.f0x1d.logfox.presentation.ui.activity
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -23,22 +23,21 @@ import com.f0x1d.logfox.arch.contrastedNavBarAvailable
 import com.f0x1d.logfox.arch.gesturesAvailable
 import com.f0x1d.logfox.arch.hasNotificationsPermission
 import com.f0x1d.logfox.arch.isHorizontalOrientation
-import com.f0x1d.logfox.arch.ui.activity.BaseViewModelActivity
-import com.f0x1d.logfox.arch.viewmodel.Event
+import com.f0x1d.logfox.arch.presentation.ui.activity.BaseActivity
 import com.f0x1d.logfox.databinding.ActivityMainBinding
 import com.f0x1d.logfox.navigation.Directions
 import com.f0x1d.logfox.navigation.NavGraphs
+import com.f0x1d.logfox.presentation.MainAction
+import com.f0x1d.logfox.presentation.MainViewModel
 import com.f0x1d.logfox.strings.Strings
 import com.f0x1d.logfox.ui.Icons
-import com.f0x1d.logfox.viewmodel.MainViewModel
-import com.f0x1d.logfox.viewmodel.OpenSetup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(), NavController.OnDestinationChangedListener {
+class MainActivity: BaseActivity<ActivityMainBinding>(), NavController.OnDestinationChangedListener {
 
-    override val viewModel by viewModels<MainViewModel>()
+    private val viewModel by viewModels<MainViewModel>()
 
     private val navController by lazy {
         val navHostFragment = supportFragmentManager.findFragmentById(
@@ -94,6 +93,12 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
 
             viewModel.askedNotificationsPermission = true
         }
+
+        viewModel.actions.collectWithLifecycle { action ->
+            when (action) {
+                is MainAction.OpenSetup -> navController.navigate(Directions.action_global_setupFragment)
+            }
+        }
     }
 
     private fun ActivityMainBinding.setupNavigation() {
@@ -139,14 +144,6 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
         }
     }
 
-    override fun onEvent(event: Event) {
-        super.onEvent(event)
-
-        when (event) {
-            is OpenSetup -> navController.navigate(Directions.action_global_setupFragment)
-        }
-    }
-
     override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
         val barShown = when (destination.id) {
             Directions.setupFragment -> false

diff --git a/...1d/logfox/ui/activity/OpenFileActivity.kt → ...sentation/ui/activity/OpenFileActivity.kt b/...1d/logfox/ui/activity/OpenFileActivity.kt → ...sentation/ui/activity/OpenFileActivity.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.ui.activity
+package com.f0x1d.logfox.presentation.ui.activity
 
 import android.content.Intent
 import android.os.Bundle
@@ -19,4 +19,4 @@ class OpenFileActivity: AppCompatActivity() {
         )
         finish()
     }
-}
+}
diff --git a/app/src/main/kotlin/com/f0x1d/logfox/receiver/BootReceiver.kt b/app/src/main/kotlin/com/f0x1d/logfox/receiver/BootReceiver.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import com.f0x1d.logfox.arch.hasPermissionToReadLogs
 import com.f0x1d.logfox.arch.startForegroundServiceAvailable
 import com.f0x1d.logfox.arch.toast
-import com.f0x1d.logfox.feature.logging.impl.service.LoggingService
+import com.f0x1d.logfox.feature.logging.service.presentation.LoggingService
 import com.f0x1d.logfox.preferences.shared.AppPreferences
 import com.f0x1d.logfox.strings.Strings
 import com.f0x1d.logfox.terminals.ShizukuTerminal
@@ -26,7 +26,7 @@ class BootReceiver: BroadcastReceiver() {
             }
 
             if (context.hasPermissionToReadLogs) {
-                Intent(context, LoggingService::class.java).let {
+                Intent(context, com.f0x1d.logfox.feature.logging.service.presentation.LoggingService::class.java).let {
                     if (startForegroundServiceAvailable)
                         context.startForegroundService(it)
                     else

diff --git a/...1d/logfox/arch/adapter/BaseListAdapter.kt → ...h/presentation/adapter/BaseListAdapter.kt b/...1d/logfox/arch/adapter/BaseListAdapter.kt → ...h/presentation/adapter/BaseListAdapter.kt
@@ -1,12 +1,12 @@
-package com.f0x1d.logfox.arch.adapter
+package com.f0x1d.logfox.arch.presentation.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.f0x1d.logfox.arch.ui.viewholder.BaseViewHolder
+import com.f0x1d.logfox.arch.presentation.ui.viewholder.BaseViewHolder
 
 abstract class BaseListAdapter<T, D : ViewBinding>(
     diffUtil: DiffUtil.ItemCallback<T>,

diff --git a/...n/com/f0x1d/logfox/arch/ui/SnackbarExt.kt → ...ogfox/arch/presentation/ui/SnackbarExt.kt b/...n/com/f0x1d/logfox/arch/ui/SnackbarExt.kt → ...ogfox/arch/presentation/ui/SnackbarExt.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui
+package com.f0x1d.logfox.arch.presentation.ui
 
 import android.view.View
 import com.google.android.material.snackbar.Snackbar

diff --git a/...lin/com/f0x1d/logfox/arch/ui/WindowExt.kt → .../logfox/arch/presentation/ui/WindowExt.kt b/...lin/com/f0x1d/logfox/arch/ui/WindowExt.kt → .../logfox/arch/presentation/ui/WindowExt.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui
+package com.f0x1d.logfox.arch.presentation.ui
 
 import android.content.Context
 import android.graphics.Color

diff --git a/...d/logfox/arch/ui/activity/BaseActivity.kt → .../presentation/ui/activity/BaseActivity.kt b/...d/logfox/arch/ui/activity/BaseActivity.kt → .../presentation/ui/activity/BaseActivity.kt
@@ -1,12 +1,12 @@
-package com.f0x1d.logfox.arch.ui.activity
+package com.f0x1d.logfox.arch.presentation.ui.activity
 
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
-import com.f0x1d.logfox.arch.ui.base.SimpleLifecycleOwner
-import com.f0x1d.logfox.arch.ui.enableEdgeToEdge
-import com.f0x1d.logfox.arch.ui.snackbar
+import com.f0x1d.logfox.arch.presentation.ui.base.SimpleLifecycleOwner
+import com.f0x1d.logfox.arch.presentation.ui.enableEdgeToEdge
+import com.f0x1d.logfox.arch.presentation.ui.snackbar
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors

diff --git a/...gfox/arch/ui/base/SimpleLifecycleOwner.kt → ...sentation/ui/base/SimpleLifecycleOwner.kt b/...gfox/arch/ui/base/SimpleLifecycleOwner.kt → ...sentation/ui/base/SimpleLifecycleOwner.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui.base
+package com.f0x1d.logfox.arch.presentation.ui.base
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner

diff --git a/.../logfox/arch/ui/dialog/BaseBottomSheet.kt → ...tion/ui/dialog/BaseBottomSheetFragment.kt b/.../logfox/arch/ui/dialog/BaseBottomSheet.kt → ...tion/ui/dialog/BaseBottomSheetFragment.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui.dialog
+package com.f0x1d.logfox.arch.presentation.ui.dialog
 
 import android.annotation.SuppressLint
 import android.app.Dialog
@@ -7,13 +7,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.viewbinding.ViewBinding
-import com.f0x1d.logfox.arch.ui.base.SimpleFragmentLifecycleOwner
-import com.f0x1d.logfox.arch.ui.enableEdgeToEdge
+import com.f0x1d.logfox.arch.presentation.ui.base.SimpleFragmentLifecycleOwner
+import com.f0x1d.logfox.arch.presentation.ui.enableEdgeToEdge
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
-abstract class BaseBottomSheet<T : ViewBinding>: BottomSheetDialogFragment(), SimpleFragmentLifecycleOwner {
+abstract class BaseBottomSheetFragment<T : ViewBinding>: BottomSheetDialogFragment(),
+    SimpleFragmentLifecycleOwner {
 
     private var mutableBinding: T? = null
     protected val binding: T get() = mutableBinding!!

diff --git a/...d/logfox/arch/ui/fragment/BaseFragment.kt → .../presentation/ui/fragment/BaseFragment.kt b/...d/logfox/arch/ui/fragment/BaseFragment.kt → .../presentation/ui/fragment/BaseFragment.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui.fragment
+package com.f0x1d.logfox.arch.presentation.ui.fragment
 
 import android.content.res.Configuration
 import android.os.Bundle
@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
-import com.f0x1d.logfox.arch.ui.base.SimpleFragmentLifecycleOwner
-import com.f0x1d.logfox.arch.ui.snackbar
+import com.f0x1d.logfox.arch.presentation.ui.base.SimpleFragmentLifecycleOwner
+import com.f0x1d.logfox.arch.presentation.ui.snackbar
 import dev.chrisbanes.insetter.applyInsetter
 
 abstract class BaseFragment<T : ViewBinding>: Fragment(), SimpleFragmentLifecycleOwner {

diff --git a/...i/fragment/compose/BaseComposeFragment.kt → ...i/fragment/compose/BaseComposeFragment.kt b/...i/fragment/compose/BaseComposeFragment.kt → ...i/fragment/compose/BaseComposeFragment.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.arch.ui.fragment.compose
+package com.f0x1d.logfox.arch.presentation.ui.fragment.compose
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import com.f0x1d.logfox.arch.databinding.FragmentComposeBinding
-import com.f0x1d.logfox.arch.ui.fragment.BaseFragment
+import com.f0x1d.logfox.arch.presentation.ui.fragment.BaseFragment
 
 abstract class BaseComposeFragment : BaseFragment<FragmentComposeBinding>() {
 
@@ -25,11 +25,11 @@ abstract class BaseComposeFragment : BaseFragment<FragmentComposeBinding>() {
 
     @Composable
     abstract fun Content()
-}
 
-internal fun ComposeView.setup(content: @Composable () -> Unit) {
-    consumeWindowInsets = false
-    setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+    private fun ComposeView.setup(content: @Composable () -> Unit) {
+        consumeWindowInsets = false
+        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
-    setContent(content)
+        setContent(content)
+    }
 }
diff --git a/...gfox/arch/ui/viewholder/BaseViewHolder.kt → ...sentation/ui/viewholder/BaseViewHolder.kt b/...gfox/arch/ui/viewholder/BaseViewHolder.kt → ...sentation/ui/viewholder/BaseViewHolder.kt
@@ -1,8 +1,8 @@
-package com.f0x1d.logfox.arch.ui.viewholder
+package com.f0x1d.logfox.arch.presentation.ui.viewholder
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.f0x1d.logfox.arch.adapter.BaseListAdapter
+import com.f0x1d.logfox.arch.presentation.adapter.BaseListAdapter
 
 abstract class BaseViewHolder<T, D : ViewBinding>(
     protected val binding: D

diff --git a/core/arch/src/main/kotlin/com/f0x1d/logfox/arch/repository/BaseRepository.kt b/core/arch/src/main/kotlin/com/f0x1d/logfox/arch/repository/BaseRepository.kt