From 4c7780b069c1bf5c7512551a88bcc7d53e98d629 Mon Sep 17 00:00:00 2001
From: F0x1d <i@f0x1d.com>
Date: Sun, 29 Oct 2023 01:36:33 +0300
Subject: [PATCH] [feat]: single activity app now

---
 app/src/main/AndroidManifest.xml              | 24 +++++++-----
 .../CrashesNotificationsExtensions.kt         | 12 ++++--
 .../f0x1d/logfox/service/LoggingService.kt    |  9 +++--
 .../f0x1d/logfox/ui/activity/MainActivity.kt  | 32 +++++++++++++---
 .../logfox/ui/activity/OpenFileActivity.kt    | 22 +++++++++++
 .../crashes/CrashDetailsFragment.kt}          | 37 +++++++++++--------
 .../crashes/{ => list}/AppCrashesFragment.kt  |  4 +-
 .../crashes/{ => list}/CrashesFragment.kt     |  4 +-
 app/src/main/res/navigation/crashes.xml       | 31 ++++++++++------
 app/src/main/res/navigation/logs.xml          |  5 ---
 app/src/main/res/navigation/nav_graph.xml     |  4 +-
 app/src/main/res/values/themes.xml            |  8 ++++
 12 files changed, 131 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/java/com/f0x1d/logfox/ui/activity/OpenFileActivity.kt
 rename app/src/main/java/com/f0x1d/logfox/ui/{activity/CrashDetailsActivity.kt => fragment/crashes/CrashDetailsFragment.kt} (76%)
 rename app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/{ => list}/AppCrashesFragment.kt (96%)
 rename app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/{ => list}/CrashesFragment.kt (97%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e85233a5..2a0f7ed2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,10 +21,23 @@
         <activity
             android:name=".ui.activity.MainActivity"
             android:windowSoftInputMode="adjustResize"
+            android:launchMode="singleInstance"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.activity.OpenFileActivity"
+            android:documentLaunchMode="always"
+            android:excludeFromRecents="true"
+            android:theme="@style/Theme.LogFox.Translucent"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.EDIT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -40,16 +53,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.log" />
                 <data android:host="*" />
             </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.activity.CrashDetailsActivity"
-            android:label="@string/crash_details" />
 
         <service
             android:name=".service.LoggingService"
diff --git a/app/src/main/java/com/f0x1d/logfox/extensions/notifications/CrashesNotificationsExtensions.kt b/app/src/main/java/com/f0x1d/logfox/extensions/notifications/CrashesNotificationsExtensions.kt
index 50f3ee1a..2d806784 100644
--- a/app/src/main/java/com/f0x1d/logfox/extensions/notifications/CrashesNotificationsExtensions.kt
+++ b/app/src/main/java/com/f0x1d/logfox/extensions/notifications/CrashesNotificationsExtensions.kt
@@ -5,12 +5,12 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.os.bundleOf
+import androidx.navigation.NavDeepLinkBuilder
 import com.f0x1d.logfox.LogFoxApp
 import com.f0x1d.logfox.R
 import com.f0x1d.logfox.database.entity.AppCrash
 import com.f0x1d.logfox.extensions.*
 import com.f0x1d.logfox.receiver.CopyReceiver
-import com.f0x1d.logfox.ui.activity.CrashDetailsActivity
 
 @SuppressLint("MissingPermission")
 fun Context.sendErrorNotification(appCrash: AppCrash) = doIfPermitted {
@@ -23,9 +23,13 @@ fun Context.sendErrorNotification(appCrash: AppCrash) = doIfPermitted {
             .setSmallIcon(R.drawable.ic_android_notification)
             .setStyle(NotificationCompat.BigTextStyle().bigText(appCrash.log))
             .apply {
-                if (appCrash.id != 0L) setContentIntent(makeActivityPendingIntent(CRASH_DETAILS_INTENT_ID, CrashDetailsActivity::class.java, bundleOf(
-                    "crash_id" to appCrash.id
-                )))
+                if (appCrash.id != 0L) setContentIntent(
+                    NavDeepLinkBuilder(this@sendErrorNotification)
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.crashDetailsFragment)
+                        .setArguments(bundleOf("crash_id" to appCrash.id))
+                        .createPendingIntent()
+                )
             }
             .setAutoCancel(true)
             .applyPrimaryColorIfNeeded(this@sendErrorNotification)
diff --git a/app/src/main/java/com/f0x1d/logfox/service/LoggingService.kt b/app/src/main/java/com/f0x1d/logfox/service/LoggingService.kt
index 92de6ef6..4f20b58c 100644
--- a/app/src/main/java/com/f0x1d/logfox/service/LoggingService.kt
+++ b/app/src/main/java/com/f0x1d/logfox/service/LoggingService.kt
@@ -9,6 +9,7 @@ import com.f0x1d.logfox.LogFoxApp
 import com.f0x1d.logfox.R
 import com.f0x1d.logfox.extensions.EXIT_APP_INTENT_ID
 import com.f0x1d.logfox.extensions.STOP_LOGGING_SERVICE_INTENT_ID
+import com.f0x1d.logfox.extensions.activityManager
 import com.f0x1d.logfox.extensions.makeOpenAppPendingIntent
 import com.f0x1d.logfox.extensions.makeServicePendingIntent
 import com.f0x1d.logfox.extensions.notifications.applyPrimaryColorIfNeeded
@@ -16,7 +17,6 @@ import com.f0x1d.logfox.repository.logging.LoggingRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.update
 import javax.inject.Inject
-import kotlin.system.exitProcess
 
 @AndroidEntryPoint
 class LoggingService: Service() {
@@ -70,9 +70,12 @@ class LoggingService: Service() {
 
     private fun killApp() {
         loggingRepository.stopLogging()
-        stopService()
 
-        exitProcess(0)
+        activityManager.appTasks.forEach {
+            it.finishAndRemoveTask()
+        }
+
+        stopService()
     }
 
     override fun onBind(p0: Intent?) = null
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt b/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt
index 6042d59b..db4b4b04 100644
--- a/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/f0x1d/logfox/ui/activity/MainActivity.kt
@@ -84,6 +84,32 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
         }
     }
 
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        handleIntent(intent)
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        handleIntent(intent, onNewIntent = true)
+    }
+
+    private fun handleIntent(intent: Intent?, onNewIntent: Boolean = false) {
+        if (onNewIntent)
+            if (navController.handleDeepLink(intent))
+                return
+
+        if (intent == null) return
+
+        if (intent.data == null) return
+
+        when (intent.action) {
+            Intent.ACTION_VIEW -> navController.navigate(
+                NavGraphDirections.actionGlobalLogsFragment(fileUri = intent.data)
+            )
+        }
+    }
+
     override fun onEvent(event: Event) {
         when (event.type) {
             MainViewModel.EVENT_TYPE_SETUP -> navController.navigate(NavGraphDirections.actionGlobalSetupFragment())
@@ -99,6 +125,7 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
             R.id.editFilterFragment -> false
             R.id.chooseAppFragment -> false
             R.id.appCrashesFragment -> false
+            R.id.crashDetailsFragment -> false
 
             else -> true
         }
@@ -137,11 +164,6 @@ class MainActivity: BaseViewModelActivity<MainViewModel, ActivityMainBinding>(),
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        navController.handleDeepLink(intent)
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         navController.removeOnDestinationChangedListener(this)
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/activity/OpenFileActivity.kt b/app/src/main/java/com/f0x1d/logfox/ui/activity/OpenFileActivity.kt
new file mode 100644
index 00000000..ebf36e4a
--- /dev/null
+++ b/app/src/main/java/com/f0x1d/logfox/ui/activity/OpenFileActivity.kt
@@ -0,0 +1,22 @@
+package com.f0x1d.logfox.ui.activity
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class OpenFileActivity: AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        startActivity(
+            Intent(this, MainActivity::class.java).apply {
+                action = intent.action
+                setDataAndType(intent.data, intent.type)
+                replaceExtras(intent)
+            }
+        )
+        finish()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/activity/CrashDetailsActivity.kt b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashDetailsFragment.kt
similarity index 76%
rename from app/src/main/java/com/f0x1d/logfox/ui/activity/CrashDetailsActivity.kt
rename to app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashDetailsFragment.kt
index f360373c..2e880088 100644
--- a/app/src/main/java/com/f0x1d/logfox/ui/activity/CrashDetailsActivity.kt
+++ b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashDetailsFragment.kt
@@ -1,11 +1,15 @@
-package com.f0x1d.logfox.ui.activity
+package com.f0x1d.logfox.ui.fragment.crashes
 
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.f0x1d.logfox.R
 import com.f0x1d.logfox.database.entity.AppCrash
 import com.f0x1d.logfox.databinding.ActivityCrashDetailsBinding
@@ -16,15 +20,15 @@ import com.f0x1d.logfox.extensions.showAreYouSureDeleteDialog
 import com.f0x1d.logfox.extensions.views.replaceAccessibilityDelegateClassNameWithButton
 import com.f0x1d.logfox.extensions.views.widgets.loadIcon
 import com.f0x1d.logfox.extensions.views.widgets.setClickListenerOn
-import com.f0x1d.logfox.extensions.views.widgets.setupBackButton
-import com.f0x1d.logfox.ui.activity.base.BaseViewModelActivity
+import com.f0x1d.logfox.extensions.views.widgets.setupBackButtonForNavController
+import com.f0x1d.logfox.ui.fragment.base.BaseViewModelFragment
 import com.f0x1d.logfox.utils.event.Event
 import com.f0x1d.logfox.viewmodel.crashes.CrashDetailsViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.insetter.applyInsetter
 
 @AndroidEntryPoint
-class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, ActivityCrashDetailsBinding>() {
+class CrashDetailsFragment: BaseViewModelFragment<CrashDetailsViewModel, ActivityCrashDetailsBinding>() {
 
     override val viewModel by viewModels<CrashDetailsViewModel>()
 
@@ -34,10 +38,13 @@ class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, Activit
         viewModel.exportCrashToZip(it ?: return@registerForActivityResult)
     }
 
-    override fun inflateBinding() = ActivityCrashDetailsBinding.inflate(layoutInflater)
+    override fun inflateBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ) = ActivityCrashDetailsBinding.inflate(inflater, container, false)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         binding.scrollView.applyInsetter {
             type(navigationBars = true) {
@@ -46,15 +53,13 @@ class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, Activit
         }
 
         binding.toolbar.inflateMenu(R.menu.crash_details_menu)
-        binding.toolbar.setupBackButton {
-            onBackPressedDispatcher.onBackPressed()
-        }
+        binding.toolbar.setupBackButtonForNavController()
 
         binding.copyLayout.replaceAccessibilityDelegateClassNameWithButton()
         binding.shareLayout.replaceAccessibilityDelegateClassNameWithButton()
         binding.zipLayout.replaceAccessibilityDelegateClassNameWithButton()
 
-        viewModel.crash.observe(this) {
+        viewModel.crash.observe(viewLifecycleOwner) {
             setupFor(it ?: return@observe)
         }
     }
@@ -62,7 +67,7 @@ class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, Activit
     override fun onEvent(event: Event) {
         when (event.type) {
             CrashDetailsViewModel.EVENT_TYPE_COPY_LINK -> {
-                copyText(event.consume() ?: return)
+                requireContext().copyText(event.consume() ?: return)
                 snackbar(R.string.text_copied)
             }
         }
@@ -80,7 +85,7 @@ class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, Activit
             setClickListenerOn(R.id.delete_item) {
                 showAreYouSureDeleteDialog {
                     viewModel.deleteCrash(appCrash)
-                    finish()
+                    findNavController().popBackStack()
                 }
             }
         }
@@ -90,12 +95,12 @@ class CrashDetailsActivity: BaseViewModelActivity<CrashDetailsViewModel, Activit
         binding.appPackage.text = appCrash.packageName
 
         binding.copyLayout.setOnClickListener {
-            copyText(appCrash.log)
+            requireContext().copyText(appCrash.log)
             snackbar(R.string.text_copied)
         }
 
         binding.shareLayout.setOnClickListener {
-            shareIntent(appCrash.log)
+            requireContext().shareIntent(appCrash.log)
         }
 
         binding.zipLayout.setOnClickListener {
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/AppCrashesFragment.kt b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/AppCrashesFragment.kt
similarity index 96%
rename from app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/AppCrashesFragment.kt
rename to app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/AppCrashesFragment.kt
index bea56982..bca41f8d 100644
--- a/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/AppCrashesFragment.kt
+++ b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/AppCrashesFragment.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.ui.fragment.crashes
+package com.f0x1d.logfox.ui.fragment.crashes.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ class AppCrashesFragment: BaseViewModelFragment<AppCrashesViewModel, FragmentApp
 
     private val adapter = CrashesAdapter(click = {
         findNavController().navigate(
-            AppCrashesFragmentDirections.actionAppCrashesFragmentToCrashDetailsActivity(it.lastCrash.id)
+            AppCrashesFragmentDirections.actionAppCrashesFragmentToCrashDetailsFragment(it.lastCrash.id)
         )
     }, delete = {
         showAreYouSureDeleteDialog {
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashesFragment.kt b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/CrashesFragment.kt
similarity index 97%
rename from app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashesFragment.kt
rename to app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/CrashesFragment.kt
index 7e528c6b..33642c7f 100644
--- a/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashesFragment.kt
+++ b/app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/CrashesFragment.kt
@@ -1,4 +1,4 @@
-package com.f0x1d.logfox.ui.fragment.crashes
+package com.f0x1d.logfox.ui.fragment.crashes.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -28,7 +28,7 @@ class CrashesFragment: BaseViewModelFragment<CrashesViewModel, FragmentCrashesBi
 
     private val adapter = CrashesAdapter(click = {
         val direction = when (it.count) {
-            1 -> CrashesFragmentDirections.actionCrashesFragmentToCrashDetailsActivity(it.lastCrash.id)
+            1 -> CrashesFragmentDirections.actionCrashesFragmentToCrashDetailsFragment(it.lastCrash.id)
             else -> CrashesFragmentDirections.actionCrashesFragmentToAppCrashesFragment(
                 packageName = it.lastCrash.packageName,
                 appName = it.lastCrash.appName
diff --git a/app/src/main/res/navigation/crashes.xml b/app/src/main/res/navigation/crashes.xml
index 66ec4b84..4bfaaf9d 100644
--- a/app/src/main/res/navigation/crashes.xml
+++ b/app/src/main/res/navigation/crashes.xml
@@ -6,11 +6,15 @@
 
     <fragment
         android:id="@+id/crashesFragment"
-        android:name="com.f0x1d.logfox.ui.fragment.crashes.CrashesFragment"
+        android:name="com.f0x1d.logfox.ui.fragment.crashes.list.CrashesFragment"
         android:label="CrashesFragment" >
         <action
-            android:id="@+id/action_crashesFragment_to_crashDetailsActivity"
-            app:destination="@id/crashDetailsActivity" />
+            android:id="@+id/action_crashesFragment_to_crashDetailsFragment"
+            app:destination="@id/crashDetailsFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"/>
         <action
             android:id="@+id/action_crashesFragment_to_appCrashesFragment"
             app:destination="@id/appCrashesFragment"
@@ -21,7 +25,7 @@
     </fragment>
     <fragment
         android:id="@+id/appCrashesFragment"
-        android:name="com.f0x1d.logfox.ui.fragment.crashes.AppCrashesFragment"
+        android:name="com.f0x1d.logfox.ui.fragment.crashes.list.AppCrashesFragment"
         android:label="AppCrashesFragment" >
         <argument
             android:name="package_name"
@@ -32,16 +36,21 @@
             app:nullable="true" />
 
         <action
-            android:id="@+id/action_appCrashesFragment_to_crashDetailsActivity"
-            app:destination="@id/crashDetailsActivity" />
+            android:id="@+id/action_appCrashesFragment_to_crashDetailsFragment"
+            app:destination="@id/crashDetailsFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"/>
     </fragment>
-    <activity
-        android:id="@+id/crashDetailsActivity"
-        android:name="com.f0x1d.logfox.ui.activity.CrashDetailsActivity"
-        android:label="CrashDetailsActivity" >
+    <fragment
+        android:id="@+id/crashDetailsFragment"
+        android:name="com.f0x1d.logfox.ui.fragment.crashes.CrashDetailsFragment"
+        android:label="CrashDetailsFragment">
+
         <argument
             android:name="crash_id"
             app:argType="long"
             android:defaultValue="-1L" />
-    </activity>
+    </fragment>
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/logs.xml b/app/src/main/res/navigation/logs.xml
index 148dc3bb..e234312f 100644
--- a/app/src/main/res/navigation/logs.xml
+++ b/app/src/main/res/navigation/logs.xml
@@ -8,11 +8,6 @@
         android:id="@+id/logsFragment"
         android:name="com.f0x1d.logfox.ui.fragment.LogsFragment"
         android:label="LogsFragment" >
-        <deepLink
-            app:uri="content"
-            app:mimeType="*/*"
-            app:action="android.intent.action.VIEW" />
-
         <argument
             android:name="file_uri"
             app:argType="android.net.Uri"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 49386d3a..bd57b3b8 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -26,9 +26,7 @@
         app:enterAnim="@anim/nav_default_enter_anim"
         app:exitAnim="@anim/nav_default_exit_anim"
         app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-        app:popExitAnim="@anim/nav_default_pop_exit_anim"
-        app:popUpTo="@id/recordingsFragment"
-        app:popUpToInclusive="true">
+        app:popExitAnim="@anim/nav_default_pop_exit_anim">
         <argument
             android:name="file_uri"
             app:argType="android.net.Uri"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8cf00c06..66945ec9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,4 +15,12 @@
         <item name="fontFamily">@font/google_sans</item>
         <item name="android:fontFamily">@font/google_sans</item>
     </style>
+
+    <style name="Theme.LogFox.Translucent" parent="Theme.LogFox">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowDisablePreview">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
 </resources>
\ No newline at end of file