From cba668f28a8a2a98e8a7a8dd25066dc13e1a4e57 Mon Sep 17 00:00:00 2001
From: Brook Mezgebu <brookmezgebu64@gmail.com>
Date: Sat, 27 Feb 2021 18:40:25 +0300
Subject: [PATCH 1/8] feat: hide / show the fab when the user scrolls the
 transaction list

+ NestedScrollView is better to handle Recycler views inside scrolling view-group
+ Hide the Fab when the user scrolls down so that the last item can be seen completely.
---
 .../view/dashboard/DashboardFragment.kt               | 11 +++++++++++
 app/src/main/res/layout/fragment_dashboard.xml        |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
index a2b43b8..04c5caa 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
@@ -7,6 +7,7 @@ import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -27,6 +28,7 @@ import indianRupee
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
 import show
+import kotlin.math.abs
 
 @AndroidEntryPoint
 class DashboardFragment :
@@ -183,6 +185,15 @@ class DashboardFragment :
             findNavController().navigate(R.id.action_dashboardFragment_to_addTransactionFragment)
         }
 
+        mainDashboardScrollView.setOnScrollChangeListener(
+            NestedScrollView.OnScrollChangeListener { _, sX, sY, oX, oY ->
+                if (abs(sY - oY) > 10) {
+                    when {
+                        sY > oY -> btnAddTransaction.hide()
+                        oY > sY -> btnAddTransaction.show()
+                    }
+                }
+            })
         transactionAdapter.setOnItemClickListener {
             val bundle = Bundle().apply {
                 putSerializable("transaction", it)
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index a557a2a..9339d4e 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -8,7 +8,8 @@
     tools:context=".view.dashboard.DashboardFragment">
 
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/main_dashboard_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
@@ -88,7 +89,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <ViewStub
         android:id="@+id/emptyStateLayout"

From 7b247c507c68a516f2e4ce61f9251ba9dc44af48 Mon Sep 17 00:00:00 2001
From: Brook Mezgebu <brookmezgebu64@gmail.com>
Date: Sat, 27 Feb 2021 18:41:44 +0300
Subject: [PATCH 2/8] feat: show the app's icon and name when transaction is
 shared

+ show the app's icon and name at the bottom of the image when a given transaction is shared ( as an image ).
---
 .../details/TransactionDetailsFragment.kt     | 33 ++++++++++++-------
 .../layout/content_transaction_details.xml    | 24 ++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
index 52fba83..2f6fd7e 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
@@ -10,6 +10,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ShareCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.drawToBitmap
+import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -23,8 +24,10 @@ import dev.spikeysanju.expensetracker.utils.saveBitmap
 import dev.spikeysanju.expensetracker.utils.viewState.DetailState
 import dev.spikeysanju.expensetracker.view.base.BaseFragment
 import dev.spikeysanju.expensetracker.view.main.viewmodel.TransactionViewModel
+import hide
 import indianRupee
 import kotlinx.coroutines.flow.collect
+import show
 
 @AndroidEntryPoint
 class TransactionDetailsFragment : BaseFragment<FragmentTransactionDetailsBinding, TransactionViewModel>() {
@@ -126,19 +129,27 @@ class TransactionDetailsFragment : BaseFragment<FragmentTransactionDetailsBindin
             return
         }
 
-        val imageURI = binding.transactionDetails.detailView.drawToBitmap().let { bitmap ->
-            saveBitmap(requireActivity(), bitmap)
-        } ?: run {
-            toast("Error occurred!")
-            return
-        }
+        // unHide the app logo and name
+        binding.transactionDetails.appIconForShare.show().let {
+            binding.transactionDetails.appNameForShare.show().let {
+                val imageURI = binding.transactionDetails.detailView.drawToBitmap().let { bitmap ->
+                    binding.transactionDetails.appIconForShare.hide()
+                    binding.transactionDetails.appNameForShare.hide()
+                    saveBitmap(requireActivity(), bitmap)
+                } ?: run {
+                    toast("Error occurred!")
+                    return
+                }
 
-        val intent = ShareCompat.IntentBuilder(requireActivity())
-            .setType("image/jpeg")
-            .setStream(imageURI)
-            .intent
+                val intent = ShareCompat.IntentBuilder(requireActivity())
+                    .setType("image/jpeg")
+                    .setStream(imageURI)
+                    .intent
+
+                startActivity(Intent.createChooser(intent, null))
+            }
+        }
 
-        startActivity(Intent.createChooser(intent, null))
     }
 
     private fun isStoragePermissionGranted(): Boolean = ContextCompat.checkSelfPermission(
diff --git a/app/src/main/res/layout/content_transaction_details.xml b/app/src/main/res/layout/content_transaction_details.xml
index a364d67..c84d623 100644
--- a/app/src/main/res/layout/content_transaction_details.xml
+++ b/app/src/main/res/layout/content_transaction_details.xml
@@ -193,6 +193,30 @@
             app:layout_constraintTop_toBottomOf="@id/caption_createdAt"
             tools:text="Sunday, 18 Dec 2021" />
 
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/app_icon_for_share"
+            app:srcCompat="@drawable/ic_logo"
+            android:visibility="invisible"
+            app:layout_constraintEnd_toStartOf="@+id/app_name_for_share"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="50dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:id="@+id/app_name_for_share"
+            android:padding="16dp"
+            android:gravity="center"
+            android:visibility="invisible"
+            android:text="@string/app_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="@dimen/dimen_16"
+            android:fontFamily="@font/open_sans_regular"
+            app:layout_constraintTop_toTopOf="@id/app_icon_for_share"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>

From 81b70b5b663b5ad2c96d182066662137196d13d1 Mon Sep 17 00:00:00 2001
From: Brook Mezgebu <brookmezgebu64@gmail.com>
Date: Sat, 27 Feb 2021 18:48:06 +0300
Subject: [PATCH 3/8] lint: fix lint errors

---
 .../expensetracker/view/dashboard/DashboardFragment.kt        | 4 +++-
 .../expensetracker/view/details/TransactionDetailsFragment.kt | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
index 04c5caa..bd91702 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
@@ -193,7 +193,9 @@ class DashboardFragment :
                         oY > sY -> btnAddTransaction.show()
                     }
                 }
