From 398acf28bf2bec3f847e5747fddb450e78f8fa67 Mon Sep 17 00:00:00 2001
From: Shubham Nanche <73213552+shubhamnanche@users.noreply.github.com>
Date: Thu, 19 Dec 2024 20:25:15 +0530
Subject: [PATCH 1/3] Add haptic feedback when swiping between verses

---
 .idea/appInsightsSettings.xml                 |  26 +++
 .idea/compiler.xml                            |   2 +-
 .idea/deploymentTargetSelector.xml            |  10 +
 .idea/gradle.xml                              |   1 +
 .idea/kotlinc.xml                             |   2 +-
 .idea/misc.xml                                |   3 +-
 .idea/runConfigurations.xml                   |  17 ++
 app/build.gradle                              |  39 ++--
 .../activity/ChapterDetailsActivity.kt        |   3 +-
 .../activity/VerseDetailActivity.kt           | 187 ++++++++++++------
 .../android/bhagavadgita/utils/Frequency.kt   |  13 ++
 build.gradle                                  |   6 +-
 gradle.properties                             |   3 +-
 gradle/libs.versions.toml                     |  34 ++++
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 15 files changed, 261 insertions(+), 87 deletions(-)
 create mode 100644 .idea/appInsightsSettings.xml
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Frequency.kt
 create mode 100644 gradle/libs.versions.toml

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 0000000..371f2e2
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="PLACEHOLDER" />
+                  <option name="mobileSdkAppId" value="" />
+                  <option name="projectId" value="" />
+                  <option name="projectNumber" value="" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b31d960..a60b906 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle/gradle-7.3" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e1eea1d..d4b7acc 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.20" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index adb8ae0..2cdc89a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3c7e755..10eba67 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.wirelessalien.android.bhagavadgita'
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.wirelessalien.android.bhagavadgita"
         minSdk 23
-        targetSdk 33
+        targetSdk 35
         versionCode 8
         versionName "3.3"
 
