chore: small refactor

app/src/main/java/com/sduduzog/slimlauncher/adapters/AddAppAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.App
+import com.sduduzog.slimlauncher.data.model.App
 import com.sduduzog.slimlauncher.utils.OnAppClickedListener
 
 class AddAppAdapter(private val listener: OnAppClickedListener) : RecyclerView.Adapter<AddAppAdapter.ViewHolder>() {

app/src/main/java/com/sduduzog/slimlauncher/adapters/CustomAppsAdapter.kt

@@ -10,9 +10,9 @@ import android.widget.TextView
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.HomeApp
-import com.sduduzog.slimlauncher.utils.OnShitDoneToAppsListener
+import com.sduduzog.slimlauncher.data.model.HomeApp
 import com.sduduzog.slimlauncher.utils.OnItemActionListener
+import com.sduduzog.slimlauncher.utils.OnShitDoneToAppsListener
 
 class CustomAppsAdapter(private val listener: OnShitDoneToAppsListener) : RecyclerView.Adapter<CustomAppsAdapter.ViewHolder>(), OnItemActionListener {
 

app/src/main/java/com/sduduzog/slimlauncher/adapters/HomeAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.HomeApp
+import com.sduduzog.slimlauncher.data.model.HomeApp
 import com.sduduzog.slimlauncher.utils.OnLaunchAppListener
 
 

app/src/main/java/com/sduduzog/slimlauncher/data/AppDao.kt

@@ -2,6 +2,8 @@ package com.sduduzog.slimlauncher.data
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
+import com.sduduzog.slimlauncher.data.model.App
+import com.sduduzog.slimlauncher.data.model.HomeApp
 
 @Dao
 interface AppDao {

app/src/main/java/com/sduduzog/slimlauncher/data/AppRepository.kt

@@ -3,6 +3,7 @@ package com.sduduzog.slimlauncher.data
 import android.app.Application
 import android.os.AsyncTask
 import androidx.lifecycle.LiveData
+import com.sduduzog.slimlauncher.data.model.HomeApp
 
 class AppRepository(application: Application) {
     private val db: DataRoomDatabase = DataRoomDatabase.getDatabase(application)!!

app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt

@@ -3,6 +3,8 @@ package com.sduduzog.slimlauncher.data
 import android.app.Application
 import android.os.AsyncTask
 import androidx.lifecycle.LiveData
+import com.sduduzog.slimlauncher.data.model.App
+import com.sduduzog.slimlauncher.data.model.Note
 
 class DataRepository(application: Application) {
 

app/src/main/java/com/sduduzog/slimlauncher/data/DataRoomDatabase.kt

@@ -6,6 +6,9 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
+import com.sduduzog.slimlauncher.data.model.App
+import com.sduduzog.slimlauncher.data.model.HomeApp
+import com.sduduzog.slimlauncher.data.model.Note
 
 
 @Database(entities = [App::class, HomeApp::class, Note::class], version = 3, exportSchema = false)

app/src/main/java/com/sduduzog/slimlauncher/data/MainViewModel.kt

@@ -4,6 +4,8 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.sduduzog.slimlauncher.data.model.App
+import com.sduduzog.slimlauncher.data.model.HomeApp
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
 

app/src/main/java/com/sduduzog/slimlauncher/data/NoteDao.kt

@@ -2,6 +2,7 @@ package com.sduduzog.slimlauncher.data
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
+import com.sduduzog.slimlauncher.data.model.Note
 
 @Dao
 interface NoteDao {

app/src/main/java/com/sduduzog/slimlauncher/data/App.kt → app/src/main/java/com/sduduzog/slimlauncher/data/model/App.kt

@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.data
+package com.sduduzog.slimlauncher.data.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/sduduzog/slimlauncher/data/HomeApp.kt → app/src/main/java/com/sduduzog/slimlauncher/data/model/HomeApp.kt

@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.data
+package com.sduduzog.slimlauncher.data.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/sduduzog/slimlauncher/data/Note.kt → app/src/main/java/com/sduduzog/slimlauncher/data/model/Note.kt

@@ -1,4 +1,4 @@
-package com.sduduzog.slimlauncher.data
+package com.sduduzog.slimlauncher.data.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/sduduzog/slimlauncher/dialogs/RenameAppDialog.kt

@@ -8,8 +8,8 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.HomeApp
 import com.sduduzog.slimlauncher.data.MainViewModel
+import com.sduduzog.slimlauncher.data.model.HomeApp
 import kotlinx.android.synthetic.main.customise_apps_fragment.*
 
 class RenameAppDialog : DialogFragment() {

app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt

@@ -13,8 +13,8 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.Navigation
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.adapters.HomeAdapter
-import com.sduduzog.slimlauncher.data.HomeApp
 import com.sduduzog.slimlauncher.data.MainViewModel
+import com.sduduzog.slimlauncher.data.model.HomeApp
 import com.sduduzog.slimlauncher.ui.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnLaunchAppListener
 import kotlinx.android.synthetic.main.home_fragment.*

app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NoteFragment.kt

@@ -9,7 +9,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.lifecycle.ViewModelProviders
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.Note
+import com.sduduzog.slimlauncher.data.model.Note
 import com.sduduzog.slimlauncher.ui.BaseFragment
 import com.sduduzog.slimlauncher.ui.main.DoubleClickListener
 import kotlinx.android.synthetic.main.note_fragment.*

app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesListAdapter.kt

@@ -12,7 +12,7 @@ import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.data.Note
+import com.sduduzog.slimlauncher.data.model.Note
 import com.sduduzog.slimlauncher.ui.main.OnItemActionListener
 import java.text.SimpleDateFormat
 import java.util.*

app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesViewModel.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import com.sduduzog.slimlauncher.data.DataRepository
-import com.sduduzog.slimlauncher.data.Note
+import com.sduduzog.slimlauncher.data.model.Note
 
 class NotesViewModel(application: Application) : AndroidViewModel(application) {
     private var _repository: DataRepository = DataRepository.getInstance(application)

app/src/main/java/com/sduduzog/slimlauncher/ui/options/AddAppFragment.kt

@@ -11,8 +11,8 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.Navigation
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.adapters.AddAppAdapter
-import com.sduduzog.slimlauncher.data.App
 import com.sduduzog.slimlauncher.data.MainViewModel
+import com.sduduzog.slimlauncher.data.model.App
 import com.sduduzog.slimlauncher.ui.BaseFragment
 import com.sduduzog.slimlauncher.utils.LoadInstalledApps
 import com.sduduzog.slimlauncher.utils.OnAppClickedListener

app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomiseAppsFragment.kt

@@ -13,8 +13,8 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.adapters.CustomAppsAdapter
-import com.sduduzog.slimlauncher.data.HomeApp
 import com.sduduzog.slimlauncher.data.MainViewModel
+import com.sduduzog.slimlauncher.data.model.HomeApp
 import com.sduduzog.slimlauncher.dialogs.RenameAppDialog
 import com.sduduzog.slimlauncher.ui.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnItemActionListener

app/src/main/java/com/sduduzog/slimlauncher/utils/LoadInstalledApps.kt

@@ -7,8 +7,8 @@ import android.os.AsyncTask
 import android.os.Build
 import android.provider.AlarmClock
 import android.provider.MediaStore
-import com.sduduzog.slimlauncher.data.App
 import com.sduduzog.slimlauncher.data.MainViewModel
+import com.sduduzog.slimlauncher.data.model.App
 import java.util.*
 
 class LoadInstalledApps(private val viewModel: MainViewModel?, private val filterString: String = "") : AsyncTask<PackageManager, Unit, List<App>>() {

app/src/main/java/com/sduduzog/slimlauncher/utils/OnAppClickedListener.kt

@@ -1,6 +1,6 @@
 package com.sduduzog.slimlauncher.utils
 
-import com.sduduzog.slimlauncher.data.App
+import com.sduduzog.slimlauncher.data.model.App
 
 interface OnAppClickedListener{
     fun onAppClicked(app: App)

app/src/main/java/com/sduduzog/slimlauncher/utils/OnLaunchAppListener.kt

@@ -1,7 +1,7 @@
 package com.sduduzog.slimlauncher.utils
 
 import android.view.View
-import com.sduduzog.slimlauncher.data.HomeApp
+import com.sduduzog.slimlauncher.data.model.HomeApp
 
 interface OnLaunchAppListener{
     fun onLaunch(app: HomeApp, view: View)

app/src/main/java/com/sduduzog/slimlauncher/utils/OnShitDoneToAppsListener.kt

@@ -1,7 +1,7 @@
 package com.sduduzog.slimlauncher.utils
 
 import android.view.View
-import com.sduduzog.slimlauncher.data.HomeApp
+import com.sduduzog.slimlauncher.data.model.HomeApp
 
 interface OnShitDoneToAppsListener {
     fun onAppsUpdated(list: List<HomeApp>)