-            })
+            }
+        )
+
         transactionAdapter.setOnItemClickListener {
             val bundle = Bundle().apply {
                 putSerializable("transaction", it)
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
index 2f6fd7e..aed66d8 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
@@ -10,7 +10,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ShareCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.drawToBitmap
-import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -149,7 +148,6 @@ class TransactionDetailsFragment : BaseFragment<FragmentTransactionDetailsBindin
                 startActivity(Intent.createChooser(intent, null))
             }
         }
-
     }
 
     private fun isStoragePermissionGranted(): Boolean = ContextCompat.checkSelfPermission(

From c7f95058af4ac3d2e1fe854b2e05001ea1c94319 Mon Sep 17 00:00:00 2001
From: Brook Mezgebu <brookmezgebu64@gmail.com>
Date: Sun, 28 Feb 2021 22:25:54 +0300
Subject: [PATCH 4/8] fix: corrections from code-review

+ using reference for dimension values
+ readability fixes on chained view operation. seems like it works fine without nesting the operations.
---
 .../details/TransactionDetailsFragment.kt     | 40 +++++++++++--------
 .../layout/content_transaction_details.xml    |  6 +--
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
index aed66d8..c7b5b48 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/details/TransactionDetailsFragment.kt
@@ -129,25 +129,31 @@ class TransactionDetailsFragment : BaseFragment<FragmentTransactionDetailsBindin
         }
 
         // unHide the app logo and name
