Merge pull request #28 from Spikeysanju/Refactor-All

Refactor Code
Spikeysanju · Feb 3, 2021 · 08ff68c · 08ff68c
2 parents 405bf35 + 1044d36
commit 08ff68c
Show file tree

Hide file tree

Showing 25 changed files with 316 additions and 313 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ExpenseTracker">
         <activity
-            android:name=".MainActivity"
+            android:name=".view.main.MainActivity"
             android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...keysanju/expensetracker/db/AppDatabase.kt → .../expensetracker/data/local/AppDatabase.kt b/...keysanju/expensetracker/db/AppDatabase.kt → .../expensetracker/data/local/AppDatabase.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.db
+package dev.spikeysanju.expensetracker.data.local
 
 import android.content.Context
 import androidx.room.Database

diff --git a/...sanju/expensetracker/db/TransactionDao.kt → ...pensetracker/data/local/TransactionDao.kt b/...sanju/expensetracker/db/TransactionDao.kt → ...pensetracker/data/local/TransactionDao.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.db
+package dev.spikeysanju.expensetracker.data.local
 
 import androidx.room.*
 import dev.spikeysanju.expensetracker.model.Transaction

diff --git a/...pensetracker/datastore/UIModeDataStore.kt → ...r/data/local/datastore/UIModeDataStore.kt b/...pensetracker/datastore/UIModeDataStore.kt → ...r/data/local/datastore/UIModeDataStore.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.datastore
+package dev.spikeysanju.expensetracker.data.local.datastore
 
 import android.content.Context
 import androidx.datastore.core.DataStore

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/di/AppModule.kt b/app/src/main/java/dev/spikeysanju/expensetracker/di/AppModule.kt
@@ -5,8 +5,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
-import dev.spikeysanju.expensetracker.datastore.UIModeDataStore
-import dev.spikeysanju.expensetracker.db.AppDatabase
+import dev.spikeysanju.expensetracker.data.local.AppDatabase
+import dev.spikeysanju.expensetracker.data.local.datastore.UIModeDataStore
 import javax.inject.Singleton
 
 @InstallIn(ActivityComponent::class)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/repo/TransactionRepo.kt b/app/src/main/java/dev/spikeysanju/expensetracker/repo/TransactionRepo.kt
@@ -1,6 +1,6 @@
 package dev.spikeysanju.expensetracker.repo
 
-import dev.spikeysanju.expensetracker.db.AppDatabase
+import dev.spikeysanju.expensetracker.data.local.AppDatabase
 import dev.spikeysanju.expensetracker.model.Transaction
 import javax.inject.Inject
 

diff --git a/...anju/expensetracker/view/AboutFragment.kt → ...xpensetracker/view/about/AboutFragment.kt b/...anju/expensetracker/view/AboutFragment.kt → ...xpensetracker/view/about/AboutFragment.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.view
+package dev.spikeysanju.expensetracker.view.about
 
 import android.content.Intent
 import android.net.Uri
@@ -12,7 +12,6 @@ import dev.spikeysanju.expensetracker.BuildConfig
 import dev.spikeysanju.expensetracker.R
 import dev.spikeysanju.expensetracker.databinding.FragmentAboutBinding
 import dev.spikeysanju.expensetracker.view.base.BaseFragment
-import dev.spikeysanju.expensetracker.viewmodel.AboutViewModel
 
 @AndroidEntryPoint
 class AboutFragment : BaseFragment<FragmentAboutBinding, AboutViewModel>() {
@@ -47,7 +46,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding, AboutViewModel>() {
         FragmentAboutBinding.inflate(inflater, container, false)
 
     companion object {
-        const val REPO_URL = "https://github.com/Spikeysanju/ExpenseTracker"
-        const val REPO_LICENSE = "https://github.com/TheCodeMonks/NYTimes-App/blob/master/LICENSE"
+        const val REPO_URL = "https://github.com/Spikeysanju/Expenso"
+        const val REPO_LICENSE = "https://github.com/Spikeysanju/Expenso/blob/master/LICENSE"
     }
 }
diff --git a/...xpensetracker/viewmodel/AboutViewModel.kt → ...pensetracker/view/about/AboutViewModel.kt b/...xpensetracker/viewmodel/AboutViewModel.kt → ...pensetracker/view/about/AboutViewModel.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.viewmodel
+package dev.spikeysanju.expensetracker.view.about
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel

diff --git a/...nsetracker/view/AddTransactionFragment.kt → ...racker/view/add/AddTransactionFragment.kt b/...nsetracker/view/AddTransactionFragment.kt → ...racker/view/add/AddTransactionFragment.kt
@@ -1,4 +1,4 @@
-package dev.spikeysanju.expensetracker.view
+package dev.spikeysanju.expensetracker.view.add
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,7 +13,7 @@ import dev.spikeysanju.expensetracker.databinding.FragmentAddTransactionBinding
 import dev.spikeysanju.expensetracker.model.Transaction
 import dev.spikeysanju.expensetracker.utils.Constants
 import dev.spikeysanju.expensetracker.view.base.BaseFragment
-import dev.spikeysanju.expensetracker.viewmodel.TransactionViewModel
+import dev.spikeysanju.expensetracker.view.main.viewmodel.TransactionViewModel
 import transformIntoDatePicker
 import java.util.*