diff --git a/.idea/.name b/.idea/.name
index af63dc9..b7a7e9c 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-InInsta
\ No newline at end of file
+InInsta-old
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b589d56..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 0c0c338..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..7f213f6 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -5,6 +5,9 @@
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="InInsta.app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/dictionaries/Narendra.xml b/.idea/dictionaries/Narendra.xml
deleted file mode 100644
index 5aff52b..0000000
--- a/.idea/dictionaries/Narendra.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="Narendra" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8b7fca5..d1b203c 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="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..148fdd2
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.24" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
deleted file mode 100644
index 60f520a..0000000
--- a/.idea/material_theme_project_new.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MaterialThemeProjectNewConfig">
-    <option name="metadata">
-      <MTProjectMetadataState>
-        <option name="migrated" value="true" />
-        <option name="pristineConfig" value="false" />
-        <option name="userId" value="-193a5012:18f2a2c2a9d:-8000" />
-        <option name="version" value="8.13.2" />
-      </MTProjectMetadataState>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 408a9cb..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,111 +1,6 @@
 <project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/APPS/InSaver_old/app/src/main/res/layout/activity_main.xml" value="0.16203703703703703" />
-        <entry key="..\:/APPS/InSaver_old/app/src/main/res/layout/home_view_layout.xml" value="0.16203703703703703" />
-        <entry key="..\:/BanRossyn/Social Work/InInsta/InInsta-Story-Saver/app/src/main/res/layout/activity_main.xml" value="0.1" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/arrow_forward.xml" value="0.175" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_bottom.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_download.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_edit.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_layout.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_logo.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_menu.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_menus.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_card_paste.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_circle.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_login.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_menu.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_menu_shape.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_rectangle.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_status.xml" value="0.19" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_status_circle.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_submit.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/background_titlebar.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/backword.xml" value="0.175" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/bg_background_yellow.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/help_icon.xml" value="0.13651315789473684" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_add.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_baseline_block.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_baseline_close.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_baseline_language.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_baseline_more.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_check.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_curve_arrow.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_delete.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_empty.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_gallery.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_instagram.xml" value="0.19" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_logo.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_no_internet.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_play_circle.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_apps.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_arrow_back.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_arrow_back_menu.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_dark_mode.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_download.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_fast_forward.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_fast_rewind.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_feedback.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_folder.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_fullscreen.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_fullscreen_exit.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_help.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_home.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_link.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_login.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_logout.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_pause.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_play.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_privacy.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_rate.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_settings.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_share.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_skip_next.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_skip_previous.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_star.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_round_star_on.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_share.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_share_menu.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/ic_stories.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/menububble.xml" value="0.19212962962962962" />
-        <entry key="..\:/InInsta/app/src/main/res/drawable/refresh.xml" value="0.175" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/about_view_layout.xml" value="0.17534246575342466" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_instainstor.xml" value="0.19692307692307692" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_login.xml" value="0.1140625" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_main.xml" value="0.2546419098143236" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_player.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_preview.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_show_stories.xml" value="0.33" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/activity_splash.xml" value="0.17534246575342466" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/ad_unified.xml" value="0.33" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/dialog_delete.xml" value="0.22" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/dialog_login.xml" value="0.25" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/dialog_progress.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/dialog_rate.xml" value="0.22" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/fragment_download.xml" value="0.18" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/fragment_web.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/home_view_layout.xml" value="0.22770398481973433" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/how_to_download.xml" value="0.17777777777777778" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/instagram_ininsta.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/item_downloaded.xml" value="0.33" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/item_preview.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/item_profile.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/item_stories.xml" value="0.33" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/layout_controller.xml" value="0.1" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/native_ads.xml" value="0.1" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/place_holder_status.xml" value="0.1" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/stories_view_layout.xml" value="0.4011090573012939" />
-        <entry key="..\:/InInsta/app/src/main/res/layout/tools.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/menu/main_menu.xml" value="0.2" />
-        <entry key="..\:/InInsta/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.21614583333333334" />
-        <entry key="..\:/InInsta/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.21614583333333334" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
deleted file mode 100644
index fe25d78..0000000
--- a/.idea/render.experimental.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RenderSettings">
-    <option name="quality" value="0.4" />
-  </component>
-</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/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..06c5a20
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,5 @@
+## [1.0.0] - 2024.12.9
+
+- Updated the Gradle build files from Groovy to Kotlin DSL.
+- Replaced old dependency and repository configurations with Kotlin-compatible syntax.
+- Ensured compatibility with the latest Gradle version and project setup.
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 80ea460..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,81 +0,0 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    namespace "com.banrossyn.ininsta.story.downloader"
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "com.banrossyn.ininsta.story.downloader"
-        minSdk 24
-        targetSdk 34
-        versionCode 3
-        versionName "1.2.1.04"
-        setProperty("archivesBaseName", "InInsta")
-        vectorDrawables.useSupportLibrary true
-        renderscriptSupportModeEnabled true
-        multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-    }
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs']
-        }
-    }
-    buildFeatures {
-        viewBinding true
-        buildConfig true
-    }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.activity:activity:1.8.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
-    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.3.1'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.3.1'
-
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
-
-    implementation 'com.github.bumptech.glide:glide:4.16.0'
-
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation project(':bubblenavigation')
-
-    implementation 'com.airbnb.android:lottie:4.2.2'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..e28603b
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,81 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.banrossyn.ininsta.story.downloader"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "com.banrossyn.ininsta.story.downloader"
+        minSdk = 24
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0.0"
+        setProperty("archivesBaseName", "InInsta")
+        vectorDrawables.useSupportLibrary = true
+        renderscriptSupportModeEnabled= true
+        multiDexEnabled= true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding=  true
+        buildConfig= true
+    }
+    lint {
+        checkReleaseBuilds =false
+        abortOnError =false
+    }
+
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.constraintlayout)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+
+
+    implementation("androidx.legacy:legacy-support-v4:1.0.0")
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+
+    implementation("com.squareup.retrofit2:adapter-rxjava2:2.7.1")
+    implementation("com.squareup.retrofit2:converter-gson:2.7.1")
+    implementation("com.squareup.retrofit2:retrofit:2.7.1")
+    implementation("com.squareup.okhttp3:okhttp:4.3.1")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.3.1")
+
+    implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
+    implementation("io.reactivex.rxjava2:rxjava:2.2.19")
+
+    implementation("com.github.bumptech.glide:glide:4.16.0")
+
+    implementation("de.hdodenhof:circleimageview:3.1.0")
+    implementation(project(":bubblenavigation"))
+
+    implementation("com.airbnb.android:lottie:4.2.2")
+}
\ No newline at end of file
diff --git a/app/release/InInsta-release.aab b/app/release/InInsta-release.aab
deleted file mode 100644
index 6a2ab4c..0000000
Binary files a/app/release/InInsta-release.aab and /dev/null differ
diff --git a/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.java
deleted file mode 100644
index 89ef356..0000000
--- a/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.banrossyn.ininsta.story.downloader;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.banrossyn.ininsta.instagram.downloader", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..066e6e4
--- /dev/null
+++ b/app/src/androidTest/java/com/banrossyn/ininsta/story/downloader/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.banrossyn.ininsta.story.downloader
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.banrossyn.ininsta.story.downloader", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 51c3a79..e26bd98 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.banrossyn.ininsta.story.downloader">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,6 +11,8 @@
     <application
         android:name=".api.App"
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
@@ -19,11 +20,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.InInsta"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:targetApi="31">
+  <!--      <activity
             android:name=".MainActivity2"