-        binding.transactionDetails.appIconForShare.show().let {
-            binding.transactionDetails.appNameForShare.show().let {
-                val imageURI = binding.transactionDetails.detailView.drawToBitmap().let { bitmap ->
-                    binding.transactionDetails.appIconForShare.hide()
-                    binding.transactionDetails.appNameForShare.hide()
-                    saveBitmap(requireActivity(), bitmap)
-                } ?: run {
-                    toast("Error occurred!")
-                    return
-                }
+        showAppNameAndLogo()
+        val imageURI = binding.transactionDetails.detailView.drawToBitmap().let { bitmap ->
+            hideAppNameAndLogo()
+            saveBitmap(requireActivity(), bitmap)
+        } ?: run {
+            toast("Error occurred!")
+            return
+        }
 
-                val intent = ShareCompat.IntentBuilder(requireActivity())
-                    .setType("image/jpeg")
-                    .setStream(imageURI)
-                    .intent
+        val intent = ShareCompat.IntentBuilder(requireActivity())
+            .setType("image/jpeg")
+            .setStream(imageURI)
+            .intent
 
-                startActivity(Intent.createChooser(intent, null))
-            }
-        }
+        startActivity(Intent.createChooser(intent, null))
+    }
+
+    private fun showAppNameAndLogo() = with(binding.transactionDetails) {
+        appIconForShare.show()
+        appNameForShare.show()
+    }
+
+    private fun hideAppNameAndLogo() = with(binding.transactionDetails) {
+        appIconForShare.hide()
+        appNameForShare.hide()
     }
 
     private fun isStoragePermissionGranted(): Boolean = ContextCompat.checkSelfPermission(
diff --git a/app/src/main/res/layout/content_transaction_details.xml b/app/src/main/res/layout/content_transaction_details.xml
index c84d623..ac1b5c5 100644
--- a/app/src/main/res/layout/content_transaction_details.xml
+++ b/app/src/main/res/layout/content_transaction_details.xml
@@ -199,12 +199,12 @@
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/app_name_for_share"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_width="50dp"
-            android:layout_height="50dp" />
+            android:layout_width="@dimen/dimen_64"
+            android:layout_height="@dimen/dimen_64" />
 
         <TextView
             android:id="@+id/app_name_for_share"
-            android:padding="16dp"
+            android:padding="@dimen/dimen_16"
             android:gravity="center"
             android:visibility="invisible"
             android:text="@string/app_name"

From 0f4ddfab7244626677f3b39a6871b9df0e793f9c Mon Sep 17 00:00:00 2001
From: maifeeulasad <maifeeulasad@gmail.com>
Date: Thu, 18 Mar 2021 15:23:25 +0600
Subject: [PATCH 5/8] implemented basic bio-metric

---
 app/build.gradle                              |  3 ++
 app/src/main/AndroidManifest.xml              |  3 +-
 .../expensetracker/view/main/MainActivity.kt  | 45 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ce37383..ae00e97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,4 +96,7 @@ dependencies {
     //implementation "com.google.dagger:hilt-android-testing:$hilt_ver"
     implementation "androidx.hilt:hilt-common:1.0.0-alpha03"
     implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
+
+    //Bio-metric
+    implementation 'androidx.biometric:biometric:1.2.0-alpha03'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 637e37e..d7ce326 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
     package="dev.spikeysanju.expensetracker">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"
+        android:requiredFeature="true"/>
 
     <application
         android:name=".app.ExpenseTracker"
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
index 842ed40..a5f08f9 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
@@ -1,8 +1,11 @@
 package dev.spikeysanju.expensetracker.view.main
 
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
@@ -14,12 +17,18 @@ import dev.spikeysanju.expensetracker.databinding.ActivityMainBinding
 import dev.spikeysanju.expensetracker.repo.TransactionRepo
 import dev.spikeysanju.expensetracker.utils.viewModelFactory
 import dev.spikeysanju.expensetracker.view.main.viewmodel.TransactionViewModel
+import java.util.concurrent.Executor
+import kotlin.system.exitProcess
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var navHostFragment: NavHostFragment
     private lateinit var appBarConfiguration: AppBarConfiguration
 
+    private lateinit var executor: Executor
+    private lateinit var biometricPrompt: BiometricPrompt
+    private lateinit var promptInfo: BiometricPrompt.PromptInfo
+
     private val repo by lazy { TransactionRepo(AppDatabase(this)) }
     private val viewModel: TransactionViewModel by viewModels {
         viewModelFactory { TransactionViewModel(this.application, repo) }
@@ -36,6 +45,8 @@ class MainActivity : AppCompatActivity() {
          */
         viewModel
 
+        authenticate()
+
         initViews(binding)
         observeNavElements(binding, navHostFragment.navController)
     }
@@ -79,4 +90,38 @@ class MainActivity : AppCompatActivity() {
         navHostFragment.navController.navigateUp()
         return super.onSupportNavigateUp()
     }
+
+    private fun authenticate(){
+        executor = ContextCompat.getMainExecutor(this)
+        biometricPrompt = BiometricPrompt(this, executor,
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(
+                    result: BiometricPrompt.AuthenticationResult) {
+                    super.onAuthenticationSucceeded(result)
+                    Toast.makeText(applicationContext,
+                        "Welcome to Expenso", Toast.LENGTH_LONG)
+                        .show()
+                }
+
+                override fun onAuthenticationFailed() {
+                    super.onAuthenticationFailed()
+                    //todo: show message wait for a second; static err code
+                    exitProcess(-1)
+                }
+
+                override fun onAuthenticationError(errorCode: Int,
+                                                   errString: CharSequence) {
+                    super.onAuthenticationError(errorCode, errString)
+                    //todo: show message wait for a second; static err code
+                    exitProcess(-2)
+                }
+            })
+
+        promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle("Please complete bio-metric login to continue")
+            .setNegativeButtonText("Exit")
+            .build()
+        biometricPrompt.authenticate(promptInfo)
+    }
+
 }

From bed5ff03ec8b3ce357c6b5bdffeaa62173e8d67f Mon Sep 17 00:00:00 2001
From: maifeeulasad <maifeeulasad@gmail.com>
Date: Fri, 19 Mar 2021 13:09:26 +0600
Subject: [PATCH 6/8] added settings in menu + settings fragment + biometric
 preference saved

---
 .idea/codeStyles/Project.xml                  |  15 +-
 .../data/local/datastore/SettingsDataStore.kt |  42 ++++
 .../view/dashboard/DashboardFragment.kt       |   4 +
 .../view/settings/SettingsFragment.kt         |  39 ++++
 .../view/settings/SettingsViewModel.kt        |  31 +++
 app/src/main/res/layout/fragment_settings.xml |  59 ++++++
 app/src/main/res/menu/menu_ui.xml             |   5 +
 app/src/main/res/navigation/nav_graph.xml     | 200 ++++++++++--------
 app/src/main/res/values/strings.xml           |   2 +
 9 files changed, 291 insertions(+), 106 deletions(-)
 create mode 100644 app/src/main/java/dev/spikeysanju/expensetracker/data/local/datastore/SettingsDataStore.kt
 create mode 100644 app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
 create mode 100644 app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsViewModel.kt
 create mode 100644 app/src/main/res/layout/fragment_settings.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3c7772a..208123b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/data/local/datastore/SettingsDataStore.kt b/app/src/main/java/dev/spikeysanju/expensetracker/data/local/datastore/SettingsDataStore.kt
new file mode 100644
index 0000000..88fdb3e
--- /dev/null
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/data/local/datastore/SettingsDataStore.kt
@@ -0,0 +1,42 @@
+package dev.spikeysanju.expensetracker.data.local.datastore
+
+import android.content.Context
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Singleton
+
+
+class SettingsDataStore(context: Context) :
+    PrefsDataStore(
+        context,
+        PREF_FILE_SETTINGS
+    ),
+    SettingsImpl {
+
+    // used to get the data from datastore
+    override val biometric: Flow<Boolean>
+        get() = dataStore.data.map { preferences ->
+            val biometric = preferences[BIOMETRIC_KEY] ?: false
+            biometric
+        }
+
+    // used to save the bio-metric preference to datastore
+    override suspend fun saveToDataStore(isBiometricEnabled: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[BIOMETRIC_KEY] = isBiometricEnabled
+        }
+    }
+
+    companion object {
+        private const val PREF_FILE_SETTINGS = "settings_preference"
+        private val BIOMETRIC_KEY = booleanPreferencesKey("biometric_mode")
+    }
+}
+
+@Singleton
+interface SettingsImpl {
+    val biometric: Flow<Boolean>
+    suspend fun saveToDataStore(isBiometricEnabled: Boolean)
+}
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
index c58636f..24c0324 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/dashboard/DashboardFragment.kt
@@ -280,6 +280,10 @@ class DashboardFragment :
                 findNavController().navigate(R.id.action_dashboardFragment_to_aboutFragment)
                 true
             }