@@ -23,7 +23,7 @@ android {
             versionNameSuffix 'Debug'
         }
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -37,25 +37,28 @@ android {
     viewBinding {
         enabled = true
     }
+    buildFeatures{
+        buildConfig = true
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation "androidx.recyclerview:recyclerview:1.3.1"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.cardview
+    implementation libs.gson
+    implementation libs.androidx.recyclerview
+    implementation libs.androidx.viewpager2
+    implementation libs.kotlinx.coroutines.android
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.lifecycle.viewmodel.ktx
+    implementation libs.androidx.lifecycle.livedata.ktx
 
     
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/ChapterDetailsActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/ChapterDetailsActivity.kt
index 56338e6..b1e97fd 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/ChapterDetailsActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/ChapterDetailsActivity.kt
@@ -38,6 +38,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException
+import java.util.Locale
 
 class ChapterDetailsActivity : AppCompatActivity() {
 
@@ -136,7 +137,7 @@ class ChapterDetailsActivity : AppCompatActivity() {
         val progress = (readVerses.toDouble() / versesCount.toDouble()) * 100
 
         binding.progressBarReadCount.progress = progress.toInt()
-        binding.progressTextView.text = String.format("%.2f%%", progress)
+        binding.progressTextView.text = String.format(Locale.getDefault(),"%.2f%%", progress)
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
index 51e15ee..1d49b5c 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
@@ -1,4 +1,3 @@
-
 /*
  *  This file is part of BhagavadGitaApp. @WirelessAlien
  *
@@ -25,11 +24,16 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.media.MediaPlayer
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.os.VibrationAttributes
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.util.Log
 import android.view.GestureDetector
+import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import android.view.View
 import android.widget.AdapterView
@@ -37,7 +41,6 @@ import android.widget.ProgressBar
 import android.widget.SeekBar
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.GestureDetectorCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.gson.Gson
@@ -52,6 +55,7 @@ import com.wirelessalien.android.bhagavadgita.data.FavouriteVerse
 import com.wirelessalien.android.bhagavadgita.data.Translation
 import com.wirelessalien.android.bhagavadgita.data.Verse
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityVerseDetailBinding
+import com.wirelessalien.android.bhagavadgita.utils.Frequency
 import com.wirelessalien.android.bhagavadgita.utils.Themes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -70,13 +74,13 @@ class VerseDetailActivity : AppCompatActivity() {
     private lateinit var mediaPlayer: MediaPlayer
     private var isPlaying = false
     private lateinit var binding: ActivityVerseDetailBinding
-    private lateinit var gestureDetector: GestureDetectorCompat
+    private lateinit var gestureDetector: GestureDetector
     private lateinit var translations: List<Translation>
     private lateinit var selectedAuthor: String
     private lateinit var commentary: List<Commentary>
     private lateinit var selectedLanguageC: String
     private var currentTextSize: Int = 16
-
+    private val frequency = Frequency()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -91,7 +95,7 @@ class VerseDetailActivity : AppCompatActivity() {
         val sharedPrefTextSize = getSharedPreferences("text_size_prefs", Context.MODE_PRIVATE)
         currentTextSize = sharedPrefTextSize.getInt("text_size", 16) // Get the saved text size
 
-        gestureDetector = GestureDetectorCompat(this, MyGestureListener())
+        gestureDetector = GestureDetector(this, MyGestureListener())
 
         binding.scrollView.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
 
@@ -123,7 +127,12 @@ class VerseDetailActivity : AppCompatActivity() {
 
                 // Use CustomSpinnerAdapter with coroutines
                 val adapterA = withContext(Dispatchers.Main) {
-                    CustomSpinnerAdapter(this@VerseDetailActivity, android.R.layout.simple_spinner_item, allAuthors, textSize)
+                    CustomSpinnerAdapter(
+                        this@VerseDetailActivity,
+                        android.R.layout.simple_spinner_item,
+                        allAuthors,
+                        textSize
+                    )
                 }
 
                 adapterA.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -137,7 +146,12 @@ class VerseDetailActivity : AppCompatActivity() {
                 }
 
                 authorSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?,
+                        view: View?,
+                        position: Int,
+                        id: Long
+                    ) {
                         selectedAuthor = allAuthors[position]
                         sharedPref.edit().putString("selectedAuthor", selectedAuthor).apply()
 
@@ -196,7 +210,12 @@ class VerseDetailActivity : AppCompatActivity() {
 
                 // Use CustomSpinnerAdapter with coroutines
                 val adapterL = withContext(Dispatchers.Main) {
-                    CustomSpinnerAdapter(this@VerseDetailActivity, android.R.layout.simple_spinner_item, allLanguage, textSize)
+                    CustomSpinnerAdapter(
+                        this@VerseDetailActivity,
+                        android.R.layout.simple_spinner_item,
+                        allLanguage,
+                        textSize
+                    )
                 }
 
                 adapterL.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -209,15 +228,21 @@ class VerseDetailActivity : AppCompatActivity() {
                     languageSpinner.setSelection(savedLangPosition)
                 }
 
-                languageSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-                    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                        selectedLanguageC = allLanguage[position]
-                        sharedPref.edit().putString("selectedLang", selectedLanguageC).apply()
-                        updateCommentaryList()
-                    }
+                languageSpinner.onItemSelectedListener =
+                    object : AdapterView.OnItemSelectedListener {
+                        override fun onItemSelected(
+                            parent: AdapterView<*>?,
+                            view: View?,
+                            position: Int,
+                            id: Long
+                        ) {
+                            selectedLanguageC = allLanguage[position]
+                            sharedPref.edit().putString("selectedLang", selectedLanguageC).apply()
+                            updateCommentaryList()
+                        }
 
-                    override fun onNothingSelected(parent: AdapterView<*>?) {}
-                }
+                        override fun onNothingSelected(parent: AdapterView<*>?) {}
+                    }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -285,7 +310,8 @@ class VerseDetailActivity : AppCompatActivity() {
         }
 
         binding.playPauseButton.setOnClickListener {
-            val audioUrl = "https://github.com/WirelessAlien/gita/raw/main/data/verse_recitation/${verses[currentVerseIndex].chapter_number}/${verses[currentVerseIndex].verse_number}.mp3"
+            val audioUrl =
+                "https://github.com/WirelessAlien/gita/raw/main/data/verse_recitation/${verses[currentVerseIndex].chapter_number}/${verses[currentVerseIndex].verse_number}.mp3"
             if (isPlaying) {
                 pauseAudio()
             } else {
@@ -294,11 +320,14 @@ class VerseDetailActivity : AppCompatActivity() {
         }
 
         binding.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progressValue: Int, fromUser: Boolean) {
+            override fun onProgressChanged(
+                seekBar: SeekBar?,
+                progressValue: Int,
+                fromUser: Boolean
+            ) {
                 if (fromUser) {
                     mediaPlayer.seekTo(progressValue)
-                }
-                else {
+                } else {
                     binding.seekBar.progress = mediaPlayer.currentPosition
                 }
             }
@@ -331,9 +360,9 @@ class VerseDetailActivity : AppCompatActivity() {
     }
 
     private fun markVerseAsUnread() {
-      val sharedPreferences = getSharedPreferences("read_verses", Context.MODE_PRIVATE)
-      val verseId = verses[currentVerseIndex].verse_id
-      sharedPreferences.edit().putBoolean("$verseId", false).apply()
+        val sharedPreferences = getSharedPreferences("read_verses", Context.MODE_PRIVATE)
+        val verseId = verses[currentVerseIndex].verse_id
+        sharedPreferences.edit().putBoolean("$verseId", false).apply()
     }
 
     private fun onFavoriteButtonClick() {
@@ -357,10 +386,19 @@ class VerseDetailActivity : AppCompatActivity() {
         val gson = Gson()
         val favoritesJson = sharedPreferences.getString("favoriteList", "[]")
         val favoriteListType = object : TypeToken<List<FavouriteVerse>>() {}.type
-        val favoriteList = gson.fromJson<List<FavouriteVerse>>(favoritesJson, favoriteListType).toMutableList()
+        val favoriteList =
+            gson.fromJson<List<FavouriteVerse>>(favoritesJson, favoriteListType).toMutableList()
 
         // Add the new favorite item to the list
-        val newFavoriteItem = FavouriteVerse(chapterId,verseTitle, verseContent, transliteration, wordMeanings, translationText, commentaryText)
+        val newFavoriteItem = FavouriteVerse(
+            chapterId,
+            verseTitle,
+            verseContent,
+            transliteration,
+            wordMeanings,
+            translationText,
+            commentaryText
+        )
         favoriteList.add(newFavoriteItem)
 
         // Save the updated list of favorites back to SharedPreferences
@@ -388,7 +426,7 @@ class VerseDetailActivity : AppCompatActivity() {
             textView.textSize = newSize.toFloat()
         }
 
-        val sharedPrefTextSize= getSharedPreferences("text_size_prefs", Context.MODE_PRIVATE)
+        val sharedPrefTextSize = getSharedPreferences("text_size_prefs", Context.MODE_PRIVATE)
         sharedPrefTextSize.edit().putInt("text_size", newSize).apply()
     }
 
@@ -434,25 +472,24 @@ class VerseDetailActivity : AppCompatActivity() {
         private val swipeVelocityThreshold = 100
 
         override fun onFling(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
         ): Boolean {
-            val distanceX = e2.x - e1.x
-            val distanceY = e2.y - e1.y
+            val distanceX = e2.x - (e1?.x ?: 0F)
+            val distanceY = e2.y - (e1?.y ?: 0F)
 
             if (abs(distanceX) > abs(distanceY) &&
                 abs(distanceX) > swipeThreshold &&
                 abs(velocityX) > swipeVelocityThreshold
             ) {
                 if (distanceX > 0) {
-
-                    onSwipeRight()
+                    onSwipe(SwipeDirection.RIGHT)
                 } else {
-
-                    onSwipeLeft()
+                    onSwipe(SwipeDirection.LEFT)
                 }
+                Log.i("Fling", "Fling detected at ${System.currentTimeMillis()}")
                 return true
             }
 
@@ -460,40 +497,67 @@ class VerseDetailActivity : AppCompatActivity() {
         }
     }
 
-    private fun onSwipeRight() {
-        if (currentVerseIndex > 0) {
-            pauseAudio()
-            currentVerseIndex--
-            val prevVerse = verses[currentVerseIndex]
-            updateVerseDetails(binding, prevVerse)
-            updateTranslationList()
-            updateCommentaryList()
-            updateAdapterTextSize(currentTextSize)
-            binding.readMRadioBtn.isChecked = isVerseRead()
-
+    private fun hapticFeedback(inBound: Boolean) {
+        val feedbackType = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (inBound) HapticFeedbackConstants.GESTURE_START else HapticFeedbackConstants.GESTURE_END
+        } else {
+            HapticFeedbackConstants.VIRTUAL_KEY
         }
+        binding.root.performHapticFeedback(feedbackType)
     }
 
-    private fun onSwipeLeft() {
-        if (currentVerseIndex < verses.size - 1) {
-            pauseAudio()
-            currentVerseIndex++
-            val nextVerse = verses[currentVerseIndex]
-            updateVerseDetails(binding, nextVerse)
-            updateTranslationList()
-            updateCommentaryList()
-            updateAdapterTextSize(currentTextSize)
-            if (currentVerseIndex == verses.size - 1) {
-                binding.nextChapterButton.visibility = View.VISIBLE
+    enum class SwipeDirection {
+        LEFT, RIGHT
+    }
+
+    private fun onSwipe(direction: SwipeDirection) {
+        val (isValidSwipe, isChapterInBound, toastMessage) = when (direction) {
+            SwipeDirection.RIGHT -> {
+                if (currentVerseIndex > 0) {
+                    currentVerseIndex--
+                    Triple(true, true, null)
+                } else {
+                    Triple(false, false, "You have reached the first verse of this chapter")
+                }
+            }
+            SwipeDirection.LEFT -> {
+                if (currentVerseIndex < verses.size - 1) {
+                    currentVerseIndex++
+                    if (currentVerseIndex == verses.size - 1) {
+                        binding.nextChapterButton.visibility = View.VISIBLE
+                    }
+                    Triple(true, true, null)
+                } else {
+                    Triple(false, false, "You have reached the last verse of this chapter")
+                }
+            }
+        }
+
+        lifecycleScope.launch {
+            frequency.throttle(500) { hapticFeedback(isChapterInBound) }
+            if (isValidSwipe) {
+                handleVerseChange()
+            } else {
+                Toast.makeText(this@VerseDetailActivity, toastMessage, Toast.LENGTH_SHORT).show()
             }
-            binding.readMRadioBtn.isChecked = isVerseRead()
-        } else {
-            Toast.makeText(this, "You have reached the last verse of this chapter", Toast.LENGTH_SHORT).show()
         }
     }
 
-    private fun updateTranslationList() {
+    private fun handleVerseChange() {
+        pauseAudio()
+        val currentVerse = verses[currentVerseIndex]
+        updateVerseDetails(binding, currentVerse)
+        updateTranslationList()
+        updateCommentaryList()
+        updateAdapterTextSize(currentTextSize)
+        binding.readMRadioBtn.isChecked = isVerseRead()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            binding.root.performHapticFeedback(HapticFeedbackConstants.CONFIRM)
+        }
+    }
 
+    private fun updateTranslationList() {
         // Filter the list of translations based on the selected author and verse number
         val filteredTranslations = translations.filter {
             it.authorName == selectedAuthor && it.verse_id == verses[currentVerseIndex].verse_id
@@ -505,6 +569,7 @@ class VerseDetailActivity : AppCompatActivity() {
         translationRecyclerView.layoutManager = LinearLayoutManager(this)
 
     }
+
     private fun updateCommentaryList() {
 
         val filteredCommentary = commentary.filter {
@@ -529,6 +594,7 @@ class VerseDetailActivity : AppCompatActivity() {
             null
         }
     }
+
     private fun updateVerseDetails(binding: ActivityVerseDetailBinding, verse: Verse) {
         binding.verseTitleTextView.text = verse.title
         binding.verseContentTextView.text = verse.text
@@ -590,7 +656,8 @@ class VerseDetailActivity : AppCompatActivity() {
     """.trimIndent()
 
         // Add your desired line of text at the end
-        val additionalText = "Shared from - Bhagavad Gita App(https://github.com/WirelessAlien/BhagavadGitaApp)"
+        val additionalText =
+            "Shared from - Bhagavad Gita App(https://github.com/WirelessAlien/BhagavadGitaApp)"
 
         return "$textToShare\n$additionalText"
     }
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Frequency.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Frequency.kt
new file mode 100644
index 0000000..1eda04b
--- /dev/null
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Frequency.kt
@@ -0,0 +1,13 @@
+package com.wirelessalien.android.bhagavadgita.utils
+
+class Frequency {
+    private var lastExecutionTime = 0L
+
+    suspend fun throttle(delayMillis: Long = 1000, action: suspend () -> Unit) {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastExecutionTime >= delayMillis) {
+            lastExecutionTime = currentTime
+            action()
+        }
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 55cb6da..c7a3af2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'com.android.application' version '8.7.3' apply false
+    id 'com.android.library' version '8.7.3' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 002607e..2e908a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,4 +40,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..1cb6a9b
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,34 @@
+[versions]
+appcompat = "1.7.0"
+cardview = "1.0.0"
+constraintlayout = "2.2.0"
+coreKtx = "1.15.0"
+espressoCore = "3.6.1"
+gson = "2.10.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+kotlinxCoroutinesAndroid = "1.9.0"
+lifecycleRuntimeKtx = "2.8.7"
+material = "1.12.0"
+recyclerview = "1.3.2"
+viewpager2 = "1.1.0"
+
+[libraries]
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
+androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
+androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+junit = { module = "junit:junit", version.ref = "junit" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+
+[plugins]
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae0a788..5a4abfa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -20,7 +20,7 @@
 
 #Sat Jul 22 10:32:06 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 7646325c25a29dfa7ded413c672a3a88c928e5a5 Mon Sep 17 00:00:00 2001
From: Shubham Nanche <73213552+shubhamnanche@users.noreply.github.com>
Date: Thu, 19 Dec 2024 20:53:00 +0530
Subject: [PATCH 2/3] optimise imports and add version catalogs

---
 .../android/bhagavadgita/ExampleInstrumentedTest.kt         | 6 ++----
 .../android/bhagavadgita/activity/AboutGitaActivity.kt      | 1 -
 .../android/bhagavadgita/activity/HanumanChalisaActivity.kt | 2 --
 .../android/bhagavadgita/activity/VerseDetailActivity.kt    | 3 ---
 .../bhagavadgita/activity/VerseTranslationActivity.kt       | 1 -
 .../android/bhagavadgita/adapter/ChapterAdapter.kt          | 2 --
 .../android/bhagavadgita/fragment/ThemeFragment.kt          | 4 ----
 .../com/wirelessalien/android/bhagavadgita/utils/Themes.kt  | 1 -
 app/src/main/res/layout/activity_verse_translation.xml      | 4 +---
 .../wirelessalien/android/bhagavadgita/ExampleUnitTest.kt   | 3 +--
 10 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
index 765299c..6431e22 100644
--- a/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
@@ -76,14 +76,12 @@
 
 package com.wirelessalien.android.bhagavadgita
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
index c8fb6ce..7589596 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
@@ -23,7 +23,6 @@ package com.wirelessalien.android.bhagavadgita.activity
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityAboutGitaBinding
 import com.wirelessalien.android.bhagavadgita.utils.Themes
 
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
index 22d982d..59c41d4 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
@@ -20,7 +20,6 @@
 
 package com.wirelessalien.android.bhagavadgita.activity
 
-import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -28,7 +27,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityHanumanChalisaBinding
 import com.wirelessalien.android.bhagavadgita.fragment.HanumanChalisaE
 import com.wirelessalien.android.bhagavadgita.fragment.HanumanChalisaH
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
index 1d49b5c..73a9ace 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
@@ -28,9 +28,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.VibrationAttributes
-import android.os.VibrationEffect
-import android.os.Vibrator
 import android.util.Log
 import android.view.GestureDetector
 import android.view.HapticFeedbackConstants
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
index 633faf4..dccb11e 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.adapter.TranslationAdapter
 import com.wirelessalien.android.bhagavadgita.data.Translation
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityVerseTranslationBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
index 67e21f8..9f8d9d1 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
@@ -22,11 +22,9 @@ package com.wirelessalien.android.bhagavadgita.adapter
 
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.activity.ChapterDetailsActivity
 import com.wirelessalien.android.bhagavadgita.data.Chapter
 import com.wirelessalien.android.bhagavadgita.databinding.ChapterCardviewItemBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
index a6e37c9..c9ae210 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
@@ -21,18 +21,14 @@ package com.wirelessalien.android.bhagavadgita.fragment
 
 import android.app.Dialog
 import android.content.Context
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.wirelessalien.android.bhagavadgita.MainActivity
 import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.FragmentThemeBinding
-import kotlin.properties.Delegates
 
 class ThemeFragment : DialogFragment() {
     private lateinit var binding: FragmentThemeBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
index 3a8ac11..ea731cf 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
@@ -2,7 +2,6 @@ package com.wirelessalien.android.bhagavadgita.utils
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContentProviderCompat.requireContext
 import com.wirelessalien.android.bhagavadgita.R
 
 class Themes {
diff --git a/app/src/main/res/layout/activity_verse_translation.xml b/app/src/main/res/layout/activity_verse_translation.xml
index ffa344e..371f7bb 100644
--- a/app/src/main/res/layout/activity_verse_translation.xml
+++ b/app/src/main/res/layout/activity_verse_translation.xml
@@ -19,10 +19,8 @@
   -->
 
 <!-- activity_translation_list.xml -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:orientation="vertical">
diff --git a/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt b/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
index 61fc20d..40a2ea3 100644
--- a/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
+++ b/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
@@ -76,9 +76,8 @@
 
 package com.wirelessalien.android.bhagavadgita
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).

From 59be40df903e09bf4995a4cce3e0fdeb028cbb55 Mon Sep 17 00:00:00 2001
From: Shubham Nanche <73213552+shubhamnanche@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:19:28 +0530
Subject: [PATCH 3/3] fix(proguard): ensure model class types are preserved at
 runtime

---
 .gitignore                                    |  3 ++
 .idea/kotlinc.xml                             |  2 +-
 app/build.gradle                              |  7 ++-
 app/proguard-rules.pro                        | 41 +++++++++++++-
 .../bhagavadgita/activity/AllVerseActivity.kt | 45 +++++++++++-----
 .../utils/NullableTypeAdapterFactory.kt       | 53 +++++++++++++++++++
 build.gradle                                  |  6 +--
 gradle/libs.versions.toml                     | 12 ++++-
 8 files changed, 146 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/NullableTypeAdapterFactory.kt

diff --git a/.gitignore b/.gitignore
index aa724b7..59ffb94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+hs_err_pid*.log
+replay_pid*.log
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d4b7acc..bb44937 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.20" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 10eba67..dcc5df4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.com.android.application)
+    alias(libs.plugins.org.jetbrains.kotlin.android)
 }
 
 android {
@@ -25,6 +25,7 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug //don't forget to comment this line out when generating signed app apk/bundle
         }
     }
     compileOptions {
@@ -57,6 +58,8 @@ dependencies {
     implementation libs.androidx.lifecycle.viewmodel.ktx
     implementation libs.androidx.lifecycle.livedata.ktx
 
+    implementation libs.kotlin.reflect
+
     
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..ace0f06 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,4 +18,43 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+# Keep all classes in Gson
+-keep class com.google.gson.** { *; }
+
+# Keep Gson internal serialization classes
+-keep class sun.misc.** { *; }
+-keep class com.google.gson.stream.** { *; }
+
+# GSON
+-keepattributes Signature
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+
+# Coroutines
+-keepattributes Signature
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+# Preserve models
+#-keep class com.wirelessalien.android.bhagavadgita.data.**
+#-keepclassmembers class com.wirelessalien.android.bhagavadgita.data.** {
+# !transient <fields>;
+#}
+-keep class com.wirelessalien.android.bhagavadgita.data.** {
+    !transient <fields>;
+}
+
+# Preserve Serializable Classes
+-keepclassmembers,allowobfuscation,allowshrinking class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object readResolve();
+    java.lang.Object writeReplace();
+}
+
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AllVerseActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AllVerseActivity.kt
index ffed3e2..e81722d 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AllVerseActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AllVerseActivity.kt
@@ -7,20 +7,24 @@ import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.BackgroundColorSpan
 import android.view.View
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.wirelessalien.android.bhagavadgita.adapter.AllVerseAdapter
 import com.wirelessalien.android.bhagavadgita.data.Commentary
 import com.wirelessalien.android.bhagavadgita.data.Translation
 import com.wirelessalien.android.bhagavadgita.data.Verse
 import com.wirelessalien.android.bhagavadgita.databinding.AllVerseActivityBinding
+import com.wirelessalien.android.bhagavadgita.utils.NullableTypAdapterFactory
 import com.wirelessalien.android.bhagavadgita.utils.Themes
 import kotlinx.coroutines.*
 import java.io.IOException
+import kotlin.reflect.typeOf
 
 class AllVerseActivity : AppCompatActivity() {
 
@@ -80,7 +84,8 @@ class AllVerseActivity : AppCompatActivity() {
                 // Set the chapter details in the UI
                 binding.verseRecyclerView.layoutManager = LinearLayoutManager(this@AllVerseActivity)
                 binding.verseRecyclerView.adapter = AllVerseAdapter(verseList, currentTextSize)
-                binding.progressBar.visibility = View.GONE // Hide the ProgressBar once the verses are loaded
+                binding.progressBar.visibility =
+                    View.GONE // Hide the ProgressBar once the verses are loaded
             }
         }
     }
@@ -131,7 +136,7 @@ class AllVerseActivity : AppCompatActivity() {
 
             val matchedContexts = mutableListOf<String>()
 
-           // Add matched contexts for verse titles
+            // Add matched contexts for verse titles
             verseSearchResult.forEach { verse ->
                 if (verse.title.contains(newText!!, ignoreCase = true)) {
                     matchedContexts.add("Match found in verse title: ${verse.title}")
@@ -188,15 +193,17 @@ class AllVerseActivity : AppCompatActivity() {
 
             val matchedText = if (!newText.isNullOrBlank()) newText else null
 
-            val filteredList = if (verseSearchResult.isNotEmpty() || translationSearchResult.isNotEmpty() || commentarySearchResult.isNotEmpty()) {
-                // Combine the results and get unique verse_ids
-                val verseIds = (verseSearchResult.map { it.verse_id } + translationSearchResult.map { it.verse_id } + commentarySearchResult.map { it.verse_id }).toSet()
+            val filteredList =
+                if (verseSearchResult.isNotEmpty() || translationSearchResult.isNotEmpty() || commentarySearchResult.isNotEmpty()) {
+                    // Combine the results and get unique verse_ids
+                    val verseIds =
+                        (verseSearchResult.map { it.verse_id } + translationSearchResult.map { it.verse_id } + commentarySearchResult.map { it.verse_id }).toSet()
 
-                // Filter the original verseList based on the verse_ids
-                verseList.filter { it.verse_id in verseIds }
-            } else {
-                emptyList()
-            }
+                    // Filter the original verseList based on the verse_ids
+                    verseList.filter { it.verse_id in verseIds }
+                } else {
+                    emptyList()
+                }
 
             val highlightedMatchedContexts = matchedContexts.map { context ->
                 val spannableString = SpannableString(context)
@@ -214,12 +221,22 @@ class AllVerseActivity : AppCompatActivity() {
 
             // Update UI on the main thread
             withContext(Dispatchers.Main) {
-                updateAdapterTextSize(currentTextSize, filteredList, matchedText, highlightedMatchedContexts)
+                updateAdapterTextSize(
+                    currentTextSize,
+                    filteredList,
+                    matchedText,
+                    highlightedMatchedContexts
+                )
             }
         }
     }
 
-    private fun updateAdapterTextSize(newSize: Int, filteredList: List<Verse>, matchedText: String?, matchedContexts: List<SpannableString>) {
+    private fun updateAdapterTextSize(
+        newSize: Int,
+        filteredList: List<Verse>,
+        matchedText: String?,
+        matchedContexts: List<SpannableString>
+    ) {
         val recyclerViewC = binding.verseRecyclerView
         val adapterC = recyclerViewC.adapter as? AllVerseAdapter
         adapterC?.updateTextSize(newSize, filteredList, matchedText, matchedContexts)
@@ -241,10 +258,11 @@ class AllVerseActivity : AppCompatActivity() {
         val commentaries = Gson().fromJson<List<Commentary>>(jsonString, commentaryListType)
 
         // Convert the list of commentaries into a map for easy access
-        return commentaries.associateBy { it.id}
+        return commentaries.associateBy { it.id }
     }
 
     private fun loadJsonFromAsset(fileName: String): String? {
+
         return try {
             applicationContext.assets.open(fileName).bufferedReader().use {
                 it.readText()
@@ -258,7 +276,6 @@ class AllVerseActivity : AppCompatActivity() {
     private fun loadAllVerses(): List<Verse> {
         val jsonString = loadJsonFromAsset("verse.json")
         val verseListType = object : TypeToken<List<Verse>>() {}.type
-
         return Gson().fromJson(jsonString, verseListType)
     }
 }
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/NullableTypeAdapterFactory.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/NullableTypeAdapterFactory.kt
new file mode 100644
index 0000000..3c6306d
--- /dev/null
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/NullableTypeAdapterFactory.kt
@@ -0,0 +1,53 @@
+package com.wirelessalien.android.bhagavadgita.utils
+
+import com.google.gson.Gson
+import com.google.gson.JsonParseException
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import kotlin.jvm.internal.Reflection
+import com.google.gson.stream.JsonWriter
+import kotlin.reflect.KClass
+import kotlin.reflect.full.memberProperties
+
+//https://medium.com/swlh/using-gson-with-kotlins-non-null-types-468b1c66bd8b
+class NullableTypAdapterFactory : TypeAdapterFactory {
+
+    override fun <T : Any?> create(
+        gson: Gson?,
+        type: TypeToken<T?>?
+    ): TypeAdapter<T?>? {
+
+        val delegate = gson?.getDelegateAdapter(this, type)
+
+        // If the class isn't kotlin, don't use the custom type adapter
+        if (type?.rawType?.declaredAnnotations?.none { it.annotationClass.qualifiedName == "kotlin.Metadata" } == true) {
+            return null
+        }
+
+        return object : TypeAdapter<T?>() {
+
+            override fun write(out: JsonWriter?, value: T?) {
+                delegate?.write(out, value)
+            }
+
+            override fun read(input: JsonReader?): T? {
+                val value: T? = delegate?.read(input)
+
+                if (value != null) {
+                    val kotlinClass: KClass<Any> = Reflection.createKotlinClass(type?.rawType)
+
+                    // Ensure none of its non-nullable fields were deserialized to null
+                    kotlinClass.memberProperties.forEach {
+                        if (!it.returnType.isMarkedNullable && it.get(value) == null) {
+                            throw JsonParseException("Value of non-nullable member [${it.name}] cannot be null")
+                        }
+                    }
+                }
+                return value
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c7a3af2..7998c7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.3' apply false
-    id 'com.android.library' version '8.7.3' apply false
-    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
+    alias(libs.plugins.com.android.application) apply false
+    alias(libs.plugins.com.android.library) apply false
+    alias(libs.plugins.org.jetbrains.kotlin.android) apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1cb6a9b..7efe1f6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,14 +4,17 @@ cardview = "1.0.0"
 constraintlayout = "2.2.0"
 coreKtx = "1.15.0"
 espressoCore = "3.6.1"
-gson = "2.10.1"
+gson = "2.11.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-kotlinxCoroutinesAndroid = "1.9.0"
+kotlin = "2.1.0"
+kotlinReflect = "2.1.0"
+kotlinxCoroutinesAndroid = "1.10.1"
 lifecycleRuntimeKtx = "2.8.7"
 material = "1.12.0"
 recyclerview = "1.3.2"
 viewpager2 = "1.1.0"
+agp = "8.7.3"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
@@ -27,8 +30,13 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
 androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 junit = { module = "junit:junit", version.ref = "junit" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinReflect" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 
 [plugins]
+com-android-application = { id = "com.android.application", version.ref = "agp" }
+com-android-library = { id = "com.android.library", version.ref = "agp" }
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 
+[bundles]