-            android:exported="false" />
+            android:exported="false" />-->
         <activity
             android:name=".SplashActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/banrossyn/ininsta/story/downloader/VideoPlayerActivity.java b/app/src/main/java/com/banrossyn/ininsta/story/downloader/VideoPlayerActivity.java
index 7c90fa3..ca78490 100644
--- a/app/src/main/java/com/banrossyn/ininsta/story/downloader/VideoPlayerActivity.java
+++ b/app/src/main/java/com/banrossyn/ininsta/story/downloader/VideoPlayerActivity.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 
 public class VideoPlayerActivity extends AppCompatActivity implements SurfaceHolder.Callback, MediaPlayer.OnPreparedListener, VideoControllerView.MediaPlayerControl {
+
     private static boolean FullScreen = true;
     static MediaPlayer mediaPlayer;
     ImageView back;
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..07d5da9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000..fa0f996
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000..9ee9997
--- /dev/null
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.java b/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.java
deleted file mode 100644
index 1352fe8..0000000
--- a/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.banrossyn.ininsta.story.downloader;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.kt b/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.kt
new file mode 100644
index 0000000..79744cc
--- /dev/null
+++ b/app/src/test/java/com/banrossyn/ininsta/story/downloader/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.banrossyn.ininsta.story.downloader
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/bubblenavigation/build.gradle b/bubblenavigation/build.gradle
deleted file mode 100644
index 2f681b4..0000000
--- a/bubblenavigation/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'com.gauravk.bubblenavigation'
-    compileSdk 34
-
-    defaultConfig {
-        minSdk 24
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-}
\ No newline at end of file
diff --git a/bubblenavigation/build.gradle.kts b/bubblenavigation/build.gradle.kts
new file mode 100644
index 0000000..97a3636
--- /dev/null
+++ b/bubblenavigation/build.gradle.kts
@@ -0,0 +1,43 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "com.gauravk.bubblenavigation"
+    compileSdk = 35
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
\ No newline at end of file
diff --git a/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.java b/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.java
deleted file mode 100644
index 0ba2853..0000000
--- a/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gauravk.bubblenavigation;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.gauravk.bubblenavigation.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.kt b/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..9c12425
--- /dev/null
+++ b/bubblenavigation/src/androidTest/java/com/gauravk/bubblenavigation/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.gauravk.bubblenavigation
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.gauravk.bubblenavigation.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.java b/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.java
deleted file mode 100644
index 68281dd..0000000
--- a/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gauravk.bubblenavigation;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.kt b/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.kt
new file mode 100644
index 0000000..2df1b38
--- /dev/null
+++ b/bubblenavigation/src/test/java/com/gauravk/bubblenavigation/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.gauravk.bubblenavigation
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 2021f62..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id 'com.android.application' version '8.2.1' apply false
-    id 'com.android.library' version '8.2.0' apply false
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..ecf7a23
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.library) apply false
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 52f5917..8a99f8b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,12 +8,18 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
+# Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..319cffc
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,27 @@
+[versions]
+agp = "8.7.3"
+kotlin = "1.9.24"
+coreKtx = "1.15.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+material = "1.12.0"
+activity = "1.9.3"
+constraintlayout = "2.2.0"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..e708b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 15de902..83bc956 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Dec 09 17:03:03 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..4f906e0 100644
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        i=`expr $i + 1`
     done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..d0ede6e
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,10 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file should *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=C\:\\Users\\Reyuna\\AppData\\Local\\Android\\Sdk
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index c721b0b..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
-    repositories {
-        google()
-        mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
-        mavenCentral { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
-        mavenCentral { url 'https://jitpack.io' }
-        maven {
-            url 'https://android-sdk.is.com/'
-        }
-        maven {
-            url "https://maven.google.com"
-        }
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-}
-rootProject.name = "InInsta"
-include ':app'
-include ':bubblenavigation'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..6da6604
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,40 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    repositories {
+        google()
+        mavenCentral()
+        jcenter() // Warning: this repository is going to shut down soon
+        mavenCentral {
+            url = uri("https://oss.jfrog.org/artifactory/oss-snapshot-local")
+        }
+        mavenCentral {
+            url = uri("https://jitpack.io")
+        }
+        maven {
+            url = uri("https://android-sdk.is.com/")
+        }
+        maven {
+            url = uri("https://maven.google.com")
+        }
+        maven {
+            url = uri("https://plugins.gradle.org/m2/")
+        }
+    }
+}
+
+rootProject.name = "InInsta"
+include(":app")
+include(":bubblenavigation")