+            R.id.action_settings -> {
+                findNavController().navigate(R.id.action_dashboardFragment_to_settingsFragment)
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
new file mode 100644
index 0000000..e16977c
--- /dev/null
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
@@ -0,0 +1,39 @@
+package dev.spikeysanju.expensetracker.view.settings
+
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import dev.spikeysanju.expensetracker.databinding.FragmentSettingsBinding
+import dev.spikeysanju.expensetracker.view.base.BaseFragment
+import kotlinx.coroutines.flow.first
+
+@AndroidEntryPoint
+class SettingsFragment : BaseFragment<FragmentSettingsBinding, SettingsViewModel>() {
+    override val viewModel: SettingsViewModel by viewModels()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+
+        // Set the item state
+        lifecycleScope.launchWhenStarted {
+            binding.biometric.isChecked = viewModel.bioMetricPreference.first()
+        }
+
+        initViews()
+    }
+
+    private fun initViews() = with(binding) {
+        biometric.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.setBioMetricLock(isChecked)
+        }
+
+    }
+
+    override fun getViewBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentSettingsBinding.inflate(inflater, container, false)
+}
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsViewModel.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsViewModel.kt
new file mode 100644
index 0000000..55d7c04
--- /dev/null
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsViewModel.kt
@@ -0,0 +1,31 @@
+package dev.spikeysanju.expensetracker.view.settings
+
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dev.spikeysanju.expensetracker.data.local.datastore.SettingsDataStore
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class SettingsViewModel @Inject constructor(
+    application: Application
+) :
+    AndroidViewModel(application) {
+
+    // init datastore
+    private val settingsDataStore = SettingsDataStore(application)
+
+    // get bio-metric preference
+    val bioMetricPreference = settingsDataStore.biometric
+
+    fun setBioMetricLock(bioMetricLock: Boolean) {
+        viewModelScope.launch(Dispatchers.IO) {
+            settingsDataStore.saveToDataStore(bioMetricLock)
+        }
+    }
+
+}
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
new file mode 100644
index 0000000..6aa1733
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    android:scrollbars="none">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:context=".view.settings.SettingsFragment">
+
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="140dp"
+            android:layout_height="140dp"
+            android:layout_marginTop="@dimen/dimen_64"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/ic_logo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_marginStart="@dimen/dimen_16"
+            android:layout_marginTop="@dimen/dimen_48"
+            app:layout_constraintTop_toBottomOf="@id/logo"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/biometricTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans_bold"
+                android:text="@string/text_settings_biometric"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:layout_weight="1"
+                android:id="@+id/biometric"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/biometricTitle" />
+
+        </LinearLayout>
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/menu/menu_ui.xml b/app/src/main/res/menu/menu_ui.xml
index 21b79d4..542cbb7 100644
--- a/app/src/main/res/menu/menu_ui.xml
+++ b/app/src/main/res/menu/menu_ui.xml
@@ -20,5 +20,10 @@
         android:enabled="true"
         android:title="@string/text_about"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_settings"
