18 files changed, 117 insertions, 39 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b800260..903a184 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         </activity>
 
         <activity
-            android:name=".FakeHomeActivity"
+            android:name=".helper.FakeHomeActivity"
             android:enabled="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden">
@@ -50,7 +50,7 @@
         </activity>
 
         <receiver
-            android:name=".DeviceAdmin"
+            android:name=".helper.DeviceAdmin"
             android:permission="android.permission.BIND_DEVICE_ADMIN">
             <meta-data
                 android:name="android.app.device_admin"
diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index 1d7264c..1d1513f 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -12,6 +12,11 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
+import app.olauncher.data.Constants
+import app.olauncher.data.Prefs
+import app.olauncher.helper.MainViewModel
+import app.olauncher.helper.showToastLong
+import app.olauncher.helper.showToastShort
 import kotlinx.android.synthetic.main.activity_main.*
 
 
@@ -85,7 +90,10 @@ class MainActivity : AppCompatActivity() {
         if (resetFailed) {
             val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) else {
-                showToastLong(this, "Search for launcher or home app")
+                showToastLong(
+                    this,
+                    "Search for launcher or home app"
+                )
                 Intent(Settings.ACTION_SETTINGS)
             }
             startActivity(intent)
@@ -98,7 +106,10 @@ class MainActivity : AppCompatActivity() {
             Constants.REQUEST_CODE_ENABLE_ADMIN -> {
                 if (resultCode == Activity.RESULT_OK) {
                     Prefs(this).lockModeOn = true
-                    showToastShort(this, "Double tap to lock")
+                    showToastShort(
+                        this,
+                        "Double tap to lock"
+                    )
                 }
                 return
             }
diff --git a/app/src/main/java/app/olauncher/AppModel.kt b/app/src/main/java/app/olauncher/data/AppModel.kt
index aa28925..415088c 100644
--- a/app/src/main/java/app/olauncher/AppModel.kt
+++ b/app/src/main/java/app/olauncher/data/AppModel.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.data
 
 data class AppModel(
     val appLabel: String,
diff --git a/app/src/main/java/app/olauncher/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt
index a0078fc..d13c34c 100644
--- a/app/src/main/java/app/olauncher/Constants.kt
+++ b/app/src/main/java/app/olauncher/data/Constants.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.data
 
 object Constants {
     const val FLAG_LAUNCH_APP = 100
diff --git a/app/src/main/java/app/olauncher/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index 3bd0224..8a81dbe 100644
--- a/app/src/main/java/app/olauncher/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.data
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/app/olauncher/DeviceAdmin.kt b/app/src/main/java/app/olauncher/helper/DeviceAdmin.kt
index bd1b3bc..bde6c70 100644
--- a/app/src/main/java/app/olauncher/DeviceAdmin.kt
+++ b/app/src/main/java/app/olauncher/helper/DeviceAdmin.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.helper
 
 import android.app.admin.DeviceAdminReceiver
 import android.content.Context
diff --git a/app/src/main/java/app/olauncher/FakeHomeActivity.kt b/app/src/main/java/app/olauncher/helper/FakeHomeActivity.kt
index ba2ebfc..2489b15 100644
--- a/app/src/main/java/app/olauncher/FakeHomeActivity.kt
+++ b/app/src/main/java/app/olauncher/helper/FakeHomeActivity.kt
@@ -1,7 +1,8 @@
-package app.olauncher
+package app.olauncher.helper
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import app.olauncher.R
 
 class FakeHomeActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/helper/MainViewModel.kt
index b6cd18a..42d0ef4 100644
--- a/app/src/main/java/app/olauncher/MainViewModel.kt
+++ b/app/src/main/java/app/olauncher/helper/MainViewModel.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.helper
 
 import android.app.Application
 import android.content.Context
@@ -7,6 +7,9 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import app.olauncher.data.AppModel
+import app.olauncher.data.Constants
+import app.olauncher.data.Prefs
 import kotlinx.coroutines.launch
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
@@ -70,12 +73,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     fun isOlauncherDefault() {
-        isOlauncherDefault.value = isOlauncherDefault(appContext)
+        isOlauncherDefault.value =
+            isOlauncherDefault(appContext)
     }
 
     fun resetDefaultLauncherApp(context: Context) {
         resetDefaultLauncher(context)
-        launcherResetFailed.value = getDefaultLauncherPackage(appContext).contains(".")
+        launcherResetFailed.value = getDefaultLauncherPackage(
+            appContext
+        ).contains(".")
     }
 
     fun switchTheme() {
diff --git a/app/src/main/java/app/olauncher/OnSwipeTouchListener.kt b/app/src/main/java/app/olauncher/helper/OnSwipeTouchListener.kt
index 416133d..52ec248 100644
--- a/app/src/main/java/app/olauncher/OnSwipeTouchListener.kt
+++ b/app/src/main/java/app/olauncher/helper/OnSwipeTouchListener.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.helper
 
 import android.content.Context
 import android.view.GestureDetector
diff --git a/app/src/main/java/app/olauncher/Utils.kt b/app/src/main/java/app/olauncher/helper/Utils.kt
index d624cb7..b87a0b9 100644
--- a/app/src/main/java/app/olauncher/Utils.kt
+++ b/app/src/main/java/app/olauncher/helper/Utils.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.helper
 
 import android.app.WallpaperManager
 import android.content.ComponentName
@@ -9,6 +9,9 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.provider.Settings
 import android.widget.Toast
+import app.olauncher.BuildConfig
+import app.olauncher.R
+import app.olauncher.data.AppModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.util.*
@@ -30,9 +33,19 @@ suspend fun getAppsList(context: Context): MutableList<AppModel> {
 
         val installedApps = pm.queryIntentActivities(intent, 0)
         for (app in installedApps)
-            appList.add(AppModel(app.loadLabel(pm).toString(), app.activityInfo.packageName))
+            appList.add(
+                AppModel(
+                    app.loadLabel(pm).toString(),
+                    app.activityInfo.packageName
+                )
+            )
         appList.sortBy { it.appLabel.toLowerCase(Locale.ROOT) }
-        appList.remove(AppModel(context.getString(R.string.app_name), BuildConfig.APPLICATION_ID))
+        appList.remove(
+            AppModel(
+                context.getString(R.string.app_name),
+                BuildConfig.APPLICATION_ID
+            )
+        )
         appList
     }
 }
@@ -47,7 +60,8 @@ fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boo
 }
 
 fun isOlauncherDefault(context: Context?): Boolean {
-    val launcherPackageName = getDefaultLauncherPackage(context!!)
+    val launcherPackageName =
+        getDefaultLauncherPackage(context!!)
     return BuildConfig.APPLICATION_ID == launcherPackageName
 }
 
diff --git a/app/src/main/java/app/olauncher/AppListAdapter.kt b/app/src/main/java/app/olauncher/ui/AppListAdapter.kt
index 8bafc53..ac46b4c 100644
--- a/app/src/main/java/app/olauncher/AppListAdapter.kt
+++ b/app/src/main/java/app/olauncher/ui/AppListAdapter.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.ui
 
 import android.view.LayoutInflater
 import android.view.View
@@ -6,6 +6,9 @@ import android.view.ViewGroup
 import android.widget.Filter
 import android.widget.Filterable
 import androidx.recyclerview.widget.RecyclerView
+import app.olauncher.data.AppModel
+import app.olauncher.data.Constants
+import app.olauncher.R
 import kotlinx.android.synthetic.main.adapter_app_list.view.*
 
 class AppListAdapter(
@@ -17,9 +20,11 @@ class AppListAdapter(
     var appsList: List<AppModel> = listOf()
     var appFilteredList: List<AppModel> = listOf()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(
-        LayoutInflater.from(parent.context).inflate(R.layout.adapter_app_list, parent, false)
-    )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
+        ViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.adapter_app_list, parent, false)
+        )
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(appFilteredList[position], clickListener, longPressListener)
diff --git a/app/src/main/java/app/olauncher/AppListFragment.kt b/app/src/main/java/app/olauncher/ui/AppListFragment.kt
index 915ab51..bde0d6a 100644
--- a/app/src/main/java/app/olauncher/AppListFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/AppListFragment.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.ui
 
 import android.content.Context
 import android.os.Bundle
@@ -14,6 +14,10 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import app.olauncher.data.AppModel
+import app.olauncher.helper.MainViewModel
+import app.olauncher.R
+import app.olauncher.helper.openAppInfo
 import kotlinx.android.synthetic.main.fragment_app.*
 
 
@@ -58,7 +62,9 @@ class AppListFragment : Fragment() {
     private fun initViewModel(viewModel: MainViewModel, appAdapter: AppListAdapter) {
         viewModel.appList.observe(viewLifecycleOwner, Observer<List<AppModel>> {
             val animation =
-                AnimationUtils.loadLayoutAnimation(requireContext(), R.anim.layout_anim_from_bottom)
+                AnimationUtils.loadLayoutAnimation(requireContext(),
+                    R.anim.layout_anim_from_bottom
+                )
             recyclerView.layoutAnimation = animation
             appAdapter.setAppList(it)
             search.visibility = View.VISIBLE
@@ -96,7 +102,10 @@ class AppListFragment : Fragment() {
 
     private fun appLongPressListener(): (appModel: AppModel) -> Unit =
         { appModel ->
-            openAppInfo(requireContext(), appModel.appPackage)
+            openAppInfo(
+                requireContext(),
+                appModel.appPackage
+            )
             findNavController().popBackStack()
         }
 
diff --git a/app/src/main/java/app/olauncher/MainFragment.kt b/app/src/main/java/app/olauncher/ui/MainFragment.kt
index 7b44e8f..62a76db 100644
--- a/app/src/main/java/app/olauncher/MainFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/MainFragment.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.ui
 
 import android.annotation.SuppressLint
 import android.app.admin.DevicePolicyManager
@@ -16,6 +16,14 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
+import app.olauncher.*
+import app.olauncher.helper.OnSwipeTouchListener
+import app.olauncher.data.AppModel
+import app.olauncher.data.Constants
+import app.olauncher.data.Prefs
+import app.olauncher.helper.MainViewModel
+import app.olauncher.helper.isPackageInstalled
+import app.olauncher.helper.showToastShort
 import kotlinx.android.synthetic.main.main_fragment.*
 import java.lang.reflect.Method
 
@@ -172,7 +180,10 @@ class MainFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
     }
 
     private fun launchAppEvent(appName: String, packageName: String) {
-        viewModel.selectedApp(AppModel(appName, packageName), Constants.FLAG_LAUNCH_APP)
+        viewModel.selectedApp(
+            AppModel(appName, packageName),
+            Constants.FLAG_LAUNCH_APP
+        )
     }
 
     // Source: https://stackoverflow.com/a/51132142
@@ -212,7 +223,10 @@ class MainFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
             deviceManager.lockNow()
         } catch (e: java.lang.Exception) {
             prefs.lockModeOn = false
-            showToastShort(requireContext(), "Olauncher failed to lock phone")
+            showToastShort(
+                requireContext(),
+                "Olauncher failed to lock phone"
+            )
             findNavController().navigate(R.id.action_mainFragment_to_settingsFragment)
         }
     }
diff --git a/app/src/main/java/app/olauncher/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index bf29a65..968bd3d 100644
--- a/app/src/main/java/app/olauncher/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.ui
 
 import android.app.admin.DevicePolicyManager
 import android.content.ComponentName
@@ -11,6 +11,13 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import app.olauncher.*
+import app.olauncher.data.Constants
+import app.olauncher.data.Prefs
+import app.olauncher.helper.DeviceAdmin
+import app.olauncher.helper.MainViewModel
+import app.olauncher.helper.openAppInfo
+import app.olauncher.helper.showToastShort
 import kotlinx.android.synthetic.main.fragment_settings.*
 
 
@@ -46,7 +53,10 @@ class SettingsFragment : Fragment(), View.OnClickListener {
 
     override fun onClick(view: View) {
         when (view.id) {
-            R.id.appInfo -> openAppInfo(requireContext(), BuildConfig.APPLICATION_ID)
+            R.id.appInfo -> openAppInfo(
+                requireContext(),
+                BuildConfig.APPLICATION_ID
+            )
             R.id.setLauncher -> viewModel.resetDefaultLauncherApp(requireContext())
             R.id.textColor -> viewModel.switchTheme()
             R.id.toggleOnOff -> toggleLockMode()
@@ -54,7 +64,9 @@ class SettingsFragment : Fragment(), View.OnClickListener {
     }
 
     private fun setLockModeText() {
-        if (Prefs(requireContext()).lockModeOn) toggleOnOff.text = getString(R.string.on)
+        if (Prefs(requireContext()).lockModeOn) toggleOnOff.text = getString(
+            R.string.on
+        )
         else toggleOnOff.text = getString(R.string.off)
     }
 
@@ -81,7 +93,10 @@ class SettingsFragment : Fragment(), View.OnClickListener {
             deviceManager.removeActiveAdmin(componentName)
             Prefs(requireContext()).lockModeOn = false
             setLockModeText()
-            showToastShort(requireContext(), "Admin permission removed")
+            showToastShort(
+                requireContext(),
+                "Admin permission removed"
+            )
         } else {
             val intent = Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
             intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, componentName)
@@ -89,7 +104,9 @@ class SettingsFragment : Fragment(), View.OnClickListener {
                 DevicePolicyManager.EXTRA_ADD_EXPLANATION,
                 getString(R.string.admin_permission_message)
             )
-            activity?.startActivityForResult(intent, Constants.REQUEST_CODE_ENABLE_ADMIN)
+            activity?.startActivityForResult(intent,
+                Constants.REQUEST_CODE_ENABLE_ADMIN
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/olauncher/WelcomeFragment.kt b/app/src/main/java/app/olauncher/ui/WelcomeFragment.kt
index 8e19ce8..8fc8278 100644
--- a/app/src/main/java/app/olauncher/WelcomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/WelcomeFragment.kt
@@ -1,4 +1,4 @@
-package app.olauncher
+package app.olauncher.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import app.olauncher.R
 import kotlinx.android.synthetic.main.fragment_welcome.*
 
 class WelcomeFragment : Fragment() {
diff --git a/app/src/main/res/layout/activity_fake_home.xml b/app/src/main/res/layout/activity_fake_home.xml
index 4348137..7dffa0d 100644
--- a/app/src/main/res/layout/activity_fake_home.xml
+++ b/app/src/main/res/layout/activity_fake_home.xml
@@ -3,6 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".FakeHomeActivity">
+    tools:context=".helper.FakeHomeActivity">
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
index 9e398e2..6ffe1fa 100644
--- a/app/src/main/res/layout/main_fragment.xml
+++ b/app/src/main/res/layout/main_fragment.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="24dp"
-    tools:context=".MainFragment">
+    tools:context=".ui.MainFragment">
 
     <TextClock
         android:id="@+id/clock"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index a196fdc..3d85c52 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/mainFragment"
-        android:name="app.olauncher.MainFragment"
+        android:name="app.olauncher.ui.MainFragment"
         android:label="main_fragment"
         tools:layout="@layout/main_fragment">
         <action
@@ -35,17 +35,17 @@
 
     <fragment
         android:id="@+id/appListFragment"
-        android:name="app.olauncher.AppListFragment"
+        android:name="app.olauncher.ui.AppListFragment"
         android:label="app_list_fragment"
         tools:layout="@layout/fragment_app" />
     <fragment
         android:id="@+id/welcomeFragment"
-        android:name="app.olauncher.WelcomeFragment"
+        android:name="app.olauncher.ui.WelcomeFragment"
         android:label="WelcomeFragment"
         android:layout="@layout/fragment_welcome" />
     <fragment
         android:id="@+id/settingsFragment"
-        android:name="app.olauncher.SettingsFragment"
+        android:name="app.olauncher.ui.SettingsFragment"
         android:label="SettingsFragment"
         android:layout="@layout/fragment_settings" />