+        android:enabled="true"
+        android:title="@string/text_settings"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 6926ae6..aed700f 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -1,94 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/dashboardFragment">
-
-    <fragment
-        android:id="@+id/dashboardFragment"
-        android:name="dev.spikeysanju.expensetracker.view.dashboard.DashboardFragment"
-        android:label="fragment_dashboard"
-        tools:layout="@layout/fragment_dashboard">
-        <action
-            android:id="@+id/action_dashboardFragment_to_addTransactionFragment"
-            app:destination="@id/addTransactionFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_dashboardFragment_to_transactionDetailsFragment"
-            app:destination="@id/transactionDetailsFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_dashboardFragment_to_aboutFragment"
-            app:destination="@id/aboutFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-    <fragment
-        android:id="@+id/addTransactionFragment"
-        android:name="dev.spikeysanju.expensetracker.view.add.AddTransactionFragment"
-        android:label="fragment_add_transaction"
-        tools:layout="@layout/fragment_add_transaction">
-        <action
-            android:id="@+id/action_addTransactionFragment_to_dashboardFragment"
-            app:destination="@id/dashboardFragment"
-            app:popUpTo="@id/addTransactionFragment"
-            app:popUpToInclusive="true" />
-    </fragment>
-    <fragment
-        android:id="@+id/transactionDetailsFragment"
-        android:name="dev.spikeysanju.expensetracker.view.details.TransactionDetailsFragment"
-        android:label="Details"
-        tools:layout="@layout/fragment_transaction_details">
-        <argument
-            android:name="transaction"
-            app:argType="dev.spikeysanju.expensetracker.model.Transaction" />
-        <action
-            android:id="@+id/action_transactionDetailsFragment_to_editTransactionFragment"
-            app:destination="@id/editTransactionFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-        <action
-            android:id="@+id/action_transactionDetailsFragment_to_errorDialog"
-            app:destination="@id/errorDialog" />
-    </fragment>
-    <fragment
-        android:id="@+id/editTransactionFragment"
-        android:name="dev.spikeysanju.expensetracker.view.edit.EditTransactionFragment"
-        android:label="Edit Transaction"
-        tools:layout="@layout/fragment_edit_transaction">
-        <argument
-            android:name="transaction"
-            app:argType="dev.spikeysanju.expensetracker.model.Transaction" />
-        <action
-            android:id="@+id/edit_to_details"
-            app:destination="@id/transactionDetailsFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/aboutFragment"
-        android:name="dev.spikeysanju.expensetracker.view.about.AboutFragment"
-        android:label="About"
-        tools:layout="@layout/fragment_about" />
-    <dialog
-        android:id="@+id/errorDialog"
-        android:name="dev.spikeysanju.expensetracker.view.dialog.ErrorDialog"
-        android:label="ErrorDialog"
-        tools:layout="@layout/error_dialog_layout">
-        <argument
-            android:name="title"
-            app:argType="string" />
-        <argument
-            android:name="message"
-            app:argType="string" />
-    </dialog>
-</navigation>
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph"
+    app:startDestination="@id/dashboardFragment">
+
+    <fragment
+        android:id="@+id/dashboardFragment"
+        android:name="dev.spikeysanju.expensetracker.view.dashboard.DashboardFragment"
+        android:label="fragment_dashboard"
+        tools:layout="@layout/fragment_dashboard">
+        <action
+            android:id="@+id/action_dashboardFragment_to_addTransactionFragment"
+            app:destination="@id/addTransactionFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_dashboardFragment_to_transactionDetailsFragment"
+            app:destination="@id/transactionDetailsFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_dashboardFragment_to_aboutFragment"
+            app:destination="@id/aboutFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_dashboardFragment_to_settingsFragment"
+            app:destination="@id/settingsFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+    </fragment>
+    <fragment
+        android:id="@+id/addTransactionFragment"
+        android:name="dev.spikeysanju.expensetracker.view.add.AddTransactionFragment"
+        android:label="fragment_add_transaction"
+        tools:layout="@layout/fragment_add_transaction">
+        <action
+            android:id="@+id/action_addTransactionFragment_to_dashboardFragment"
+            app:destination="@id/dashboardFragment"
+            app:popUpTo="@id/addTransactionFragment"
+            app:popUpToInclusive="true" />
+    </fragment>
+    <fragment
+        android:id="@+id/transactionDetailsFragment"
+        android:name="dev.spikeysanju.expensetracker.view.details.TransactionDetailsFragment"
+        android:label="Details"
+        tools:layout="@layout/fragment_transaction_details">
+        <argument
+            android:name="transaction"
+            app:argType="dev.spikeysanju.expensetracker.model.Transaction" />
+        <action
+            android:id="@+id/action_transactionDetailsFragment_to_editTransactionFragment"
+            app:destination="@id/editTransactionFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_transactionDetailsFragment_to_errorDialog"
+            app:destination="@id/errorDialog" />
+    </fragment>
+    <fragment
+        android:id="@+id/editTransactionFragment"
+        android:name="dev.spikeysanju.expensetracker.view.edit.EditTransactionFragment"
+        android:label="Edit Transaction"
+        tools:layout="@layout/fragment_edit_transaction">
+        <argument
+            android:name="transaction"
+            app:argType="dev.spikeysanju.expensetracker.model.Transaction" />
+        <action
+            android:id="@+id/edit_to_details"
+            app:destination="@id/transactionDetailsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/aboutFragment"
+        android:name="dev.spikeysanju.expensetracker.view.about.AboutFragment"
+        android:label="About"
+        tools:layout="@layout/fragment_about" />
+    <fragment
+        android:id="@+id/settingsFragment"
+        android:name="dev.spikeysanju.expensetracker.view.settings.SettingsFragment"
+        android:label="Settings"
+        tools:layout="@layout/fragment_settings" />
+    <dialog
+        android:id="@+id/errorDialog"
+        android:name="dev.spikeysanju.expensetracker.view.dialog.ErrorDialog"
+        android:label="ErrorDialog"
+        tools:layout="@layout/error_dialog_layout">
+        <argument
+            android:name="title"
+            app:argType="string" />
+        <argument
+            android:name="message"
+            app:argType="string" />
+    </dialog>
+</navigation>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7725c30..3163ab0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,5 +37,7 @@
     <string name="share_message">\%s \nAmount: %s, \nTransaction-Type: %s, \nTag: %s, \nDate: %s, \nNote: %s, \nCreatedAt: %s \n\nVisit: https://github.com/Spikeysanju/Expenso</string>
     <string name="text_transaction_empty_title">No Transaction Yet!</string>
     <string name="text_transaction_empty_desc">After your first transaction you will be able to view it here</string>
+    <string name="text_settings">Settings</string>
+    <string name="text_settings_biometric">Bio-metric Security</string>
 
 </resources>

From 7331969fa2e60ea7806bc8ce74855d4fda0a14d8 Mon Sep 17 00:00:00 2001
From: maifeeulasad <maifeeulasad@gmail.com>
Date: Fri, 19 Mar 2021 13:52:14 +0600
Subject: [PATCH 7/8] require bio-metric based on bio-metric settings

---
 .../expensetracker/view/main/MainActivity.kt       | 14 +++++++++++++-
 .../view/settings/SettingsFragment.kt              |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
index a5f08f9..b4293df 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
@@ -6,6 +6,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
@@ -17,6 +18,8 @@ import dev.spikeysanju.expensetracker.databinding.ActivityMainBinding
 import dev.spikeysanju.expensetracker.repo.TransactionRepo
 import dev.spikeysanju.expensetracker.utils.viewModelFactory
 import dev.spikeysanju.expensetracker.view.main.viewmodel.TransactionViewModel
+import dev.spikeysanju.expensetracker.view.settings.SettingsViewModel
+import kotlinx.coroutines.flow.first
 import java.util.concurrent.Executor
 import kotlin.system.exitProcess
 
@@ -34,6 +37,10 @@ class MainActivity : AppCompatActivity() {
         viewModelFactory { TransactionViewModel(this.application, repo) }
     }
 
+    private val settingsViewModel: SettingsViewModel by viewModels{
+        viewModelFactory { SettingsViewModel(this.application) }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val binding = ActivityMainBinding.inflate(layoutInflater)
@@ -45,7 +52,12 @@ class MainActivity : AppCompatActivity() {
          */
         viewModel
 
-        authenticate()
+
+        // Set the item state
+        lifecycleScope.launchWhenStarted {
+            if(settingsViewModel.bioMetricPreference.first())
+                authenticate()
+        }
 
         initViews(binding)
         observeNavElements(binding, navHostFragment.navController)
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
index e16977c..ec9ca26 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
@@ -28,8 +28,8 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding, SettingsViewModel
     }
 
     private fun initViews() = with(binding) {
-        biometric.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.setBioMetricLock(isChecked)
+        biometric.setOnCheckedChangeListener { _, biometricEnabled ->
+            viewModel.setBioMetricLock(biometricEnabled)
         }
 
     }

From 3d02dde659ce98e00444510b2f20328d5536f966 Mon Sep 17 00:00:00 2001
From: maifeeulasad <maifeeulasad@gmail.com>
Date: Fri, 19 Mar 2021 14:13:07 +0600
Subject: [PATCH 8/8] #52 ready for pull

---
 .../dev/spikeysanju/expensetracker/view/main/MainActivity.kt   | 2 --
 .../expensetracker/view/settings/SettingsFragment.kt           | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
index b4293df..2b0f075 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/main/MainActivity.kt
@@ -52,8 +52,6 @@ class MainActivity : AppCompatActivity() {
          */
         viewModel
 
-
-        // Set the item state
         lifecycleScope.launchWhenStarted {
             if(settingsViewModel.bioMetricPreference.first())
                 authenticate()
diff --git a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
index ec9ca26..561b73c 100644
--- a/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
+++ b/app/src/main/java/dev/spikeysanju/expensetracker/view/settings/SettingsFragment.kt
@@ -15,10 +15,10 @@ import kotlinx.coroutines.flow.first
 @AndroidEntryPoint
 class SettingsFragment : BaseFragment<FragmentSettingsBinding, SettingsViewModel>() {
     override val viewModel: SettingsViewModel by viewModels()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-
         // Set the item state
         lifecycleScope.launchWhenStarted {
             binding.biometric.isChecked = viewModel.bioMetricPreference.first()
@@ -31,7 +31,6 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding, SettingsViewModel
         biometric.setOnCheckedChangeListener { _, biometricEnabled ->
             viewModel.setBioMetricLock(biometricEnabled)
         }
-
     }
 
     override fun getViewBinding(inflater: LayoutInflater, container: ViewGroup?) =