From 27f151b7be96a78aae4988ddda63a8a03b5e38aa Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 11 Sep 2025 21:47:10 +0300
Subject: [PATCH 1/8] Add startup and onboarding flow

---
 app/build.gradle                              |  18 +++
 app/src/main/AndroidManifest.xml              |  14 ++-
 .../data/repository/OnboardingRepository.java |   9 ++
 .../androidtutorials/java/di/AppModule.java   |   8 ++
 .../screens/onboarding/OnboardingActivity.kt  |  24 ++++
 .../ui/screens/onboarding/OnboardingScreen.kt | 106 ++++++++++++++++++
 .../onboarding/OnboardingViewModel.java       |  35 ++++++
 .../DefaultOnboardingRepository.java          |  57 ++++++++++
 .../ui/screens/startup/StartupActivity.java   |  25 ++++-
 app/src/main/res/values/keys.xml              |   1 +
 app/src/main/res/values/strings.xml           |   3 +
 build.gradle                                  |   1 +
 gradle/libs.versions.toml                     |   7 ++
 13 files changed, 304 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java

diff --git a/app/build.gradle b/app/build.gradle
index a48b0ad7..639d4ec0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,8 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'com.mikepenz.aboutlibraries.plugin'
     id 'com.google.dagger.hilt.android'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.kapt'
 }
 
 android {
@@ -40,9 +42,18 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
 
+    kotlinOptions {
+        jvmTarget = '21'
+    }
+
     buildFeatures {
         viewBinding true
         buildConfig true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.5.11'
     }
 
     bundle {
@@ -97,12 +108,19 @@ dependencies {
     implementation libs.codeview
     implementation libs.hilt.android
     annotationProcessor libs.hilt.compiler
+    kapt libs.hilt.compiler
     implementation libs.androidx.room.runtime
     annotationProcessor libs.androidx.room.compiler
     annotationProcessor libs.glide.compiler
     implementation libs.retrofit2
     implementation libs.retrofit2.converter.gson
 
+    implementation platform(libs.compose.bom)
+    implementation libs.compose.ui
+    implementation libs.compose.material3
+    implementation libs.compose.foundation
+    implementation libs.compose.activity
+
     // Testing
     testImplementation libs.junit
     testImplementation libs.androidx.core.testing
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9adf030c..0a8fd440 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,20 +38,28 @@
         tools:targetApi="33">
 
         <activity
-            android:name=".ui.screens.main.MainActivity"
+            android:name=".ui.screens.startup.StartupActivity"
             android:exported="true"
             android:theme="@style/SplashScreenTheme">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.screens.main.MainActivity"
+            android:exported="true"
+            android:theme="@style/SplashScreenTheme">
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
 
+        <activity
+            android:name=".ui.screens.onboarding.OnboardingActivity"
+            android:exported="false" />
+
         <activity
             android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
new file mode 100644
index 00000000..9f8368b2
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
@@ -0,0 +1,9 @@
+package com.d4rk.androidtutorials.java.data.repository;
+
+public interface OnboardingRepository {
+    boolean isOnboardingComplete();
+    void setOnboardingComplete();
+    void setTheme(String value);
+    void setDefaultTab(String value);
+    void setBottomBarLabels(String value);
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
index b39200fb..ac04c488 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
@@ -53,6 +53,8 @@
 import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
 import com.d4rk.androidtutorials.java.ui.screens.settings.repository.SettingsRepository;
 import com.d4rk.androidtutorials.java.ui.screens.startup.repository.StartupRepository;
+import com.d4rk.androidtutorials.java.ui.screens.onboarding.repository.DefaultOnboardingRepository;
+import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -262,6 +264,12 @@ public SupportRepository provideSupportRepository(Application application) {
         return new DefaultSupportRepository(application);
     }
 
+    @Provides
+    @Singleton
+    public OnboardingRepository provideOnboardingRepository(Application application) {
+        return new DefaultOnboardingRepository(application);
+    }
+
     @Provides
     public InitBillingClientUseCase provideInitBillingClientUseCase(SupportRepository repository) {
         return new InitBillingClientUseCase(repository);
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
new file mode 100644
index 00000000..52d513b7
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
@@ -0,0 +1,24 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import dagger.hilt.android.AndroidEntryPoint
+import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity
+import androidx.lifecycle.viewmodel.compose.viewModel
+
+@AndroidEntryPoint
+class OnboardingActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            val viewModel: OnboardingViewModel = viewModel()
+            OnboardingScreen(viewModel) {
+                viewModel.completeOnboarding()
+                startActivity(Intent(this, MainActivity::class.java))
+                finish()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
new file mode 100644
index 00000000..56c566df
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
@@ -0,0 +1,106 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.d4rk.androidtutorials.java.R
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun OnboardingScreen(viewModel: OnboardingViewModel, onFinish: () -> Unit) {
+    val pagerState = rememberPagerState(pageCount = {3})
+    val scope = rememberCoroutineScope()
+    Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+        HorizontalPager(state = pagerState, modifier = Modifier.weight(1f)) { page ->
+            when (page) {
+                0 -> ThemePage(viewModel)
+                1 -> DefaultTabPage(viewModel)
+                else -> BottomBarPage(viewModel, onFinish)
+            }
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            if (pagerState.currentPage > 0) {
+                TextButton(onClick = { scope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) } }) {
+                    Text(stringResource(R.string.back))
+                }
+            }
+            if (pagerState.currentPage < 2) {
+                TextButton(onClick = { scope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } }) {
+                    Text(stringResource(R.string.next))
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ThemePage(viewModel: OnboardingViewModel) {
+    val entries = stringArrayResource(R.array.preference_theme_entries)
+    val values = stringArrayResource(R.array.preference_theme_values)
+    var selected by remember { mutableStateOf(values[0]) }
+    Column {
+        Text(stringResource(R.string.dark_mode), style = MaterialTheme.typography.titleMedium)
+        entries.forEachIndexed { index, title ->
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                RadioButton(selected = selected == values[index], onClick = {
+                    selected = values[index]
+                    viewModel.saveTheme(values[index])
+                })
+                Text(title)
+            }
+        }
+    }
+}
+
+@Composable
+private fun DefaultTabPage(viewModel: OnboardingViewModel) {
+    val entries = stringArrayResource(R.array.preference_default_tab_entries)
+    val values = stringArrayResource(R.array.preference_default_tab_values)
+    var selected by remember { mutableStateOf(values[0]) }
+    Column {
+        Text(stringResource(R.string.default_tab), style = MaterialTheme.typography.titleMedium)
+        entries.forEachIndexed { index, title ->
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                RadioButton(selected = selected == values[index], onClick = {
+                    selected = values[index]
+                    viewModel.saveDefaultTab(values[index])
+                })
+                Text(title)
+            }
+        }
+    }
+}
+
+@Composable
+private fun BottomBarPage(viewModel: OnboardingViewModel, onFinish: () -> Unit) {
+    val entries = stringArrayResource(R.array.preference_bottom_navigation_bar_labels_entries)
+    val values = stringArrayResource(R.array.preference_bottom_navigation_bar_labels_values)
+    var selected by remember { mutableStateOf(values[0]) }
+    Column {
+        Text(stringResource(R.string.bottom_navigation_bar_labels), style = MaterialTheme.typography.titleMedium)
+        entries.forEachIndexed { index, title ->
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                RadioButton(selected = selected == values[index], onClick = {
+                    selected = values[index]
+                    viewModel.saveBottomBarLabels(values[index])
+                })
+                Text(title)
+            }
+        }
+        Button(onClick = onFinish, modifier = Modifier.padding(top = 24.dp)) {
+            Text(stringResource(R.string.finish))
+        }
+    }
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
new file mode 100644
index 00000000..9df30ef3
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
@@ -0,0 +1,35 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import androidx.lifecycle.ViewModel;
+
+import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
+
+import dagger.hilt.android.lifecycle.HiltViewModel;
+import javax.inject.Inject;
+
+@HiltViewModel
+public class OnboardingViewModel extends ViewModel {
+
+    private final OnboardingRepository repository;
+
+    @Inject
+    public OnboardingViewModel(OnboardingRepository repository) {
+        this.repository = repository;
+    }
+
+    public void saveTheme(String value) {
+        repository.setTheme(value);
+    }
+
+    public void saveDefaultTab(String value) {
+        repository.setDefaultTab(value);
+    }
+
+    public void saveBottomBarLabels(String value) {
+        repository.setBottomBarLabels(value);
+    }
+
+    public void completeOnboarding() {
+        repository.setOnboardingComplete();
+    }
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java
new file mode 100644
index 00000000..e6c47a84
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java
@@ -0,0 +1,57 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding.repository;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+
+import com.d4rk.androidtutorials.java.R;
+
+public class DefaultOnboardingRepository implements com.d4rk.androidtutorials.java.data.repository.OnboardingRepository {
+
+    private final Context context;
+    private final SharedPreferences prefs;
+
+    public DefaultOnboardingRepository(Context context) {
+        this.context = context.getApplicationContext();
+        this.prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
+    }
+
+    @Override
+    public boolean isOnboardingComplete() {
+        return prefs.getBoolean(context.getString(R.string.key_onboarding_complete), false);
+    }
+
+    @Override
+    public void setOnboardingComplete() {
+        prefs.edit().putBoolean(context.getString(R.string.key_onboarding_complete), true).apply();
+        context.getSharedPreferences("startup", Context.MODE_PRIVATE)
+                .edit().putBoolean("value", false).apply();
+    }
+
+    @Override
+    public void setTheme(String value) {
+        prefs.edit().putString(context.getString(R.string.key_theme), value).apply();
+        String[] values = context.getResources().getStringArray(R.array.preference_theme_values);
+        int mode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+        if (value.equals(values[1])) {
+            mode = AppCompatDelegate.MODE_NIGHT_NO;
+        } else if (value.equals(values[2])) {
+            mode = AppCompatDelegate.MODE_NIGHT_YES;
+        } else if (value.equals(values[3])) {
+            mode = AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
+        }
+        AppCompatDelegate.setDefaultNightMode(mode);
+    }
+
+    @Override
+    public void setDefaultTab(String value) {
+        prefs.edit().putString(context.getString(R.string.key_default_tab), value).apply();
+    }
+
+    @Override
+    public void setBottomBarLabels(String value) {
+        prefs.edit().putString(context.getString(R.string.key_bottom_navigation_bar_labels), value).apply();
+    }
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
index ae967d52..9b4c9686 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
@@ -5,9 +5,16 @@
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.d4rk.androidtutorials.java.databinding.ActivityStartupBinding;
 import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
+import com.d4rk.androidtutorials.java.ui.screens.onboarding.OnboardingActivity;
+import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
+import com.google.android.ump.ConsentRequestParameters;
+import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
+
+import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
@@ -15,12 +22,28 @@
 @AndroidEntryPoint
 public class StartupActivity extends AppCompatActivity {
 
+    @Inject
+    OnboardingRepository onboardingRepository;
+
+    private StartupViewModel viewModel;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (onboardingRepository.isOnboardingComplete()) {
+            startActivity(new Intent(this, MainActivity.class));
+            finish();
+            return;
+        }
+
         ActivityStartupBinding binding = ActivityStartupBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        viewModel = new ViewModelProvider(this).get(StartupViewModel.class);
+        ConsentRequestParameters params = new ConsentRequestParameters.Builder().build();
+        viewModel.requestConsentInfoUpdate(this, params,
+                () -> viewModel.loadConsentForm(this, null), null);
+
         new FastScrollerBuilder(binding.scrollView)
                 .useMd2Style()
                 .build();
@@ -31,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
         );
 
         binding.floatingButtonAgree.setOnClickListener(v -> {
-            startActivity(new Intent(this, MainActivity.class));
+            startActivity(new Intent(this, OnboardingActivity.class));
             finish();
         });
     }
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 279a1f5b..2ad5e922 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -20,4 +20,5 @@
     <string name="key_consent_ad_storage" translatable="false">consent_ad_storage</string>
     <string name="key_consent_ad_user_data" translatable="false">consent_ad_user_data</string>
     <string name="key_consent_ad_personalization" translatable="false">consent_ad_personalization</string>
+    <string name="key_onboarding_complete" translatable="false">onboarding_complete</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec36d720..bd434b74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -472,4 +472,7 @@
     <string name="fetch_data">Fetch data</string>
     <string name="summary_preference_android_studio_retrofit">Make HTTP requests with Retrofit.</string>
     <string name="summary_retrofit">Retrofit is a type-safe HTTP client for Android and Java. This example fetches data from a web service.</string>
+    <string name="next">Next</string>
+    <string name="back">Back</string>
+    <string name="finish">Finish</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 4d91a56a..57c04684 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,4 +5,5 @@ plugins {
     //noinspection NewerVersionAvailable
     id 'com.mikepenz.aboutlibraries.plugin' version '11.3.0' apply true
     id 'com.google.dagger.hilt.android' version '2.57.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aed72c36..74893ff2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,6 +31,8 @@ hilt = "2.57.1"
 room = "2.8.0"
 glide = "5.0.4"
 retrofit = "3.0.0"
+composeBom = "2024.02.01"
+activityCompose = "1.9.2"
 
 [libraries]
 aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
@@ -75,3 +77,8 @@ glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
+compose-ui = { module = "androidx.compose.ui:ui" }
+compose-material3 = { module = "androidx.compose.material3:material3" }
+compose-foundation = { module = "androidx.compose.foundation:foundation" }
+compose-activity = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }

From c11b33e576212e476a70a59a8422eb1d06c824a4 Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 11 Sep 2025 22:07:18 +0300
Subject: [PATCH 2/8] Update Play Services Ads dependency

---
 .idea/kotlinc.xml                             |    6 -
 .idea/workspace.xml                           | 1187 -----------------
 app/build.gradle                              |   20 -
 app/src/main/AndroidManifest.xml              |    4 -
 .../data/repository/OnboardingRepository.java |    9 -
 .../androidtutorials/java/di/AppModule.java   |    8 -
 .../screens/onboarding/OnboardingActivity.kt  |   24 -
 .../ui/screens/onboarding/OnboardingScreen.kt |  106 --
 .../onboarding/OnboardingViewModel.java       |   35 -
 .../DefaultOnboardingRepository.java          |   57 -
 .../ui/screens/startup/StartupActivity.java   |   15 +-
 app/src/main/res/values/keys.xml              |    1 -
 app/src/main/res/values/strings.xml           |    3 -
 build.gradle                                  |    3 +-
 gradle/libs.versions.toml                     |    9 -
 15 files changed, 2 insertions(+), 1485 deletions(-)
 delete mode 100644 .idea/kotlinc.xml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index fdf8d994..00000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 26f483aa..00000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,1187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AnalysisUIOptions">
-    <option name="ANALYZE_INJECTED_CODE" value="false" />
-  </component>
-  <component name="AndroidLayouts">
-    <shared>
-      <config>
-        <device id="pixel_9_pro_xl" />
-        <device id="pixel_tablet" />
-        <pickBest>false</pickBest>
-        <target>android-35</target>
-      </config>
-    </shared>
-    <layouts>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_ad_units.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_bottom_bar.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_category_button_tinted.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_category_clock_tinted.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_category_dialog_tinted.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_category_navigation_tinted.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_code_of_conduct.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_data_object.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_edit_notifications.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_firebase.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_font_download.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_home.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_label.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_language.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_libraries.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_license.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_menu.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_perm_device_information.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_permissions.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_privacy_policy.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_terms_of_service.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_theme.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_tips_and_updates.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_toggle.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_touch_button.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/drawable-anydpi/ic_twitter.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout-sw600dp/activity_main.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_alert_dialog.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_android_history.xml">
-        <config>
-          <night>night</night>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_android_sdk.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_android_start_project.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_buttons.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_chronometer.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_clock.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_date_picker.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_grid_view.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_help.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_image_buttons.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_images.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_linear_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_notification.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_password_box.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_permissions.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_permissions_tutorial.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_progress_bar.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_quiz.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_radio_buttons.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_rating_bar.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_relative_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_build.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_code.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_debugging.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_general.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_refractoring.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shortcuts_version_control.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_snack_bar.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_startup.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_support.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_switch.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_tab_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_table_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_text_box.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_time_picker.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_toast.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_view_binding_tutorial.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_webview.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/bottom_sheet_menu.xml">
-        <config>
-          <theme>@style/AppTheme</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_version_info.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_about.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_buttons_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_clock_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_code.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_linear_layout_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_no_code.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_same_code.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/preference_switch_widget_layout.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/promoted_app_item.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/menu_feedback.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/navigation/mobile_navigation.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_android_studio.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_faq.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_feedback.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_permissions.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_settings.xml">
-        <config>
-          <state>Portrait</state>
-          <night>night</night>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/xml/preferences_shortcuts.xml">
-        <config>
-          <theme>@style/AppThemeActionBar</theme>
-        </config>
-      </layout>
-    </layouts>
-  </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="a86d8b5b-95c7-4937-808e-d4f6dfee35c9" name="Changes" comment="Fix native ad loading&#10;&#10;The `NativeAdLoader` was incorrectly using the banner ad unit ID. This commit corrects it to use the `native_ad_banner_unit_id` string resource, ensuring the correct ad type is loaded.">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="CodeInsightWorkspaceSettings">
-    <option name="optimizeImportsOnTheFly" value="true" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[DeviceId(pluginId=LocalEmulator, isTemplate=false, identifier=path=C:\Users\d4rk7\.android\avd\Pixel_9_Pro.avd)]" />
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <task path="$PROJECT_DIR$/app">
-          <activation />
-        </task>
-        <projects_view>
-          <tree_state>
-            <expand>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Android Studio Tutorials Java Edition" type="f1a62948:ProjectNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Android Studio Tutorials Java Edition" type="f1a62948:ProjectNode" />
-                <item name="app" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Android Studio Tutorials Java Edition" type="f1a62948:ProjectNode" />
-                <item name="app" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Android Studio Tutorials Java Edition" type="f1a62948:ProjectNode" />
-                <item name="app" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="other" type="c8890929:TasksNode$1" />
-              </path>
-            </expand>
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Kotlin Class" />
-        <option value="layoutResourceFile" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="C:\Users\d4rk7\StudioProjects\com.d4rk.androidtutorials.java\app\src\main\play\keys\com.d4rk.androidtutorials.java.jks" />
-    <option name="KEY_ALIAS" value="key0" />
-    <option name="REMEMBER_PASSWORDS" value="true" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="codex/create-roomactivity-with-note-entity-and-dao" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitHubPullRequestSearchHistory">{
-  &quot;lastFilter&quot;: {
-    &quot;state&quot;: &quot;OPEN&quot;,
-    &quot;assignee&quot;: &quot;D4rK7355608&quot;
-  }
-}</component>
-  <component name="GithubPullRequestsUISettings">{
-  &quot;selectedUrlAndAccountId&quot;: {
-    &quot;url&quot;: &quot;https://github.com/D4rK7355608/com.d4rk.androidtutorials.java.git&quot;,
-    &quot;accountId&quot;: &quot;842c9e00-0417-4b9e-9b3f-46b294c8998a&quot;
-  }
-}</component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProblemsViewState">
-    <option name="autoscrollToSource" value="true" />
-    <option name="selectedTabId" value="CurrentFile" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;customColor&quot;: &quot;959160a1&quot;
-}</component>
-  <component name="ProjectId" id="2NCJ4dO0iMDZto55bZ9Oy3taTNB" />
-  <component name="ProjectLevelVcsManager">
-    <OptionsSetting value="false" id="Update" />
-    <ConfirmationsSetting value="1" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Android App.app.executor&quot;: &quot;Run&quot;,
-    &quot;ApkExportedModule&quot;: &quot;Android_Studio_Tutorials_Java_Edition.app&quot;,
-    &quot;BundleExportedModule&quot;: &quot;Android_Studio_Tutorials_Java_Edition.app&quot;,
-    &quot;ExportApk.ApkPathForAndroid_Studio_Tutorials_Java_Edition.app&quot;: &quot;C:\\Users\\d4rk7\\AndroidStudioProjects\\com.d4rk.androidtutorials.java\\app&quot;,
-    &quot;ExportBundle.BundlePathForAndroid_Studio_Tutorials_Java_Edition.app&quot;: &quot;C:\\Users\\d4rk7\\StudioProjects\\com.d4rk.androidtutorials.java\\app&quot;,
-    &quot;Gradle.Download Sources.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;ScreenshotViewer.SavePath&quot;: &quot;C:/Users/d4rk7/Desktop&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;kotlin.migration.detection.enabled&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/d4rk7/StudioProjects/com.d4rk.androidtutorials.java/app/src/main/res/drawable-anydpi&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Suggestions&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;
-  },
-  &quot;keyToStringList&quot;: {
-    &quot;ExportApk.BuildVariants&quot;: [
-      &quot;release&quot;
-    ]
-  }
-}</component>
-  <component name="PsdUISettings">
-    <option name="LAST_EDITED_BUILD_TYPE" value="release" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\d4rk7\StudioProjects\com.d4rk.androidtutorials.java\app\src\main\res\drawable-anydpi" />
-      <recent name="C:\Users\mihai.condrea\StudioProjects\com.d4rk.androidtutorials.java" />
-      <recent name="C:\Users\mihai.condrea\StudioProjects\com.d4rk.androidtutorials.java\app\src\main\res\layout" />
-      <recent name="C:\Users\mihai.condrea\StudioProjects\com.d4rk.androidtutorials.java\app\src\main\res\drawable-anydpi" />
-      <recent name="C:\Users\d4rk7\AndroidStudioProjects\com.d4rk.androidtutorials.java\app\src\main\res\drawable-anydpi" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.d4rk.androidtutorials.java.ads.managers" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-      <module name="Android_Studio_Tutorials_Java_Edition.app" />
-      <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
-      <option name="DEPLOY" value="true" />
-      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-      <option name="DEPLOY_AS_INSTANT" value="false" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ALL_USERS" value="false" />
-      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
-      <option name="ALLOW_ASSUME_VERIFIED" value="false" />
-      <option name="CLEAR_APP_STORAGE" value="false" />
-      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="RESTORE_ENABLED" value="false" />
-      <option name="RESTORE_FILE" value="" />
-      <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
-      <option name="CLEAR_LOGCAT" value="true" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <option name="DEBUGGER_TYPE" value="Auto" />
-      <Auto>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-        <option name="DEBUG_SANDBOX_SDK" value="false" />
-      </Auto>
-      <Hybrid>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-        <option name="DEBUG_SANDBOX_SDK" value="false" />
-      </Hybrid>
-      <Java>
-        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-        <option name="DEBUG_SANDBOX_SDK" value="false" />
-      </Java>
-      <Native>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-        <option name="DEBUG_SANDBOX_SDK" value="false" />
-      </Native>
-      <Profilers>
-        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
-        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-      <method v="2">
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="a86d8b5b-95c7-4937-808e-d4f6dfee35c9" name="Changes" comment="" />
-      <created>1679161941209</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1679161941209</updated>
-    </task>
-    <task id="LOCAL-00001" summary="Update 2.0_r1">
-      <created>1679755248433</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1679755248435</updated>
-    </task>
-    <task id="LOCAL-00002" summary="Update 2.1_r1">
-      <created>1681681129043</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1681681129043</updated>
-    </task>
-    <task id="LOCAL-00003" summary="Update 3.0_r1">
-      <created>1683896261153</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1683896261153</updated>
-    </task>
-    <task id="LOCAL-00004" summary="Update 3.1_r1">
-      <created>1683911157979</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1683911157979</updated>
-    </task>
-    <task id="LOCAL-00005" summary="Update 4.0_r1">
-      <created>1691941043028</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1691941043028</updated>
-    </task>
-    <task id="LOCAL-00013" summary="refactor: App architecture rework and UI improvements (Work in Progress)&#10;&#10;Significantly refactored the app architecture by introducing Repos and ViewModels. &#10;Added edge-to-edge compatibility to more screens. &#10;&#10;**Note:** This is a work-in-progress commit. Further development and refinements are expected in subsequent commits.">
-      <option name="closed" value="true" />
-      <created>1735417666699</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1735417666699</updated>
-    </task>
-    <task id="LOCAL-00014" summary="refactor: Major app overhaul, new features, and dependency updates&#10;&#10;Significantly improved the app's stability, performance, and user experience:&#10;&#10;- Added a new About Libraries screen with detailed information about the used open-source libraries.&#10;- Implemented the EULA (End-User License Agreement) for enhanced user transparency.&#10;- Added support for edge-to-edge displays for a more immersive user experience.&#10;- Updated all dependencies to the latest versions for enhanced performance and security.&#10;- Removed unused dependencies to streamline the project.&#10;- Added a `libs.versions.toml` file to manage and track library versions efficiently.">
-      <option name="closed" value="true" />
-      <created>1735934201043</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1735934201043</updated>
-    </task>
-    <task id="LOCAL-00015" summary="refactor: Improved version info, added explicit encoding, and updated locales&#10;&#10;Enhanced app quality and user experience:&#10;&#10;- Improved the design and information displayed in the version info dialog.&#10;- Added explicit encoding to specific XML files for better compatibility and readability.&#10;- Updated the locales config to include pt-BR (Brazilian Portuguese), th (Thai), and zh-Hant (Traditional Chinese).&#10;- Removed unused resources to streamline the project and improve build times.">
-      <option name="closed" value="true" />
-      <created>1735972584591</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1735972584591</updated>
-    </task>
-    <task id="LOCAL-00016" summary="refactor: Improved code structure, removed redundant code, and added About Libraries screen to Settings&#10;&#10;Significantly enhanced code maintainability and efficiency:&#10;&#10;- Added the About Libraries screen to the Settings menu for easier user access.&#10;- Reworked the lesson screen logic to utilize a single, shared repository, improving code reusability and reducing redundancy.&#10;- Removed numerous redundant and repeated classes to streamline the codebase.">
-      <option name="closed" value="true" />
-      <created>1736062553354</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1736062553354</updated>
-    </task>
-    <task id="LOCAL-00017" summary="refactor: Improved Android SDKs table performance and updated lessons&#10;&#10;Significantly enhanced performance and user experience:&#10;&#10;- Reworked the Android SDKs table for improved performance and responsiveness.&#10;- Added the latest Android versions to the table.&#10;- Updated more lessons to the new, streamlined structure for better code maintainability and reusability.">
-      <option name="closed" value="true" />
-      <created>1736083729157</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1736083729157</updated>
-    </task>
-    <task id="LOCAL-00018" summary="refactor: Updated dependencies and configurations&#10;&#10;Significantly enhanced app stability and performance:&#10;&#10;- Updated Android Gradle Plugin to version 8.10.1.&#10;- Updated various dependencies to their latest versions, including Firebase BOM, ConstraintLayout, GridLayout, Kotlinx Serialization, Lifecycle components, Navigation components, Core KTX, and Play Services Ads.&#10;- Updated `google-services.json` with new project information.&#10;- Modified `AndroidManifest.xml` to update Google Analytics and AdMob configurations.&#10;- Updated `AppOpenAd.java` to use the new AppOpenAd load callback.&#10;- Updated Gradle wrapper to version 8.14.1.&#10;- Incremented app version code to 35 and version name to 5.0.1.&#10;- Updated CHANGELOG.md.">
-      <option name="closed" value="true" />
-      <created>1748545331830</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1748545331830</updated>
-    </task>
-    <task id="LOCAL-00019" summary="feat: Add new languages support and update .gitignore">
-      <option name="closed" value="true" />
-      <created>1749028086119</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1749028086119</updated>
-    </task>
-    <task id="LOCAL-00020" summary="refactor: Updated URLs for Privacy Policy, Terms of Service, and Code of Conduct and updated dependencies&#10;&#10;Updated the URLs for the Privacy Policy, Terms of Service, and Code of Conduct across various parts of the application and documentation.&#10;&#10;The old Google Sites URLs have been replaced with new GitHub Pages URLs to reflect the new location of these documents.&#10;&#10;- Updated links in `preferences_settings.xml`&#10;- Updated links in `StartupActivity.java`&#10;- Updated links in `WebViewActivity.java` and its corresponding raw text file&#10;- Updated links in `HelpActivity.java`&#10;- Updated links in `README.md`&#10;&#10;Additionally, the following dependencies and Gradle wrapper were updated:&#10;- `appcompat` to `1.7.1`&#10;- `firebaseBom` to `33.15.0`&#10;- `lifecycle` (livedata, runtime, viewmodel) to `2.9.1`&#10;- `playServicesAds` to `24.4.0`&#10;- Gradle wrapper to `8.14.2`">
-      <option name="closed" value="true" />
-      <created>1749498098101</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1749498098101</updated>
-    </task>
-    <task id="LOCAL-00021" summary="refactor: Update app configurations and target SDK&#10;&#10;- Updated the target SDK to 36.&#10;- Removed manifest placeholders for analytics and ad storage, as these are now handled directly in `AndroidManifest.xml`.&#10;- Added new AdMob and Firebase Performance metadata to `AndroidManifest.xml`.&#10;- Ensured Google Analytics screen reporting and storage are enabled by default.&#10;- Set ad user data and personalization signals to follow `eu_consent_policy`.">
-      <option name="closed" value="true" />
-      <created>1749545864655</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1749545864655</updated>
-    </task>
-    <task id="LOCAL-00022" summary="refactor: Update app configurations and target SDK&#10;&#10;- Updated the target SDK to 36.&#10;- Removed manifest placeholders for analytics and ad storage, as these are now handled directly in `AndroidManifest.xml`.&#10;- Added new AdMob and Firebase Performance metadata to `AndroidManifest.xml`.&#10;- Ensured Google Analytics screen reporting and storage are enabled by default.&#10;- Set ad user data and personalization signals to follow `eu_consent_policy`.&#10;- Corrected a constructor call in `HomeViewModel.java`.">
-      <option name="closed" value="true" />
-      <created>1749645689157</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1749645689157</updated>
-    </task>
-    <task id="LOCAL-00023" summary="refactor: Improved startup activity and minor UI updates&#10;&#10;Significantly enhanced app stability and user experience:&#10;&#10;- Refactored the startup activity to ensure a smoother app launch.&#10;- Updated the &quot;Get on Google Play&quot; button text to &quot;Play Store&quot; for brevity.&#10;- Removed the &quot;same_code_switches&quot; string as it was no longer in use.">
-      <option name="closed" value="true" />
-      <created>1749659134502</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1749659134502</updated>
-    </task>
-    <task id="LOCAL-00024" summary="refactor: Improved settings screen icons and added new icons&#10;&#10;Significantly enhanced user experience and visual consistency:&#10;&#10;- Replaced existing icons on the settings screen with improved versions for better clarity and visual appeal.&#10;- Added new icons for various settings options to enhance discoverability and user interaction.&#10;- Changed icon sizes to 24dp for better consistency and alignment with Material Design guidelines.&#10;- Removed unnecessary icon tinting from PreferenceCategory to simplify the visual hierarchy and improve readability.">
-      <option name="closed" value="true" />
-      <created>1749667982714</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1749667982714</updated>
-    </task>
-    <task id="LOCAL-00025" summary="refactor: Improved settings screen icons and added new icons&#10;&#10;Significantly enhanced user experience and visual consistency:&#10;&#10;- Replaced existing icons on the settings screen with improved versions for better clarity and visual appeal.&#10;- Added new icons for various settings options to enhance discoverability and user interaction.&#10;- Changed icon sizes to 24dp for better consistency and alignment with Material Design guidelines.&#10;- Removed unnecessary icon tinting from PreferenceCategory to simplify the visual hierarchy and improve readability.">
-      <option name="closed" value="true" />
-      <created>1749669488962</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1749669488962</updated>
-    </task>
-    <task id="LOCAL-00026" summary="refactor: Updated permissions screen and dependencies&#10;&#10;Enhanced user experience and app stability:&#10;&#10;- Reorganized permissions on the permissions screen into &quot;Normal,&quot; &quot;Runtime,&quot; and &quot;Special&quot; categories for better clarity.&#10;- Added &quot;Wake Lock&quot; permission to the &quot;Normal&quot; category with a detailed summary.&#10;- Updated the app version code to 38.&#10;- Added `WAKE_LOCK` permission to `AndroidManifest.xml`.">
-      <option name="closed" value="true" />
-      <created>1749709747357</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1749709747357</updated>
-    </task>
-    <task id="LOCAL-00027" summary="refactor: Added daily tips to arrays.xml&#10;&#10;Enhanced user experience:&#10;&#10;- Moved the `daily_tips` string array from `strings.xml` to `arrays.xml` for better resource organization.">
-      <option name="closed" value="true" />
-      <created>1749721721340</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1749721721340</updated>
-    </task>
-    <task id="LOCAL-00028" summary="refactor: Added new languages, fixed Play Store link, and updated version code&#10;&#10;Enhanced user experience and app functionality:&#10;&#10;- Added support for Arabic, Bengali, Brazilian Portuguese, Filipino, Korean, Spanish (Mexico), Swedish, Thai, Traditional Chinese, Urdu, and Vietnamese languages.&#10;- Corrected the Play Store link in `HomeRepository.java` to point to the correct application ID.&#10;- Updated the app version code to 39.&#10;- Fixed minor typos in French translations.&#10;- Removed unnecessary &quot;&gt;&quot; character from the `ad_banner_unit_id` string.">
-      <option name="closed" value="true" />
-      <created>1750352274387</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1750352274387</updated>
-    </task>
-    <task id="LOCAL-00029" summary="fix: Corrected Android 15 version information&#10;&#10;This commit addresses an issue with the displayed Android 15 version information:&#10;&#10;- The Android 15 codename was initially shown as &quot;Vanilla Ice Cream,&quot; which has been corrected to &quot;VanillaIceCream&quot; (without the space) to align with official naming.&#10;- The version code has been incremented to reflect this update.">
-      <option name="closed" value="true" />
-      <created>1750353491913</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1750353491913</updated>
-    </task>
-    <task id="LOCAL-00030" summary="refactor: Updated Android Gradle Plugin and related dependencies&#10;&#10;This commit updates the Android Gradle Plugin and several related dependencies to their latest versions.&#10;&#10;- Updated Android Gradle Plugin from 8.2.0-rc03 to 8.2.1.&#10;- Updated various Kotlin and AndroidX library versions.&#10;- Incremented `versionCode` to 39 in `build.gradle`.&#10;- Added changelog entry for version 2.4.0.">
-      <option name="closed" value="true" />
-      <created>1751009006773</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1751009006773</updated>
-    </task>
-    <task id="LOCAL-00031" summary="refactor: Removed custom font from code views&#10;&#10;This commit removes the custom font `font_audiowide` from the code views in `fragment_layout.xml`, `fragment_same_code.xml`, and `fragment_code.xml`. The default system font will now be used for displaying code.">
-      <option name="closed" value="true" />
-      <created>1751009258738</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1751009258738</updated>
-    </task>
-    <task id="LOCAL-00032" summary="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting.">
-      <option name="closed" value="true" />
-      <created>1751009466665</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1751009466665</updated>
-    </task>
-    <task id="LOCAL-00033" summary="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting and added `Pattern.DOTALL` to allow multiline strings.&#10;- Updated calls to these methods in various fragments to reflect the removed `context` parameter.">
-      <option name="closed" value="true" />
-      <created>1751010642338</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1751010642338</updated>
-    </task>
-    <task id="LOCAL-00034" summary="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting and added `Pattern.DOTALL` to allow multiline strings.&#10;- Updated calls to these methods in various fragments to reflect the removed `context` parameter.">
-      <option name="closed" value="true" />
-      <created>1751012576138</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1751012576138</updated>
-    </task>
-    <task id="LOCAL-00035" summary="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting and added `Pattern.DOTALL` to allow multiline strings.&#10;- Updated calls to these methods in various fragments to reflect the removed `context` parameter.">
-      <option name="closed" value="true" />
-      <created>1751012640021</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1751012640021</updated>
-    </task>
-    <task id="LOCAL-00036" summary="refactor: Optimized imports&#10;&#10;Sorted imports in `ProgressBarTabLayoutFragment.java` for better organization and readability.">
-      <option name="closed" value="true" />
-      <created>1751014628999</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1751014628999</updated>
-    </task>
-    <task id="LOCAL-00037" summary="feat: Update screenshots and add tablet screenshots&#10;&#10;This commit introduces updated screenshots for the Play Store listing and adds new tablet-specific screenshots.&#10;&#10;- Refreshed phone screenshots for main, tutorials, codes, and themes.&#10;- Added new tablet screenshots for main, tutorials, codes, and themes to enhance the Play Store listing for tablet users.">
-      <option name="closed" value="true" />
-      <created>1751091727546</created>
-      <option name="number" value="00037" />
-      <option name="presentableId" value="LOCAL-00037" />
-      <option name="project" value="LOCAL" />
-      <updated>1751091727546</updated>
-    </task>
-    <task id="LOCAL-00038" summary="feat: Updated Play Store description and Bottom Navigation icon&#10;&#10;This commit revises the Play Store full description for better clarity and engagement, and updates the icon used for the Bottom Navigation preference.&#10;&#10;- **Play Store Description:**&#10;    - Rewrote the full description to be more concise and highlight key features and benefits.&#10;    - Emphasized ease of use, offline accessibility, and beginner-friendliness.&#10;    - Added sections for &quot;Features,&quot; &quot;Benefits,&quot; &quot;How it works,&quot; &quot;Get started today,&quot; and &quot;Feedback.&quot;&#10;    - Removed outdated personal links and lengthy introductory sections.&#10;- **UI:**&#10;    - Replaced the icon for the &quot;Bottom Navigation&quot; preference in the Android Studio preferences XML with a new `ic_bottom_bar` drawable.&#10;    - Added the `ic_bottom_bar.xml` drawable resource.">
-      <option name="closed" value="true" />
-      <created>1751896948191</created>
-      <option name="number" value="00038" />
-      <option name="presentableId" value="LOCAL-00038" />
-      <option name="project" value="LOCAL" />
-      <updated>1751896948191</updated>
-    </task>
-    <task id="LOCAL-00039" summary="Fix compilation errors, update Gradle, and refactor code&#10;&#10;This commit addresses several issues and improvements:&#10;&#10;- **Gradle Update:** Upgraded Gradle wrapper to version 8.14.3.&#10;- **CI Fixes:**&#10;    - Resolved compilation errors in `SupportRepository.java` by updating the `queryProductDetailsAsync` callback to correctly handle the `productDetailsList`.&#10;    - Corrected the usage of `Gravity.START` to `GravityCompat.START` in `NavigationDrawerActivity.java`.&#10;- **Code Refactoring:**&#10;    - Replaced the deprecated `onBackPressed()` method in `MainActivity.java` with the newer `OnBackPressedCallback`.&#10;    - Converted the `PromotedApp` class to a Java record for conciseness.&#10;    - Removed unused private `binding` fields from several Fragment classes.&#10;    - Added a null check for the `preference` parameter in `MainRepository.java` to prevent potential `NullPointerExceptions`.&#10;- **Localization:** Fixed a typo in the German translation for `summary_preference_faq_4`.">
-      <option name="closed" value="true" />
-      <created>1753729512778</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1753729512778</updated>
-    </task>
-    <task id="LOCAL-00040" summary="fix: Corrected BillingClient usage in SupportRepository&#10;&#10;This commit addresses issues with the Google Play Billing Library integration in `SupportRepository.java`:&#10;&#10;- **BillingClient Initialization:** Added `enableAutoServiceReconnection()` during BillingClient setup as a best practice for v8+ of the library.&#10;- **Product Details Query:**&#10;    - Corrected the lambda expression in `queryProductDetailsAsync` to properly accept a single `QueryProductDetailsResult` object, aligning with the official documentation.&#10;    - Ensured that `productDetailsList` is retrieved from the `QueryProductDetailsResult` object.&#10;- **Purchase Initiation:**&#10;    - Updated `initiatePurchase` to correctly use `setOfferToken()` when building `BillingFlowParams.ProductDetailsParams`.&#10;    - Simplified the creation of `productDetailsParamsList` using `Collections.singletonList()`.">
-      <option name="closed" value="true" />
-      <created>1753790463569</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1753790463569</updated>
-    </task>
-    <task id="LOCAL-00041" summary="fix: Corrected BillingClient usage in SupportRepository&#10;&#10;This commit addresses issues with the Google Play Billing Library integration in `SupportRepository.java`:&#10;&#10;- **BillingClient Initialization:** Added `enableAutoServiceReconnection()` during BillingClient setup as a best practice for v8+ of the library.&#10;- **Product Details Query:**&#10;    - Corrected the lambda expression in `queryProductDetailsAsync` to properly accept a single `QueryProductDetailsResult` object, aligning with the official documentation.&#10;    - Ensured that `productDetailsList` is retrieved from the `QueryProductDetailsResult` object.&#10;- **Purchase Initiation:**&#10;    - Updated `initiatePurchase` to correctly use `setOfferToken()` when building `BillingFlowParams.ProductDetailsParams`.&#10;    - Simplified the creation of `productDetailsParamsList` using `Collections.singletonList()`.">
-      <option name="closed" value="true" />
-      <created>1756589245986</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1756589245987</updated>
-    </task>
-    <task id="LOCAL-00042" summary="Remove archivesBaseName from build.gradle&#10;&#10;The `archivesBaseName` property was removed from the app-level `build.gradle` file. This property was used to customize the base name of the generated APK/AAB files.">
-      <option name="closed" value="true" />
-      <created>1756589287831</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1756589287831</updated>
-    </task>
-    <task id="LOCAL-00043" summary="Update Hilt, Gradle, and Java versions&#10;&#10;This commit includes the following updates:&#10;&#10;- **Hilt:** Upgraded Hilt version from 2.51.1 to 2.57.1 in both `gradle/libs.versions.toml` and `build.gradle`.&#10;- **Gradle:**&#10;    - Changed `compileSdk` to `compileSdkVersion` in `app/build.gradle`.&#10;- **Java:** Updated `sourceCompatibility` and `targetCompatibility` from Java 17 to Java 21 in `app/build.gradle`.">
-      <option name="closed" value="true" />
-      <created>1756628809550</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1756628809550</updated>
-    </task>
-    <task id="LOCAL-00044" summary="Refactor: Update test dependencies to use version catalog">
-      <option name="closed" value="true" />
-      <created>1756644311544</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1756644311544</updated>
-    </task>
-    <task id="LOCAL-00045" summary="Refactor: Update progress bar styles">
-      <option name="closed" value="true" />
-      <created>1756646065467</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1756646065467</updated>
-    </task>
-    <task id="LOCAL-00046" summary="Fix typo in untranslatable strings&#10;&#10;The commit removes an unnecessary &quot;&gt;&quot; character from the &quot;changelog&quot; string resource.">
-      <option name="closed" value="true" />
-      <created>1756662534505</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1756662534505</updated>
-    </task>
-    <task id="LOCAL-00047" summary="Update version and changelog for v5.0.2&#10;&#10;This commit updates the application version to 5.0.2 and versionCode to 42.&#10;&#10;The changelog for v5.0.2 includes:&#10;- New font styling and improved code visualization.&#10;- Google Sans Code set as the default font.&#10;- Added a search function for lessons.&#10;- Optimized app performance.&#10;- Updated components for better compatibility.">
-      <option name="closed" value="true" />
-      <created>1756800245734</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1756800245734</updated>
-    </task>
-    <task id="LOCAL-00048" summary="Add Google Sans Code font&#10;&#10;This commit adds the Google Sans Code font file to the project resources.">
-      <option name="closed" value="true" />
-      <created>1756800330720</created>
-      <option name="number" value="00048" />
-      <option name="presentableId" value="LOCAL-00048" />
-      <option name="project" value="LOCAL" />
-      <updated>1756800330720</updated>
-    </task>
-    <task id="LOCAL-00049" summary="Add bottom navigation and navigation drawer lessons&#10;&#10;New lessons have been added to the changelog:&#10;- Using bottom navigation&#10;- Using navigation drawer">
-      <option name="closed" value="true" />
-      <created>1756800496163</created>
-      <option name="number" value="00049" />
-      <option name="presentableId" value="LOCAL-00049" />
-      <option name="project" value="LOCAL" />
-      <updated>1756800496163</updated>
-    </task>
-    <task id="LOCAL-00050" summary="Fix typos in Spanish and Turkish translations&#10;&#10;- Corrected &quot;interfaz&quot; in `summary_preference_android_studio_time_picker`, `summary_preference_android_studio_text_box`, and `summary_android_features` for es-rMX and es-rGQ.&#10;- Corrected apostrophe in `summary_preference_android_studio_room_database` for tr-rTR.&#10;- Removed unused `tools` namespace from Italian, Hungarian, Japanese, and Polish `strings.xml`.">
-      <option name="closed" value="true" />
-      <created>1756804452017</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1756804452019</updated>
-    </task>
-    <task id="LOCAL-00051" summary="Update Room database lesson in changelog&#10;&#10;The Room database lesson in the changelog was updated to remove the mention of code viewer integration.">
-      <option name="closed" value="true" />
-      <created>1756805744174</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1756805744174</updated>
-    </task>
-    <task id="LOCAL-00052" summary="Initialize CookieManager&#10;&#10;CookieManager is initialized in the Application class to ensure it's ready when needed.">
-      <option name="closed" value="true" />
-      <created>1756806369016</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1756806369016</updated>
-    </task>
-    <task id="LOCAL-00053" summary="Update Android Gradle Plugin and improve accessibility">
-      <option name="closed" value="true" />
-      <created>1756907578655</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1756907578655</updated>
-    </task>
-    <task id="LOCAL-00054" summary="Fix: Suppress lint warnings&#10;&#10;- Suppressed `MissingConstraints` warnings in various fragment layout files.&#10;- Suppressed `HardcodedText` warnings in `BottomNavigationActivity.java` and `NavigationDrawerActivity.java`.&#10;- Suppressed `ContentDescription` and `SpeakableTextPresentCheck` warnings in `fragment_about.xml`.&#10;- Suppressed `UnusedAttribute` warnings in several activity layout files.&#10;- Suppressed `MotionLayoutInvalidSceneFileReference`, `StopShip`, `ScrollViewCount`, `ScrollViewSize`, and `SpeakableTextPresentCheck` warnings in `activity_permissions_tutorial.xml`.&#10;- Suppressed `ScrollViewCount` and `ScrollViewSize` warnings in `activity_view_binding_tutorial.xml`.&#10;- Suppressed `MissingDefaultResource` warning in `activity_switch.xml`.&#10;- Suppressed `UselessLeaf` warning in `activity_table_layout.xml`.&#10;- Suppressed `ObsoleteSdkInt`, `UsingOnClickInXml`, and `TextFields` warnings in `activity_text_box.xml`.&#10;- Suppressed `InvalidId`, `Autofill`, `LabelFor`, `TextFields`, `UsingOnClickInXml`, and `ObsoleteSdkInt` warnings in `activity_password_box.xml`.&#10;- Suppressed `SetTextI18n` warnings in `activity_time_picker.xml` and `activity_date_picker.xml`.&#10;- Suppressed `AdvertisingIdPolicy` and `ForegroundServiceType` warnings in `AndroidManifest.xml`.&#10;- Added `tools:targetApi=&quot;26&quot;` to various views to suppress `UnusedAttribute` warnings.">
-      <option name="closed" value="true" />
-      <created>1756931334702</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1756931334702</updated>
-    </task>
-    <task id="LOCAL-00055" summary="fix: escape apostrophes in Italian translation&#10;&#10;The Italian translation file `strings.xml` was updated to properly escape apostrophes. This ensures that strings containing apostrophes are displayed correctly in the Italian localization of the app.">
-      <option name="closed" value="true" />
-      <created>1756932946329</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1756932946329</updated>
-    </task>
-    <task id="LOCAL-00056" summary="Fix native ad loading&#10;&#10;The `NativeAdLoader` was incorrectly using the banner ad unit ID. This commit corrects it to use the `native_ad_banner_unit_id` string resource, ensuring the correct ad type is loaded.">
-      <option name="closed" value="true" />
-      <created>1757015886309</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1757015886309</updated>
-    </task>
-    <option name="localTasksCounter" value="57" />
-    <servers />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix: Corrected Android 15 version information&#10;&#10;This commit addresses an issue with the displayed Android 15 version information:&#10;&#10;- The Android 15 codename was initially shown as &quot;Vanilla Ice Cream,&quot; which has been corrected to &quot;VanillaIceCream&quot; (without the space) to align with official naming.&#10;- The version code has been incremented to reflect this update." />
-    <MESSAGE value="refactor: Updated Android Gradle Plugin and related dependencies&#10;&#10;This commit updates the Android Gradle Plugin and several related dependencies to their latest versions.&#10;&#10;- Updated Android Gradle Plugin from 8.2.0-rc03 to 8.2.1.&#10;- Updated various Kotlin and AndroidX library versions.&#10;- Incremented `versionCode` to 39 in `build.gradle`.&#10;- Added changelog entry for version 2.4.0." />
-    <MESSAGE value="refactor: Removed custom font from code views&#10;&#10;This commit removes the custom font `font_audiowide` from the code views in `fragment_layout.xml`, `fragment_same_code.xml`, and `fragment_code.xml`. The default system font will now be used for displaying code." />
-    <MESSAGE value="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting." />
-    <MESSAGE value="refactor: Cleaned up code highlighting logic&#10;&#10;This commit introduces minor improvements to the `CodeHighlighter` class:&#10;&#10;- Removed the unused `context` parameter from `applyJavaTheme` and `applyXmlTheme` methods.&#10;- Removed a redundant character escape `\\=` in the regular expression for XML attribute highlighting and added `Pattern.DOTALL` to allow multiline strings.&#10;- Updated calls to these methods in various fragments to reflect the removed `context` parameter." />
-    <MESSAGE value="refactor: Optimized imports&#10;&#10;Sorted imports in `ProgressBarTabLayoutFragment.java` for better organization and readability." />
-    <MESSAGE value="feat: Update screenshots and add tablet screenshots&#10;&#10;This commit introduces updated screenshots for the Play Store listing and adds new tablet-specific screenshots.&#10;&#10;- Refreshed phone screenshots for main, tutorials, codes, and themes.&#10;- Added new tablet screenshots for main, tutorials, codes, and themes to enhance the Play Store listing for tablet users." />
-    <MESSAGE value="feat: Updated Play Store description and Bottom Navigation icon&#10;&#10;This commit revises the Play Store full description for better clarity and engagement, and updates the icon used for the Bottom Navigation preference.&#10;&#10;- **Play Store Description:**&#10;    - Rewrote the full description to be more concise and highlight key features and benefits.&#10;    - Emphasized ease of use, offline accessibility, and beginner-friendliness.&#10;    - Added sections for &quot;Features,&quot; &quot;Benefits,&quot; &quot;How it works,&quot; &quot;Get started today,&quot; and &quot;Feedback.&quot;&#10;    - Removed outdated personal links and lengthy introductory sections.&#10;- **UI:**&#10;    - Replaced the icon for the &quot;Bottom Navigation&quot; preference in the Android Studio preferences XML with a new `ic_bottom_bar` drawable.&#10;    - Added the `ic_bottom_bar.xml` drawable resource." />
-    <MESSAGE value="Fix compilation errors, update Gradle, and refactor code&#10;&#10;This commit addresses several issues and improvements:&#10;&#10;- **Gradle Update:** Upgraded Gradle wrapper to version 8.14.3.&#10;- **CI Fixes:**&#10;    - Resolved compilation errors in `SupportRepository.java` by updating the `queryProductDetailsAsync` callback to correctly handle the `productDetailsList`.&#10;    - Corrected the usage of `Gravity.START` to `GravityCompat.START` in `NavigationDrawerActivity.java`.&#10;- **Code Refactoring:**&#10;    - Replaced the deprecated `onBackPressed()` method in `MainActivity.java` with the newer `OnBackPressedCallback`.&#10;    - Converted the `PromotedApp` class to a Java record for conciseness.&#10;    - Removed unused private `binding` fields from several Fragment classes.&#10;    - Added a null check for the `preference` parameter in `MainRepository.java` to prevent potential `NullPointerExceptions`.&#10;- **Localization:** Fixed a typo in the German translation for `summary_preference_faq_4`." />
-    <MESSAGE value="fix: Corrected BillingClient usage in SupportRepository&#10;&#10;This commit addresses issues with the Google Play Billing Library integration in `SupportRepository.java`:&#10;&#10;- **BillingClient Initialization:** Added `enableAutoServiceReconnection()` during BillingClient setup as a best practice for v8+ of the library.&#10;- **Product Details Query:**&#10;    - Corrected the lambda expression in `queryProductDetailsAsync` to properly accept a single `QueryProductDetailsResult` object, aligning with the official documentation.&#10;    - Ensured that `productDetailsList` is retrieved from the `QueryProductDetailsResult` object.&#10;- **Purchase Initiation:**&#10;    - Updated `initiatePurchase` to correctly use `setOfferToken()` when building `BillingFlowParams.ProductDetailsParams`.&#10;    - Simplified the creation of `productDetailsParamsList` using `Collections.singletonList()`." />
-    <MESSAGE value="Remove archivesBaseName from build.gradle&#10;&#10;The `archivesBaseName` property was removed from the app-level `build.gradle` file. This property was used to customize the base name of the generated APK/AAB files." />
-    <MESSAGE value="Update Hilt, Gradle, and Java versions&#10;&#10;This commit includes the following updates:&#10;&#10;- **Hilt:** Upgraded Hilt version from 2.51.1 to 2.57.1 in both `gradle/libs.versions.toml` and `build.gradle`.&#10;- **Gradle:**&#10;    - Changed `compileSdk` to `compileSdkVersion` in `app/build.gradle`.&#10;- **Java:** Updated `sourceCompatibility` and `targetCompatibility` from Java 17 to Java 21 in `app/build.gradle`." />
-    <MESSAGE value="Refactor: Update test dependencies to use version catalog" />
-    <MESSAGE value="Refactor: Update progress bar styles" />
-    <MESSAGE value="Fix typo in untranslatable strings&#10;&#10;The commit removes an unnecessary &quot;&gt;&quot; character from the &quot;changelog&quot; string resource." />
-    <MESSAGE value="Update version and changelog for v5.0.2&#10;&#10;This commit updates the application version to 5.0.2 and versionCode to 42.&#10;&#10;The changelog for v5.0.2 includes:&#10;- New font styling and improved code visualization.&#10;- Google Sans Code set as the default font.&#10;- Added a search function for lessons.&#10;- Optimized app performance.&#10;- Updated components for better compatibility." />
-    <MESSAGE value="Add Google Sans Code font&#10;&#10;This commit adds the Google Sans Code font file to the project resources." />
-    <MESSAGE value="Add bottom navigation and navigation drawer lessons&#10;&#10;New lessons have been added to the changelog:&#10;- Using bottom navigation&#10;- Using navigation drawer" />
-    <MESSAGE value="Fix typos in Spanish and Turkish translations&#10;&#10;- Corrected &quot;interfaz&quot; in `summary_preference_android_studio_time_picker`, `summary_preference_android_studio_text_box`, and `summary_android_features` for es-rMX and es-rGQ.&#10;- Corrected apostrophe in `summary_preference_android_studio_room_database` for tr-rTR.&#10;- Removed unused `tools` namespace from Italian, Hungarian, Japanese, and Polish `strings.xml`." />
-    <MESSAGE value="Update Room database lesson in changelog&#10;&#10;The Room database lesson in the changelog was updated to remove the mention of code viewer integration." />
-    <MESSAGE value="Initialize CookieManager&#10;&#10;CookieManager is initialized in the Application class to ensure it's ready when needed." />
-    <MESSAGE value="Update Android Gradle Plugin and improve accessibility" />
-    <MESSAGE value="Fix: Suppress lint warnings&#10;&#10;- Suppressed `MissingConstraints` warnings in various fragment layout files.&#10;- Suppressed `HardcodedText` warnings in `BottomNavigationActivity.java` and `NavigationDrawerActivity.java`.&#10;- Suppressed `ContentDescription` and `SpeakableTextPresentCheck` warnings in `fragment_about.xml`.&#10;- Suppressed `UnusedAttribute` warnings in several activity layout files.&#10;- Suppressed `MotionLayoutInvalidSceneFileReference`, `StopShip`, `ScrollViewCount`, `ScrollViewSize`, and `SpeakableTextPresentCheck` warnings in `activity_permissions_tutorial.xml`.&#10;- Suppressed `ScrollViewCount` and `ScrollViewSize` warnings in `activity_view_binding_tutorial.xml`.&#10;- Suppressed `MissingDefaultResource` warning in `activity_switch.xml`.&#10;- Suppressed `UselessLeaf` warning in `activity_table_layout.xml`.&#10;- Suppressed `ObsoleteSdkInt`, `UsingOnClickInXml`, and `TextFields` warnings in `activity_text_box.xml`.&#10;- Suppressed `InvalidId`, `Autofill`, `LabelFor`, `TextFields`, `UsingOnClickInXml`, and `ObsoleteSdkInt` warnings in `activity_password_box.xml`.&#10;- Suppressed `SetTextI18n` warnings in `activity_time_picker.xml` and `activity_date_picker.xml`.&#10;- Suppressed `AdvertisingIdPolicy` and `ForegroundServiceType` warnings in `AndroidManifest.xml`.&#10;- Added `tools:targetApi=&quot;26&quot;` to various views to suppress `UnusedAttribute` warnings." />
-    <MESSAGE value="fix: escape apostrophes in Italian translation&#10;&#10;The Italian translation file `strings.xml` was updated to properly escape apostrophes. This ensures that strings containing apostrophes are displayed correctly in the Italian localization of the app." />
-    <MESSAGE value="Fix native ad loading&#10;&#10;The `NativeAdLoader` was incorrectly using the banner ad unit ID. This commit corrects it to use the `native_ad_banner_unit_id` string resource, ensuring the correct ad type is loaded." />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix native ad loading&#10;&#10;The `NativeAdLoader` was incorrectly using the banner ad unit ID. This commit corrects it to use the `native_ad_banner_unit_id` string resource, ensuring the correct ad type is loaded." />
-  </component>
-  <component name="play_dynamic_filters_status">
-    <option name="appIdToCheckInfo">
-      <map>
-        <entry key="com.d4rk.androidtutorials.java">
-          <value>
-            <CheckInfo lastCheckTimestamp="1757015656892" />
-          </value>
-        </entry>
-        <entry key="com.d4rk.androidtutorials.java.test">
-          <value>
-            <CheckInfo lastCheckTimestamp="1757015656889" />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 639d4ec0..05282b53 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,8 +4,6 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'com.mikepenz.aboutlibraries.plugin'
     id 'com.google.dagger.hilt.android'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.kapt'
 }
 
 android {
@@ -42,18 +40,9 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
 
-    kotlinOptions {
-        jvmTarget = '21'
-    }
-
     buildFeatures {
         viewBinding true
         buildConfig true
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.11'
     }
 
     bundle {
@@ -96,9 +85,6 @@ dependencies {
     implementation libs.androidx.lifecycle.livedata
     implementation libs.androidx.lifecycle.viewmodel
     implementation libs.androidx.multidex
-
-    implementation libs.kotlinx.serialization.json
-
     implementation libs.aboutlibraries
     implementation libs.core
 
@@ -108,18 +94,12 @@ dependencies {
     implementation libs.codeview
     implementation libs.hilt.android
     annotationProcessor libs.hilt.compiler
-    kapt libs.hilt.compiler
     implementation libs.androidx.room.runtime
     annotationProcessor libs.androidx.room.compiler
     annotationProcessor libs.glide.compiler
     implementation libs.retrofit2
     implementation libs.retrofit2.converter.gson
 
-    implementation platform(libs.compose.bom)
-    implementation libs.compose.ui
-    implementation libs.compose.material3
-    implementation libs.compose.foundation
-    implementation libs.compose.activity
 
     // Testing
     testImplementation libs.junit
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a8fd440..e49ded4d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,10 +56,6 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <activity
-            android:name=".ui.screens.onboarding.OnboardingActivity"
-            android:exported="false" />
-
         <activity
             android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
deleted file mode 100644
index 9f8368b2..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/OnboardingRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.d4rk.androidtutorials.java.data.repository;
-
-public interface OnboardingRepository {
-    boolean isOnboardingComplete();
-    void setOnboardingComplete();
-    void setTheme(String value);
-    void setDefaultTab(String value);
-    void setBottomBarLabels(String value);
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
index ac04c488..b39200fb 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
@@ -53,8 +53,6 @@
 import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
 import com.d4rk.androidtutorials.java.ui.screens.settings.repository.SettingsRepository;
 import com.d4rk.androidtutorials.java.ui.screens.startup.repository.StartupRepository;
-import com.d4rk.androidtutorials.java.ui.screens.onboarding.repository.DefaultOnboardingRepository;
-import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -264,12 +262,6 @@ public SupportRepository provideSupportRepository(Application application) {
         return new DefaultSupportRepository(application);
     }
 
-    @Provides
-    @Singleton
-    public OnboardingRepository provideOnboardingRepository(Application application) {
-        return new DefaultOnboardingRepository(application);
-    }
-
     @Provides
     public InitBillingClientUseCase provideInitBillingClientUseCase(SupportRepository repository) {
         return new InitBillingClientUseCase(repository);
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
deleted file mode 100644
index 52d513b7..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.d4rk.androidtutorials.java.ui.screens.onboarding
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import dagger.hilt.android.AndroidEntryPoint
-import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity
-import androidx.lifecycle.viewmodel.compose.viewModel
-
-@AndroidEntryPoint
-class OnboardingActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            val viewModel: OnboardingViewModel = viewModel()
-            OnboardingScreen(viewModel) {
-                viewModel.completeOnboarding()
-                startActivity(Intent(this, MainActivity::class.java))
-                finish()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
deleted file mode 100644
index 56c566df..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingScreen.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.d4rk.androidtutorials.java.ui.screens.onboarding
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.d4rk.androidtutorials.java.R
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun OnboardingScreen(viewModel: OnboardingViewModel, onFinish: () -> Unit) {
-    val pagerState = rememberPagerState(pageCount = {3})
-    val scope = rememberCoroutineScope()
-    Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
-        HorizontalPager(state = pagerState, modifier = Modifier.weight(1f)) { page ->
-            when (page) {
-                0 -> ThemePage(viewModel)
-                1 -> DefaultTabPage(viewModel)
-                else -> BottomBarPage(viewModel, onFinish)
-            }
-        }
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween
-        ) {
-            if (pagerState.currentPage > 0) {
-                TextButton(onClick = { scope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) } }) {
-                    Text(stringResource(R.string.back))
-                }
-            }
-            if (pagerState.currentPage < 2) {
-                TextButton(onClick = { scope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } }) {
-                    Text(stringResource(R.string.next))
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun ThemePage(viewModel: OnboardingViewModel) {
-    val entries = stringArrayResource(R.array.preference_theme_entries)
-    val values = stringArrayResource(R.array.preference_theme_values)
-    var selected by remember { mutableStateOf(values[0]) }
-    Column {
-        Text(stringResource(R.string.dark_mode), style = MaterialTheme.typography.titleMedium)
-        entries.forEachIndexed { index, title ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                RadioButton(selected = selected == values[index], onClick = {
-                    selected = values[index]
-                    viewModel.saveTheme(values[index])
-                })
-                Text(title)
-            }
-        }
-    }
-}
-
-@Composable
-private fun DefaultTabPage(viewModel: OnboardingViewModel) {
-    val entries = stringArrayResource(R.array.preference_default_tab_entries)
-    val values = stringArrayResource(R.array.preference_default_tab_values)
-    var selected by remember { mutableStateOf(values[0]) }
-    Column {
-        Text(stringResource(R.string.default_tab), style = MaterialTheme.typography.titleMedium)
-        entries.forEachIndexed { index, title ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                RadioButton(selected = selected == values[index], onClick = {
-                    selected = values[index]
-                    viewModel.saveDefaultTab(values[index])
-                })
-                Text(title)
-            }
-        }
-    }
-}
-
-@Composable
-private fun BottomBarPage(viewModel: OnboardingViewModel, onFinish: () -> Unit) {
-    val entries = stringArrayResource(R.array.preference_bottom_navigation_bar_labels_entries)
-    val values = stringArrayResource(R.array.preference_bottom_navigation_bar_labels_values)
-    var selected by remember { mutableStateOf(values[0]) }
-    Column {
-        Text(stringResource(R.string.bottom_navigation_bar_labels), style = MaterialTheme.typography.titleMedium)
-        entries.forEachIndexed { index, title ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                RadioButton(selected = selected == values[index], onClick = {
-                    selected = values[index]
-                    viewModel.saveBottomBarLabels(values[index])
-                })
-                Text(title)
-            }
-        }
-        Button(onClick = onFinish, modifier = Modifier.padding(top = 24.dp)) {
-            Text(stringResource(R.string.finish))
-        }
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
deleted file mode 100644
index 9df30ef3..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.d4rk.androidtutorials.java.ui.screens.onboarding;
-
-import androidx.lifecycle.ViewModel;
-
-import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
-
-import dagger.hilt.android.lifecycle.HiltViewModel;
-import javax.inject.Inject;
-
-@HiltViewModel
-public class OnboardingViewModel extends ViewModel {
-
-    private final OnboardingRepository repository;
-
-    @Inject
-    public OnboardingViewModel(OnboardingRepository repository) {
-        this.repository = repository;
-    }
-
-    public void saveTheme(String value) {
-        repository.setTheme(value);
-    }
-
-    public void saveDefaultTab(String value) {
-        repository.setDefaultTab(value);
-    }
-
-    public void saveBottomBarLabels(String value) {
-        repository.setBottomBarLabels(value);
-    }
-
-    public void completeOnboarding() {
-        repository.setOnboardingComplete();
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java
deleted file mode 100644
index e6c47a84..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/repository/DefaultOnboardingRepository.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.d4rk.androidtutorials.java.ui.screens.onboarding.repository;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.preference.PreferenceManager;
-
-import com.d4rk.androidtutorials.java.R;
-
-public class DefaultOnboardingRepository implements com.d4rk.androidtutorials.java.data.repository.OnboardingRepository {
-
-    private final Context context;
-    private final SharedPreferences prefs;
-
-    public DefaultOnboardingRepository(Context context) {
-        this.context = context.getApplicationContext();
-        this.prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
-    }
-
-    @Override
-    public boolean isOnboardingComplete() {
-        return prefs.getBoolean(context.getString(R.string.key_onboarding_complete), false);
-    }
-
-    @Override
-    public void setOnboardingComplete() {
-        prefs.edit().putBoolean(context.getString(R.string.key_onboarding_complete), true).apply();
-        context.getSharedPreferences("startup", Context.MODE_PRIVATE)
-                .edit().putBoolean("value", false).apply();
-    }
-
-    @Override
-    public void setTheme(String value) {
-        prefs.edit().putString(context.getString(R.string.key_theme), value).apply();
-        String[] values = context.getResources().getStringArray(R.array.preference_theme_values);
-        int mode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
-        if (value.equals(values[1])) {
-            mode = AppCompatDelegate.MODE_NIGHT_NO;
-        } else if (value.equals(values[2])) {
-            mode = AppCompatDelegate.MODE_NIGHT_YES;
-        } else if (value.equals(values[3])) {
-            mode = AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY;
-        }
-        AppCompatDelegate.setDefaultNightMode(mode);
-    }
-
-    @Override
-    public void setDefaultTab(String value) {
-        prefs.edit().putString(context.getString(R.string.key_default_tab), value).apply();
-    }
-
-    @Override
-    public void setBottomBarLabels(String value) {
-        prefs.edit().putString(context.getString(R.string.key_bottom_navigation_bar_labels), value).apply();
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
index 9b4c9686..5dd5b96a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
@@ -9,33 +9,20 @@
 
 import com.d4rk.androidtutorials.java.databinding.ActivityStartupBinding;
 import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
-import com.d4rk.androidtutorials.java.ui.screens.onboarding.OnboardingActivity;
-import com.d4rk.androidtutorials.java.data.repository.OnboardingRepository;
 import com.google.android.ump.ConsentRequestParameters;
 import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
 
-import javax.inject.Inject;
-
 import dagger.hilt.android.AndroidEntryPoint;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 
 @AndroidEntryPoint
 public class StartupActivity extends AppCompatActivity {
 
-    @Inject
-    OnboardingRepository onboardingRepository;
-
     private StartupViewModel viewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (onboardingRepository.isOnboardingComplete()) {
-            startActivity(new Intent(this, MainActivity.class));
-            finish();
-            return;
-        }
-
         ActivityStartupBinding binding = ActivityStartupBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
@@ -54,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         );
 
         binding.floatingButtonAgree.setOnClickListener(v -> {
-            startActivity(new Intent(this, OnboardingActivity.class));
+            startActivity(new Intent(this, MainActivity.class));
             finish();
         });
     }
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 2ad5e922..279a1f5b 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -20,5 +20,4 @@
     <string name="key_consent_ad_storage" translatable="false">consent_ad_storage</string>
     <string name="key_consent_ad_user_data" translatable="false">consent_ad_user_data</string>
     <string name="key_consent_ad_personalization" translatable="false">consent_ad_personalization</string>
-    <string name="key_onboarding_complete" translatable="false">onboarding_complete</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd434b74..ec36d720 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -472,7 +472,4 @@
     <string name="fetch_data">Fetch data</string>
     <string name="summary_preference_android_studio_retrofit">Make HTTP requests with Retrofit.</string>
     <string name="summary_retrofit">Retrofit is a type-safe HTTP client for Android and Java. This example fetches data from a web service.</string>
-    <string name="next">Next</string>
-    <string name="back">Back</string>
-    <string name="finish">Finish</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 57c04684..9d0bab0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,5 +5,4 @@ plugins {
     //noinspection NewerVersionAvailable
     id 'com.mikepenz.aboutlibraries.plugin' version '11.3.0' apply true
     id 'com.google.dagger.hilt.android' version '2.57.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 74893ff2..aec49bd7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,6 @@ coreTesting = "2.2.0"
 firebaseBom = "34.2.0"
 gridlayout = "1.1.0"
 junit = "4.13.2"
-kotlinxSerializationJson = "1.9.0"
 library = "1.3.0"
 libraryVersion = "1.4.0"
 lifecycle = "2.9.3"
@@ -31,8 +30,6 @@ hilt = "2.57.1"
 room = "2.8.0"
 glide = "5.0.4"
 retrofit = "3.0.0"
-composeBom = "2024.02.01"
-activityCompose = "1.9.2"
 
 [libraries]
 aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
@@ -58,7 +55,6 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 core = { module = "io.noties.markwon:core", version.ref = "core" }
 google-firebase-perf = { module = "com.google.firebase:firebase-perf" }
 junit = { module = "junit:junit", version.ref = "junit" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 library = { module = "me.zhanghai.android.fastscroll:library", version.ref = "library" }
 lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -77,8 +73,3 @@ glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
-compose-ui = { module = "androidx.compose.ui:ui" }
-compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-foundation = { module = "androidx.compose.foundation:foundation" }
-compose-activity = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }

From e4a1c9084266c03398ac2e4e9460f54cde883c72 Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 11 Sep 2025 22:07:23 +0300
Subject: [PATCH 3/8] Add XML-based onboarding flow

---
 AGENTS.md                                     |  2 +-
 app/src/main/AndroidManifest.xml              | 16 +++--
 .../java/ui/screens/main/MainActivity.java    | 41 +++--------
 .../onboarding/BottomLabelsFragment.java      | 52 ++++++++++++++
 .../ui/screens/onboarding/DataFragment.java   | 43 +++++++++++
 .../onboarding/OnboardingActivity.java        | 72 +++++++++++++++++++
 .../onboarding/OnboardingViewModel.java       | 44 ++++++++++++
 .../screens/onboarding/StartPageFragment.java | 52 ++++++++++++++
 .../ui/screens/onboarding/ThemeFragment.java  | 54 ++++++++++++++
 .../ui/screens/startup/StartupActivity.java   |  4 +-
 .../main/res/layout/activity_onboarding.xml   | 16 +++++
 .../fragment_onboarding_bottom_labels.xml     | 49 +++++++++++++
 .../res/layout/fragment_onboarding_data.xml   | 23 ++++++
 .../layout/fragment_onboarding_start_page.xml | 49 +++++++++++++
 .../res/layout/fragment_onboarding_theme.xml  | 55 ++++++++++++++
 app/src/main/res/values/keys.xml              |  1 +
 app/src/main/res/values/strings.xml           |  4 ++
 17 files changed, 536 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
 create mode 100644 app/src/main/res/layout/activity_onboarding.xml
 create mode 100644 app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
 create mode 100644 app/src/main/res/layout/fragment_onboarding_data.xml
 create mode 100644 app/src/main/res/layout/fragment_onboarding_start_page.xml
 create mode 100644 app/src/main/res/layout/fragment_onboarding_theme.xml

diff --git a/AGENTS.md b/AGENTS.md
index 3811394e..c90d9170 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,9 +4,9 @@ You are an experienced Android app developer.
 
 ## Coding guidelines
 - This project uses **Java**. Prefer Java for new code and avoid Kotlin.
+- **No Compose or Kotlin. Build UI using XML layouts only.**
 - Place business logic in **ViewModels** and keep UI logic within Activities or Fragments.
 - Follow a layered architecture with unidirectional data flow.
-- Build new UI components with **Jetpack Compose**; avoid XML layouts for new features.
 - Use Android Jetpack Navigation for screen navigation.
 
 ## Project structure
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e49ded4d..e0cfd083 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,22 +40,26 @@
         <activity
             android:name=".ui.screens.startup.StartupActivity"
             android:exported="true"
-            android:theme="@style/SplashScreenTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:theme="@style/SplashScreenTheme" />
 
         <activity
             android:name=".ui.screens.main.MainActivity"
             android:exported="true"
             android:theme="@style/SplashScreenTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
 
+        <activity
+            android:name=".ui.screens.onboarding.OnboardingActivity"
+            android:exported="false"
+            android:theme="@style/AppTheme" />
+
         <activity
             android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
index 0c301794..a2435053 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -36,8 +37,7 @@
 import com.d4rk.androidtutorials.java.databinding.ActivityMainBinding;
 import com.d4rk.androidtutorials.java.notifications.managers.AppUpdateNotificationsManager;
 import com.d4rk.androidtutorials.java.ui.components.navigation.BottomSheetMenuFragment;
-import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
-import com.d4rk.androidtutorials.java.ui.screens.startup.dialogs.ConsentDialogFragment;
+import com.d4rk.androidtutorials.java.ui.screens.startup.StartupActivity;
 import com.d4rk.androidtutorials.java.ui.screens.support.SupportActivity;
 import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
@@ -53,9 +53,7 @@
 import com.google.android.play.core.install.model.AppUpdateType;
 import com.google.android.play.core.install.model.InstallStatus;
 import com.google.android.play.core.install.model.UpdateAvailability;
-import com.google.android.ump.ConsentInformation;
-import com.google.android.ump.ConsentRequestParameters;
-import com.google.android.ump.UserMessagingPlatform;
+import androidx.preference.PreferenceManager;
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
@@ -72,8 +70,6 @@ public class MainActivity extends AppCompatActivity {
             );
     private ActivityMainBinding mBinding;
     private MainViewModel mainViewModel;
-    private StartupViewModel startupViewModel;
-    private ConsentInformation consentInformation;
     private NavController navController;
     private final SparseIntArray navOrder = new SparseIntArray();
     private int currentNavIndex;
@@ -106,25 +102,16 @@ public void onResume(@NonNull LifecycleOwner owner) {
     protected void onCreate(Bundle savedInstanceState) {
         SplashScreen.installSplashScreen(this);
         super.onCreate(savedInstanceState);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (!prefs.getBoolean(getString(R.string.key_onboarding_complete), false)) {
+            startActivity(new Intent(this, StartupActivity.class));
+            finish();
+            return;
+        }
         mBinding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(mBinding.getRoot());
 
         mainViewModel = new ViewModelProvider(this).get(MainViewModel.class);
-        startupViewModel = new ViewModelProvider(this).get(StartupViewModel.class);
-        consentInformation = UserMessagingPlatform.getConsentInformation(this);
-        ConsentRequestParameters params = new ConsentRequestParameters.Builder()
-                .setTagForUnderAgeOfConsent(false)
-                .build();
-        startupViewModel.requestConsentInfoUpdate(
-                this,
-                params,
-                () -> {
-                    if (consentInformation.isConsentFormAvailable()) {
-                        startupViewModel.loadConsentForm(this, null);
-                    }
-                },
-                null
-        );
 
         setupActionBar();
         observeViewModel();
@@ -135,10 +122,6 @@ protected void onCreate(Bundle savedInstanceState) {
         String[] bottomNavBarLabelsValues = getResources().getStringArray(R.array.preference_bottom_navigation_bar_labels_values);
         String[] defaultTabValues = getResources().getStringArray(R.array.preference_default_tab_values);
         mainViewModel.applySettings(themeValues, bottomNavBarLabelsValues, defaultTabValues);
-        if (mainViewModel.shouldShowStartupScreen()) {
-            mainViewModel.markStartupScreenShown();
-            showConsentDialog();
-        }
 
         launcherShortcuts();
 
@@ -302,12 +285,6 @@ private void setupUpdateNotifications() {
         appUpdateNotificationsManager = new AppUpdateNotificationsManager(this);
     }
 
-    private void showConsentDialog() {
-        ConsentDialogFragment dialog = new ConsentDialogFragment();
-        dialog.setConsentListener((analytics, adStorage, adUserData, adPersonalization) ->
-                ConsentUtils.updateFirebaseConsent(this, analytics, adStorage, adUserData, adPersonalization));
-        dialog.show(getSupportFragmentManager(), "consent_dialog");
-    }
 
     @Override
     public boolean onCreateOptionsMenu(android.view.Menu menu) {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
new file mode 100644
index 00000000..e3e054bd
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
@@ -0,0 +1,52 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.d4rk.androidtutorials.java.R;
+import com.d4rk.androidtutorials.java.databinding.FragmentOnboardingBottomLabelsBinding;
+
+public class BottomLabelsFragment extends Fragment {
+
+    private FragmentOnboardingBottomLabelsBinding binding;
+    private OnboardingViewModel viewModel;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentOnboardingBottomLabelsBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
+        binding.buttonNext.setOnClickListener(v -> {
+            int checkedId = binding.labelsGroup.getCheckedRadioButtonId();
+            String[] values = getResources().getStringArray(R.array.preference_bottom_navigation_bar_labels_values);
+            String value = values[0];
+            if (checkedId == R.id.radio_selected) {
+                value = values[1];
+            } else if (checkedId == R.id.radio_unlabeled) {
+                value = values[2];
+            }
+            viewModel.setBottomNavLabels(value);
+            ((OnboardingActivity) requireActivity()).nextPage();
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
new file mode 100644
index 00000000..c8e1f486
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
@@ -0,0 +1,43 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.d4rk.androidtutorials.java.databinding.FragmentOnboardingDataBinding;
+
+public class DataFragment extends Fragment {
+
+    private FragmentOnboardingDataBinding binding;
+    private OnboardingViewModel viewModel;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentOnboardingDataBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
+        binding.buttonFinish.setOnClickListener(v -> {
+            viewModel.markOnboardingComplete();
+            ((OnboardingActivity) requireActivity()).finishOnboarding();
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
new file mode 100644
index 00000000..d50e50ee
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
@@ -0,0 +1,72 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import com.d4rk.androidtutorials.java.databinding.ActivityOnboardingBinding;
+import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
+public class OnboardingActivity extends AppCompatActivity {
+
+    private ActivityOnboardingBinding binding;
+    private OnboardingPagerAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityOnboardingBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        adapter = new OnboardingPagerAdapter(this);
+        binding.viewPager.setAdapter(adapter);
+        binding.viewPager.setUserInputEnabled(false);
+    }
+
+    void nextPage() {
+        int current = binding.viewPager.getCurrentItem();
+        if (current < adapter.getItemCount() - 1) {
+            binding.viewPager.setCurrentItem(current + 1);
+        }
+    }
+
+    void finishOnboarding() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    private static class OnboardingPagerAdapter extends FragmentStateAdapter {
+
+        OnboardingPagerAdapter(@NonNull AppCompatActivity activity) {
+            super(activity);
+        }
+
+        @NonNull
+        @Override
+        public Fragment createFragment(int position) {
+            switch (position) {
+                case 0:
+                    return new ThemeFragment();
+                case 1:
+                    return new StartPageFragment();
+                case 2:
+                    return new BottomLabelsFragment();
+                default:
+                    return new DataFragment();
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            return 4;
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
new file mode 100644
index 00000000..78e3a1aa
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
@@ -0,0 +1,44 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.lifecycle.ViewModel;
+import androidx.preference.PreferenceManager;
+
+import com.d4rk.androidtutorials.java.R;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.lifecycle.HiltViewModel;
+import dagger.hilt.android.qualifiers.ApplicationContext;
+
+@HiltViewModel
+public class OnboardingViewModel extends ViewModel {
+
+    private final Context context;
+    private final SharedPreferences prefs;
+
+    @Inject
+    public OnboardingViewModel(@ApplicationContext Context context) {
+        this.context = context;
+        this.prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    public void setTheme(String value) {
+        prefs.edit().putString(context.getString(R.string.key_theme), value).apply();
+    }
+
+    public void setDefaultTab(String value) {
+        prefs.edit().putString(context.getString(R.string.key_default_tab), value).apply();
+    }
+
+    public void setBottomNavLabels(String value) {
+        prefs.edit().putString(context.getString(R.string.key_bottom_navigation_bar_labels), value).apply();
+    }
+
+    public void markOnboardingComplete() {
+        prefs.edit().putBoolean(context.getString(R.string.key_onboarding_complete), true).apply();
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
new file mode 100644
index 00000000..f010f1a3
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
@@ -0,0 +1,52 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.d4rk.androidtutorials.java.R;
+import com.d4rk.androidtutorials.java.databinding.FragmentOnboardingStartPageBinding;
+
+public class StartPageFragment extends Fragment {
+
+    private FragmentOnboardingStartPageBinding binding;
+    private OnboardingViewModel viewModel;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentOnboardingStartPageBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
+        binding.buttonNext.setOnClickListener(v -> {
+            int checkedId = binding.startPageGroup.getCheckedRadioButtonId();
+            String[] values = getResources().getStringArray(R.array.preference_default_tab_values);
+            String value = values[0];
+            if (checkedId == R.id.radio_android_studio) {
+                value = values[1];
+            } else if (checkedId == R.id.radio_about) {
+                value = values[2];
+            }
+            viewModel.setDefaultTab(value);
+            ((OnboardingActivity) requireActivity()).nextPage();
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
new file mode 100644
index 00000000..65a45f2b
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
@@ -0,0 +1,54 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.d4rk.androidtutorials.java.R;
+import com.d4rk.androidtutorials.java.databinding.FragmentOnboardingThemeBinding;
+
+public class ThemeFragment extends Fragment {
+
+    private FragmentOnboardingThemeBinding binding;
+    private OnboardingViewModel viewModel;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentOnboardingThemeBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
+        binding.buttonNext.setOnClickListener(v -> {
+            int checkedId = binding.themeGroup.getCheckedRadioButtonId();
+            String[] values = getResources().getStringArray(R.array.preference_theme_values);
+            String value = values[0];
+            if (checkedId == R.id.radio_light) {
+                value = values[1];
+            } else if (checkedId == R.id.radio_dark) {
+                value = values[2];
+            } else if (checkedId == R.id.radio_auto_battery) {
+                value = values[3];
+            }
+            viewModel.setTheme(value);
+            ((OnboardingActivity) requireActivity()).nextPage();
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
+
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
index 5dd5b96a..1d4143eb 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
@@ -8,7 +8,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import com.d4rk.androidtutorials.java.databinding.ActivityStartupBinding;
-import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
+import com.d4rk.androidtutorials.java.ui.screens.onboarding.OnboardingActivity;
 import com.google.android.ump.ConsentRequestParameters;
 import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
 
@@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         );
 
         binding.floatingButtonAgree.setOnClickListener(v -> {
-            startActivity(new Intent(this, MainActivity.class));
+            startActivity(new Intent(this, OnboardingActivity.class));
             finish();
         });
     }
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
new file mode 100644
index 00000000..34750d77
--- /dev/null
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/viewPager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
new file mode 100644
index 00000000..caab66c1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bottom_navigation_labels"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+
+        <RadioGroup
+            android:id="@+id/labels_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RadioButton
+                android:id="@+id/radio_labeled"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/labeled" />
+
+            <RadioButton
+                android:id="@+id/radio_selected"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/selected" />
+
+            <RadioButton
+                android:id="@+id/radio_unlabeled"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/unlabeled" />
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_data.xml b/app/src/main/res/layout/fragment_onboarding_data.xml
new file mode 100644
index 00000000..7b25e824
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_data.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/data_dialog_message" />
+
+        <Button
+            android:id="@+id/button_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/finish" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_start_page.xml b/app/src/main/res/layout/fragment_onboarding_start_page.xml
new file mode 100644
index 00000000..d8cf0fbe
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_start_page.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/default_tab"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+
+        <RadioGroup
+            android:id="@+id/start_page_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RadioButton
+                android:id="@+id/radio_home"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/home" />
+
+            <RadioButton
+                android:id="@+id/radio_android_studio"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/android_studio" />
+
+            <RadioButton
+                android:id="@+id/radio_about"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/about" />
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_theme.xml b/app/src/main/res/layout/fragment_onboarding_theme.xml
new file mode 100644
index 00000000..1d4a960e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_theme.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/theme"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+
+        <RadioGroup
+            android:id="@+id/theme_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RadioButton
+                android:id="@+id/radio_system"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/follow_system" />
+
+            <RadioButton
+                android:id="@+id/radio_light"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/light_mode" />
+
+            <RadioButton
+                android:id="@+id/radio_dark"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dark_mode" />
+
+            <RadioButton
+                android:id="@+id/radio_auto_battery"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/auto_battery_mode" />
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 279a1f5b..2ad5e922 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -20,4 +20,5 @@
     <string name="key_consent_ad_storage" translatable="false">consent_ad_storage</string>
     <string name="key_consent_ad_user_data" translatable="false">consent_ad_user_data</string>
     <string name="key_consent_ad_personalization" translatable="false">consent_ad_personalization</string>
+    <string name="key_onboarding_complete" translatable="false">onboarding_complete</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec36d720..1daeca7e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -338,6 +338,10 @@
     <string name="summary_preference_permissions_access_network_state">Allows the app to check network connectivity and retrieve information about Wi-Fi, including enabled status and connected Wi-Fi device names.</string>
     <string name="summary_preference_permissions_billing">Allows the app to use the Google Play Billing Library to handle in-app purchases and donations.</string>
     <string name="summary_preference_permissions_check_license">Allows the app to verify its compliance with the license agreement and enforce licensing terms to protect intellectual property.</string>
+    <string name="next">Next</string>
+    <string name="finish">Finish</string>
+    <string name="bottom_navigation_labels">Bottom navigation labels</string>
+    <string name="data_dialog_message">We collect data to improve your experience.</string>
     <string name="summary_preference_permissions_access_notification_policy">Allows the app to access and modify the device\'s notification policy, controlling how and when notifications are displayed to the user and providing custom notification management features.</string>
     <string name="summary_preference_permissions_foreground_service">Allows the app to create and use services that run in the foreground, giving them priority over other background processes and improving performance and reliability.</string>
     <string name="summary_preference_settings_language">Set application language.</string>

From 851d6eba8ea74027c269093b4b21246c44682cd9 Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 11 Sep 2025 22:29:18 +0300
Subject: [PATCH 4/8] Fix startup crash and remove Kotlin references

---
 CHANGELOG.md                                  |  2 +-
 README.md                                     |  4 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../repository/DefaultMainRepository.java     | 34 ----------
 .../java/data/repository/MainRepository.java  |  3 -
 .../androidtutorials/java/di/AppModule.java   | 12 ----
 .../main/BuildShortcutIntentUseCase.java      | 17 -----
 .../domain/main/IsAppInstalledUseCase.java    | 16 -----
 .../java/ui/screens/main/MainActivity.java    | 16 -----
 .../java/ui/screens/main/MainViewModel.java   | 23 -------
 .../ic_shortcut_kotlin_edition.xml            |  5 --
 app/src/main/res/values-ar-rEG/strings.xml    |  6 --
 app/src/main/res/values-bg-rBG/strings.xml    |  6 --
 app/src/main/res/values-bn-rBD/strings.xml    |  1 -
 app/src/main/res/values-de-rDE/strings.xml    |  6 --
 app/src/main/res/values-es-rGQ/strings.xml    |  7 --
 app/src/main/res/values-es-rMX/strings.xml    |  7 --
 app/src/main/res/values-fil-rPH/strings.xml   |  7 --
 app/src/main/res/values-fr-rFR/strings.xml    |  7 --
 app/src/main/res/values-hi-rIN/strings.xml    |  3 -
 app/src/main/res/values-hu-rHU/strings.xml    |  7 --
 app/src/main/res/values-in-rID/strings.xml    |  6 --
 app/src/main/res/values-it-rIT/strings.xml    |  7 --
 app/src/main/res/values-ja-rJP/strings.xml    |  7 --
 app/src/main/res/values-ko-rKR/strings.xml    |  7 --
 app/src/main/res/values-pl-rPL/strings.xml    |  7 --
 app/src/main/res/values-pt-rBR/strings.xml    |  7 --
 app/src/main/res/values-ro-rRO/strings.xml    |  5 --
 app/src/main/res/values-ru-rRU/strings.xml    |  5 --
 app/src/main/res/values-sv-rSE/strings.xml    |  7 --
 app/src/main/res/values-th-rTH/strings.xml    |  7 --
 app/src/main/res/values-tr-rTR/strings.xml    |  7 --
 app/src/main/res/values-uk-rUA/strings.xml    |  7 --
 app/src/main/res/values-ur-rPK/strings.xml    |  3 -
 app/src/main/res/values-vi-rVN/strings.xml    |  7 --
 app/src/main/res/values-zh-rTW/strings.xml    |  7 --
 app/src/main/res/values/strings.xml           | 14 ++--
 .../res/values/untranslatable_strings.xml     |  2 -
 docs/android-architecture-recommendations.md  | 64 +++++--------------
 39 files changed, 27 insertions(+), 340 deletions(-)
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/domain/main/BuildShortcutIntentUseCase.java
 delete mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/domain/main/IsAppInstalledUseCase.java
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_shortcut_kotlin_edition.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1293594f..b1fd3098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,7 +77,7 @@
 - Added functionality to "Music" chip.
 - Added app updater dialog and ability to update in background.
 - Added comments to the Java code samples for better understanding.
-- Refactored app's codebase from Kotlin to Java to match the name and style of the app.
+- Refactored app's codebase to Java to match the name and style of the app.
 - Fixed all crash reports from Google Play Console and Google Firebase.
 - Made various improvements to languages and fixed some typos.
 - Made under-the-hood improvements for a better overall app experience.
diff --git a/README.md b/README.md
index 63f7a7fa..252e87f9 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,12 @@
 
 **Learn how to make simple apps in Android Studio.**
 
-Android Studio Tutorials: Java Edition is the sister project of [Android Studio Tutorials: Kotlin Edition](https://github.com/D4rK7355608/com.d4rk.androidtutorials). This guide provides practical examples and complete source code to help you build your first Android application using Android Studio and Java.
+Android Studio Tutorials: Java Edition provides practical examples and complete source code to help you build your first Android application using Android Studio with Java and XML.
 
 Our app is designed to be easy to use and lightweight. Plus, it's free and open‑source!
 
+> **Note:** This project is built solely with Java and XML. Kotlin and Jetpack Compose are not used.
+
 ## Features
 
 - Java and XML code examples
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e0cfd083..5fc1b9b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
         <activity
             android:name=".ui.screens.startup.StartupActivity"
             android:exported="true"
-            android:theme="@style/SplashScreenTheme" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".ui.screens.main.MainActivity"
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
index 4ed27da1..839bf23c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
@@ -1,10 +1,7 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.os.LocaleListCompat;
@@ -47,22 +44,6 @@ private static int getNewNightMode(String[] darkModeValues, int currentNightMode
         return newNightMode;
     }
 
-    /**
-     * Check if a given package name is installed.
-     *
-     * @param packageName The package to check.
-     * @return True if installed, false otherwise.
-     */
-    public boolean isAppInstalled(String packageName) {
-        PackageManager packageManager = context.getPackageManager();
-        try {
-            packageManager.getPackageInfo(packageName, 0);
-            return true;
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
     /**
      * Retrieves the user's theme preference and applies it.
      * This method returns true if a change was applied (so the Activity can decide if it needs to recreate).
@@ -134,19 +115,4 @@ public AppUpdateManager getAppUpdateManager() {
         return appUpdateManager;
     }
 
-    /**
-     * Creates an intent to open your other app or fallback to Google Play if not installed.
-     */
-    public Intent buildShortcutIntent(boolean isInstalled) {
-        if (isInstalled) {
-            return new Intent(Intent.ACTION_MAIN)  // <--- set an ACTION
-                    .addCategory(Intent.CATEGORY_LAUNCHER) // optional for typical launcher scenario
-                    .setClassName("com.d4rk.androidtutorials", "com.d4rk.androidtutorials.MainActivity")
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        } else {
-            return new Intent(Intent.ACTION_VIEW)
-                    .setData(Uri.parse("https://play.google.com/store/apps/details?id=com.d4rk.androidtutorials"))
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
index b422f4e4..5e637087 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
@@ -1,10 +1,8 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
-import android.content.Intent;
 import com.google.android.play.core.appupdate.AppUpdateManager;
 
 public interface MainRepository {
-    boolean isAppInstalled(String packageName);
     boolean applyThemeSettings(String[] darkModeValues);
     String getBottomNavLabelVisibility();
     String getDefaultTabPreference();
@@ -12,5 +10,4 @@ public interface MainRepository {
     void markStartupScreenShown();
     void applyLanguageSettings();
     AppUpdateManager getAppUpdateManager();
-    Intent buildShortcutIntent(boolean isInstalled);
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
index b39200fb..d7e2f529 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
@@ -29,11 +29,9 @@
 import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ApplyLanguageSettingsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ApplyThemeSettingsUseCase;
-import com.d4rk.androidtutorials.java.domain.main.BuildShortcutIntentUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetAppUpdateManagerUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetBottomNavLabelVisibilityUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetDefaultTabPreferenceUseCase;
-import com.d4rk.androidtutorials.java.domain.main.IsAppInstalledUseCase;
 import com.d4rk.androidtutorials.java.domain.main.MarkStartupScreenShownUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
 import com.d4rk.androidtutorials.java.domain.quiz.LoadQuizQuestionsUseCase;
@@ -171,16 +169,6 @@ public MarkStartupScreenShownUseCase provideMarkStartupScreenShownUseCase(MainRe
         return new MarkStartupScreenShownUseCase(repository);
     }
 
-    @Provides
-    public IsAppInstalledUseCase provideIsAppInstalledUseCase(MainRepository repository) {
-        return new IsAppInstalledUseCase(repository);
-    }
-
-    @Provides
-    public BuildShortcutIntentUseCase provideBuildShortcutIntentUseCase(MainRepository repository) {
-        return new BuildShortcutIntentUseCase(repository);
-    }
-
     @Provides
     public GetAppUpdateManagerUseCase provideGetAppUpdateManagerUseCase(MainRepository repository) {
         return new GetAppUpdateManagerUseCase(repository);
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/BuildShortcutIntentUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/BuildShortcutIntentUseCase.java
deleted file mode 100644
index 9296c1c3..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/BuildShortcutIntentUseCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.d4rk.androidtutorials.java.domain.main;
-
-import android.content.Intent;
-import com.d4rk.androidtutorials.java.data.repository.MainRepository;
-
-/** Creates an intent for the app shortcut. */
-public class BuildShortcutIntentUseCase {
-    private final MainRepository repository;
-
-    public BuildShortcutIntentUseCase(MainRepository repository) {
-        this.repository = repository;
-    }
-
-    public Intent invoke(boolean isInstalled) {
-        return repository.buildShortcutIntent(isInstalled);
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/IsAppInstalledUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/IsAppInstalledUseCase.java
deleted file mode 100644
index 5e45467c..00000000
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/IsAppInstalledUseCase.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.d4rk.androidtutorials.java.domain.main;
-
-import com.d4rk.androidtutorials.java.data.repository.MainRepository;
-
-/** Checks if an app is installed by package name. */
-public class IsAppInstalledUseCase {
-    private final MainRepository repository;
-
-    public IsAppInstalledUseCase(MainRepository repository) {
-        this.repository = repository;
-    }
-
-    public boolean invoke(String packageName) {
-        return repository.isAppInstalled(packageName);
-    }
-}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
index a2435053..10b1bc08 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
@@ -18,9 +18,6 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.drawable.IconCompat;
 import androidx.core.splashscreen.SplashScreen;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
@@ -123,7 +120,6 @@ protected void onCreate(Bundle savedInstanceState) {
         String[] defaultTabValues = getResources().getStringArray(R.array.preference_default_tab_values);
         mainViewModel.applySettings(themeValues, bottomNavBarLabelsValues, defaultTabValues);
 
-        launcherShortcuts();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 1);
@@ -162,18 +158,6 @@ private void setupActionBar() {
         }
     }
 
-    private void launcherShortcuts() {
-        boolean isInstalled = mainViewModel.isAndroidTutorialsInstalled();
-
-        ShortcutInfoCompat shortcut = new ShortcutInfoCompat.Builder(this, "shortcut_id")
-                .setShortLabel(getString(R.string.shortcut_kotlin_edition_short))
-                .setLongLabel(getString(R.string.shortcut_kotlin_edition_long))
-                .setIcon(IconCompat.createWithResource(this, R.mipmap.ic_shortcut_kotlin_edition))
-                .setIntent(mainViewModel.getShortcutIntent(isInstalled))
-                .build();
-
-        ShortcutManagerCompat.pushDynamicShortcut(this, shortcut);
-    }
 
     private boolean shouldUseNavigationRail() {
         return getResources().getConfiguration().smallestScreenWidthDp >= 600;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
index 729a13d0..0c71f217 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
@@ -1,6 +1,5 @@
 package com.d4rk.androidtutorials.java.ui.screens.main;
 
-import android.content.Intent;
 
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.LiveData;
@@ -13,8 +12,6 @@
 import com.d4rk.androidtutorials.java.domain.main.ApplyLanguageSettingsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
 import com.d4rk.androidtutorials.java.domain.main.MarkStartupScreenShownUseCase;
-import com.d4rk.androidtutorials.java.domain.main.IsAppInstalledUseCase;
-import com.d4rk.androidtutorials.java.domain.main.BuildShortcutIntentUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetAppUpdateManagerUseCase;
 import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.play.core.appupdate.AppUpdateManager;
@@ -35,8 +32,6 @@ public class MainViewModel extends ViewModel {
     private final ApplyLanguageSettingsUseCase applyLanguageSettingsUseCase;
     private final ShouldShowStartupScreenUseCase shouldShowStartupScreenUseCase;
     private final MarkStartupScreenShownUseCase markStartupScreenShownUseCase;
-    private final IsAppInstalledUseCase isAppInstalledUseCase;
-    private final BuildShortcutIntentUseCase buildShortcutIntentUseCase;
     private final GetAppUpdateManagerUseCase getAppUpdateManagerUseCase;
     private final MutableLiveData<MainUiState> uiState = new MutableLiveData<>();
     private final MutableLiveData<Boolean> isLoading = new MutableLiveData<>(false);
@@ -48,8 +43,6 @@ public MainViewModel(ApplyThemeSettingsUseCase applyThemeSettingsUseCase,
                          ApplyLanguageSettingsUseCase applyLanguageSettingsUseCase,
                          ShouldShowStartupScreenUseCase shouldShowStartupScreenUseCase,
                          MarkStartupScreenShownUseCase markStartupScreenShownUseCase,
-                         IsAppInstalledUseCase isAppInstalledUseCase,
-                         BuildShortcutIntentUseCase buildShortcutIntentUseCase,
                          GetAppUpdateManagerUseCase getAppUpdateManagerUseCase) {
         this.applyThemeSettingsUseCase = applyThemeSettingsUseCase;
         this.getBottomNavLabelVisibilityUseCase = getBottomNavLabelVisibilityUseCase;
@@ -57,8 +50,6 @@ public MainViewModel(ApplyThemeSettingsUseCase applyThemeSettingsUseCase,
         this.applyLanguageSettingsUseCase = applyLanguageSettingsUseCase;
         this.shouldShowStartupScreenUseCase = shouldShowStartupScreenUseCase;
         this.markStartupScreenShownUseCase = markStartupScreenShownUseCase;
-        this.isAppInstalledUseCase = isAppInstalledUseCase;
-        this.buildShortcutIntentUseCase = buildShortcutIntentUseCase;
         this.getAppUpdateManagerUseCase = getAppUpdateManagerUseCase;
     }
 
@@ -118,20 +109,6 @@ public void markStartupScreenShown() {
         markStartupScreenShownUseCase.invoke();
     }
 
-    /**
-     * Check if the “Android Tutorials” app is installed or not.
-     */
-    public boolean isAndroidTutorialsInstalled() {
-        return isAppInstalledUseCase.invoke("com.d4rk.androidtutorials.java");
-    }
-
-    /**
-     * Build the intent for the shortcut (opens app if installed, or fallback to the Play Store).
-     */
-    public Intent getShortcutIntent(boolean isInstalled) {
-        return buildShortcutIntentUseCase.invoke(isInstalled);
-    }
-
     /**
      * Expose the consolidated UI state so MainActivity can observe it.
      */
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_kotlin_edition.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_kotlin_edition.xml
deleted file mode 100644
index 3aa8bc94..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_kotlin_edition.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorIconShortcutBackground" />
-    <foreground android:drawable="@drawable/ic_shortcut_foreground_monochrome" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index a495509d..e927e0ad 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">موافق</string>
     <string name="home">الرئيسية</string>
     <string name="announcement_title">تطبيق جديد وصل.</string>
-    <string name="announcement_subtitle">شوف أحدث تطبيق لشروحات أندرويد ستوديو. اتعلم Jetpack Compose، و Material 3، وغيرهم.</string>
     <string name="profile_picture_desc">صورة ملف تعريف المطور</string>
     <string name="main_card_title">اكتشف شروحات أندرويد ستوديو</string>
-    <string name="main_card_subtitle">بإصدارات Kotlin و Java</string>
-    <string name="main_card_description">تم تحديث إصدار Kotlin بدروس ديناميكية ومساعد ذكاء اصطناعي والمزيد. جرب مستقبل تطوير تطبيقات أندرويد.</string>
     <string name="get_on_google_play">نزّله من على Google Play</string>
     <string name="learn_more">اعرف المزيد</string>
     <string name="play_store">متجر Play</string>
@@ -371,7 +368,6 @@
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">اتعلم كيفية استخدام أشرطة التقدم في أندرويد مع هذا الدرس التفاعلي. يتضمن هذا الدرس قسمين: واحد لشريط تقدم أفقي وآخر لشريط تقدم دائري. في كل قسم، يمكنك رؤية كيفية تحديث شريط التقدم مع تقدم عملية التنزيل. يمكنك أيضًا عرض كود الدرس عن طريق النقر على زر الإجراء العائم في أسفل الشاشة.</string>
     <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">أندرويد هو نظام تشغيل للهواتف المحمولة طورته جوجل. تم إصداره لأول مرة كنسخة تجريبية في 5 نوفمبر 2007 وتم إطلاق أول نسخة تجارية، أندرويد 1.0، في 23 سبتمبر 2008. يعتمد أندرويد على نسخة معدلة من نواة لينكس وبرامج أخرى مفتوحة المصدر.\n\nأندرويد ستوديو هو بيئة التطوير المتكاملة الرسمية (IDE) لتطوير تطبيقات أندرويد. أعلنت عنه جوجل في مؤتمر I/O في 15 مايو 2013 وتم إصداره للاستخدام العام في 8 ديسمبر 2014. يعتمد أندرويد ستوديو على IntelliJ IDEA، وهو IDE جافا شهير.\n\nكوتلن هي لغة برمجة متعددة المنصات يمكن أن تعمل على آلة جافا الافتراضية (JVM)، وأندرويد، والمتصفح والمنصات الأصلية. تم إنشاؤها بواسطة JetBrains، وهي شركة برمجيات مقرها في براغ. تم الإعلان عن كوتلن لأول مرة في يوليو 2011 وتم إصدارها كمشروع مفتوح المصدر في فبراير 2012.\n\nأعلنت جوجل عن دعمها لكوتلن كلغة رسمية لتطوير تطبيقات أندرويد في مؤتمر I/O في 17 مايو 2017. منذ ذلك الحين، أصبحت كوتلن واحدة من أكثر اللغات شعبية لمطوري أندرويد. وفقًا لبيانات جوجل من أكتوبر 2020، يستخدم أكثر من 70% من أفضل 1000 تطبيق على Google Play لغة كوتلن.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">ساعة التوقيت (Chronometer) هي ودجت متخصص في إطار عمل أندرويد يوفر وظيفة تشبه المؤقت لعرض الوقت المنقضي. يمكن تكوينها للعد التصاعدي أو التنازلي، وتستخدم بشكل شائع في التطبيقات التي تتطلب ضبط الوقت، مثل تطبيقات ساعة الإيقاف أو مؤقت العد التنازلي. فئة Chronometer مشتقة من فئة TextView، مما يعني أنها ترث جميع خصائص وطرق TextView. يسمح هذا للمطورين بتخصيص مظهر Chronometer بسهولة، بما في ذلك حجم نصه ولونه وخطه.</string>
     <string name="snack_this_is_a_snackbar">ده شريط تنبيه سريع.</string>
     <string name="snack_bar_clicked">تم النقر</string>
@@ -421,13 +417,11 @@
     <string name="daily_tip_use_string_resources">استخدم موارد النصوص لكل النصوص لتبسيط الترجمة.</string>
     <string name="daily_tip_optimize_webp">حسّن الصور باستخدام WebP لتقليل حجم APK.</string>
     <string name="daily_tip_enable_proguard">مكّن ProGuard لتقليص وإخفاء كود إصدارات الإنتاج.</string>
-    <string name="daily_tip_prefer_compose">فضل استخدام Compose لواجهات المستخدم الجديدة إذا كنت تستهدف الأجهزة الحديثة.</string>
     <string name="daily_tip_livedata_viewmodel">استفد من LiveData و ViewModel لواجهات مستخدم تفاعلية.</string>
     <string name="daily_tip_workmanager">استخدم WorkManager للمهام الخلفية الموثوقة.</string>
     <string name="daily_tip_github_actions">استخدم GitHub Actions لفحوصات البناء الآلية.</string>
     <string name="daily_tip_emulator_screen_sizes">اختبر تطبيقك على أحجام شاشات مختلفة باستخدام المحاكي.</string>
     <string name="daily_tip_update_dependencies">حافظ على تحديث التبعيات لأحدث الميزات والإصلاحات.</string>
-    <string name="daily_tip_kotlin_coroutines">استفد من Kotlin Coroutines للعمليات غير المتزامنة.</string>
     <string name="daily_tip_hilt">ادمج Hilt لحقن التبعيات.</string>
     <string name="daily_tip_unit_tests">اكتب اختبارات الوحدة باستخدام JUnit و Espresso.</string>
     <string name="daily_tip_mvvm">اتبع بنية MVVM لكود قابل للصيانة.</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 9b4a85f0..bf3ffebb 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -16,11 +16,8 @@
 
     <string name="home">Начало</string>
     <string name="announcement_title">Ново приложение е тук.</string>
-    <string name="announcement_subtitle">Разгледайте най-новото приложение Android Studio Tutorials. Научете Jetpack Compose, Material 3 и още.</string>
     <string name="profile_picture_desc">Снимка на профила на разработчика</string>
     <string name="main_card_title">Открийте уроците за Android Studio</string>
-    <string name="main_card_subtitle">Представяме издания за Kotlin и Java</string>
-    <string name="main_card_description">Изданието за Kotlin е актуализирано с динамични уроци, AI асистент и още. Изживейте бъдещето на разработката за Android.</string>
     <string name="get_on_google_play">Вземете от Google Play</string>
     <string name="learn_more">Научете повече</string>
     <string name="play_store">Play Store</string>
@@ -396,8 +393,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat е клас в помощната библиотека на Android appCompat v7. Той е добавен, за да поддържа методи, които са добавени в по-нови нива на API, на стари (като разделители). Ако сравните методите в LinearLayout и LinearLayoutCompat, можете да видите, че Compat оформлението има всички методи на LinearLayout без никакво ограничение на нивото на API. Например, методът setShowDividers е въведен на API ниво 11. Така че, в този случай, setShowDividers (и неговите параметри) трябва да се извиква чрез LinearLayoutCompat вместо LinearLayout, ако разработвате за платформа с API ниво под 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Научете как да използвате ленти за напредък в Android с този интерактивен урок. Този урок включва два раздела: един за хоризонтална лента за напредък и един за кръгова лента за напредък. Във всеки раздел можете да видите как лентата за напредък се актуализира с напредването на изтеглянето. Можете също да видите кода за урока, като кликнете върху плаващия бутон за действие в долната част на екрана.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android е мобилна операционна система, разработена от Google. Първоначално е пусната като бета версия на 5 ноември 2007 г., а първата комерсиална версия, Android 1.0, е стартирана на 23 септември 2008 г. Android е базиран на модифицирана версия на ядрото на Linux и друг софтуер с отворен код.\n\nAndroid Studio е официалната интегрирана среда за разработка (IDE) за разработка на Android приложения. Тя е обявена от Google на конференцията I/O на 15 май 2013 г. и пусната за обществено ползване на 8 декември 2014 г. Android Studio е базирана на IntelliJ IDEA, популярна Java IDE.\n\nKotlin е междуплатформен език за програмиране, който може да работи на Java Virtual Machine (JVM), Android, браузър и нативни платформи. Създаден е от JetBrains, софтуерна компания със седалище в Прага. Kotlin е обявен за първи път през юли 2011 г. и пуснат като проект с отворен код през февруари 2012 г.\n\nGoogle обяви подкрепата си за Kotlin като официален език за разработка на Android приложения на своята конференция I/O на 17 май 2017 г. Оттогава Kotlin се превърна в един от най-популярните езици за разработчици на Android. Според данни на Google от октомври 2020 г. повече от 70% от топ 1000 приложения в Google Play използват Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Хронометърът е специализиран уиджет в рамката на Android, който предоставя функционалност, подобна на таймер, за показване на изминало време. Може да бъде конфигуриран да брои нагоре или надолу и често се използва в приложения, които изискват отчитане на време, като например приложения за хронометър или таймер за обратно броене. Класът Chronometer произлиза от класа TextView, което означава, че наследява всички свойства и методи на TextView. Това позволява на разработчиците лесно да персонализират външния вид на хронометъра, включително размера на текста, цвета и шрифта му.</string>
     <string name="snack_this_is_a_snackbar">Това е кратко известие.</string>
     <string name="snack_bar_clicked">кликнато</string>
@@ -449,7 +444,6 @@
     <string name="daily_tip_use_string_resources">Използвайте низ ресурси за всички текстове, за да опростите локализацията.</string>
     <string name="daily_tip_optimize_webp">Оптимизиране на изображения с WebP за намаляване на размера на APK.</string>
     <string name="daily_tip_enable_proguard">Включете ProGuard да се свие и да се обезпаразитят сграда освобождаване.</string>
-    <string name="daily_tip_prefer_compose">Предпочитайте Compose за нов UI ако се цели в съвременни устройства.</string>
     <string name="daily_tip_livedata_viewmodel">Възползвайте се от LiveData и ViewModel за реактивни UIs.</string>
     <string name="daily_tip_workmanager">Използвайте WorkManager за надеждни фонови задачи.</string>
     <string name="daily_tip_github_actions">Използване на GitHub Действия за автоматизирани проверки за изграждане.</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 11fbe6d7..719259a6 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -397,7 +397,6 @@
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">এই ইন্টারেক্টিভ পাঠের মাধ্যমে অ্যান্ড্রয়েডে কীভাবে প্রোগ্রেস বার ব্যবহার করতে হয় তা শিখুন। এই পাঠে দুটি বিভাগ রয়েছে: একটি অনুভূমিক প্রোগ্রেস বারের জন্য এবং একটি বৃত্তাকার প্রোগ্রেস বারের জন্য। প্রতিটি বিভাগে, আপনি দেখতে পাবেন কীভাবে একটি ডাউনলোড অগ্রসর হওয়ার সাথে সাথে প্রোগ্রেস বার আপডেট হয়। আপনি পর্দার নীচে ভাসমান অ্যাকশন বোতামে ক্লিক করে পাঠের কোডটিও দেখতে পারেন।</string>
     <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">অ্যান্ড্রয়েড হল গুগল দ্বারা তৈরি একটি মোবাইল অপারেটিং সিস্টেম। এটি প্রথম ৫ নভেম্বর, ২০০৭-এ একটি বিটা সংস্করণ হিসাবে প্রকাশিত হয়েছিল এবং প্রথম বাণিজ্যিক সংস্করণ, অ্যান্ড্রয়েড ১.০, ২৩ সেপ্টেম্বর, ২০০৮-এ চালু হয়েছিল। অ্যান্ড্রয়েড লিনাক্স কার্নেলের একটি পরিবর্তিত সংস্করণ এবং অন্যান্য ওপেন সোর্স সফ্টওয়্যারের উপর ভিত্তি করে তৈরি।\n\nঅ্যান্ড্রয়েড স্টুডিও হল অ্যান্ড্রয়েড অ্যাপ ডেভেলপমেন্টের জন্য অফিসিয়াল ইন্টিগ্রেটেড ডেভেলপমেন্ট এনভায়রনমেন্ট (IDE)। এটি ১৫ মে, ২০১৩-এ গুগলের I/O কনফারেন্সে ঘোষণা করা হয়েছিল এবং ৮ ডিসেম্বর, ২০১৪-এ জনসাধারণের ব্যবহারের জন্য প্রকাশ করা হয়েছিল। অ্যান্ড্রয়েড স্টুডিও ইন্টেলিজে আইডিয়ার উপর ভিত্তি করে তৈরি, যা একটি জনপ্রিয় জাভা IDE।\n\nকোটলিন হল একটি ক্রস-প্ল্যাটফর্ম প্রোগ্রামিং ভাষা যা জাভা ভার্চুয়াল মেশিন (JVM), অ্যান্ড্রয়েড, ব্রাউজার এবং নেটিভ প্ল্যাটফর্মে চলতে পারে। এটি প্রাগ ভিত্তিক একটি সফটওয়্যার কোম্পানি জেটব্রেইন্স দ্বারা তৈরি করা হয়েছিল। কোটলিন প্রথম জুলাই ২০১১-এ ঘোষণা করা হয়েছিল এবং ফেব্রুয়ারি ২০১২-এ একটি ওপেন সোর্স প্রকল্প হিসাবে প্রকাশিত হয়েছিল।\n\nগুগল ১৭ মে, ২০১৭-এ তার I/O কনফারেন্সে অ্যান্ড্রয়েড অ্যাপ ডেভেলপমেন্টের জন্য একটি অফিসিয়াল ভাষা হিসাবে কোটলিনের জন্য তার সমর্থন ঘোষণা করেছিল। তারপর থেকে, কোটলিন অ্যান্ড্রয়েড ডেভেলপারদের জন্য সবচেয়ে জনপ্রিয় ভাষাগুলির মধ্যে একটি হয়ে উঠেছে। অক্টোবর ২০২০ সালের গুগলের ডেটা অনুসারে, গুগল প্লে-তে শীর্ষ ১০০০ অ্যাপের ৭০%-এরও বেশি কোটলিন ব্যবহার করে।</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">একটি ক্রোনোমিটার হল অ্যান্ড্রয়েড ফ্রেমওয়ার্কের একটি বিশেষায়িত উইজেট যা অতিবাহিত সময় প্রদর্শনের জন্য একটি টাইমার-সদৃশ কার্যকারিতা প্রদান করে। এটি উপরে বা নিচে গণনা করার জন্য কনফিগার করা যেতে পারে, এবং এটি সাধারণত স্টপওয়াচ বা কাউন্টডাউন টাইমার অ্যাপের মতো সময় গণনার প্রয়োজন এমন অ্যাপ্লিকেশনগুলিতে ব্যবহৃত হয়। ক্রোনোমিটার ক্লাসটি TextView ক্লাস থেকে উদ্ভূত, যার অর্থ এটি একটি TextView-এর সমস্ত বৈশিষ্ট্য এবং পদ্ধতি উত্তরাধিকার সূত্রে পায়। এটি ডেভেলপারদের সহজেই ক্রোনোমিটারের চেহারা কাস্টমাইজ করতে দেয়, যার মধ্যে এর টেক্সট আকার, রঙ এবং ফন্ট অন্তর্ভুক্ত।</string>
     <string name="snack_this_is_a_snackbar">এটি একটি স্ন্যাকবার.</string>
     <string name="snack_bar_clicked">ক্লিক করা হয়েছে</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 5a4af1fe..c4b21ace 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -16,11 +16,8 @@
 
     <string name="home">Startseite</string>
     <string name="announcement_title">Eine neue App ist da.</string>
-    <string name="announcement_subtitle">Schau dir die neueste Android Studio Tutorials App an. Lerne Jetpack Compose, Material 3 und mehr.</string>
     <string name="profile_picture_desc">Entwicklerprofilbild</string>
     <string name="main_card_title">Entdecke Android Studio Tutorials</string>
-    <string name="main_card_subtitle">Mit Kotlin- und Java-Editionen</string>
-    <string name="main_card_description">Die Kotlin-Edition wurde mit dynamischen Lektionen, KI-Assistent und mehr aktualisiert. Erlebe die Zukunft der Android-Entwicklung.</string>
     <string name="get_on_google_play">Jetzt bei Google Play</string>
     <string name="learn_more">Mehr erfahren</string>
     <string name="play_store">Play Store</string>
@@ -396,8 +393,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat ist eine Klasse in der Android Support Library appCompat v7. Sie wurde hinzugefügt, um Methoden zu unterstützen, die in neueren API-Levels hinzugefügt wurden, auf älteren (wie Trennlinien). Wenn Sie die Methoden in LinearLayout und LinearLayoutCompat vergleichen, können Sie sehen, dass das Compat-Layout alle Methoden des LinearLayout ohne API-Level-Beschränkung hat. Zum Beispiel wurde die Methode setShowDividers auf API-Level 11 eingeführt. In diesem Fall sollte setShowDividers (und seine Parameter) also mit LinearLayoutCompat anstelle von LinearLayout aufgerufen werden, wenn Sie eine Plattform mit einem API-Level unter 11 ansprechen.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Lernen Sie in dieser interaktiven Lektion, wie Sie Fortschrittsbalken in Android verwenden. Diese Lektion umfasst zwei Abschnitte: einen für einen horizontalen Fortschrittsbalken und einen für einen kreisförmigen Fortschrittsbalken. In jedem Abschnitt können Sie sehen, wie sich der Fortschrittsbalken während eines Downloads aktualisiert. Sie können auch den Code für die Lektion anzeigen, indem Sie auf die Floating-Action-Schaltfläche am unteren Bildschirmrand klicken.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android ist ein von Google entwickeltes mobiles Betriebssystem. Es wurde erstmals am 5. November 2007 als Beta-Version veröffentlicht, und die erste kommerzielle Version, Android 1.0, wurde am 23. September 2008 eingeführt. Android basiert auf einer modifizierten Version des Linux-Kernels und anderer Open-Source-Software.\n\nAndroid Studio ist die offizielle integrierte Entwicklungsumgebung (IDE) für die Android-App-Entwicklung. Es wurde von Google auf seiner I/O-Konferenz am 15. Mai 2013 angekündigt und am 8. Dezember 2014 für die öffentliche Nutzung freigegeben. Android Studio basiert auf IntelliJ IDEA, einer beliebten Java-IDE.\n\nKotlin ist eine plattformübergreifende Programmiersprache, die auf der Java Virtual Machine (JVM), Android, im Browser und auf nativen Plattformen ausgeführt werden kann. Sie wurde von JetBrains entwickelt, einem Softwareunternehmen mit Sitz in Prag. Kotlin wurde erstmals im Juli 2011 angekündigt und im Februar 2012 als Open-Source-Projekt veröffentlicht.\n\nGoogle kündigte seine Unterstützung für Kotlin als offizielle Sprache für die Android-App-Entwicklung auf seiner I/O-Konferenz am 17. Mai 2017 an. Seitdem hat sich Kotlin zu einer der beliebtesten Sprachen für Android-Entwickler entwickelt. Laut Daten von Google vom Oktober 2020 verwenden mehr als 70 %% der Top-1000-Apps im Google Play Store Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Ein Chronometer ist ein spezialisiertes Widget im Android-Framework, das eine timerähnliche Funktionalität zur Anzeige der verstrichenen Zeit bietet. Es kann so konfiguriert werden, dass es auf- oder abwärts zählt, und wird häufig in Anwendungen verwendet, die eine Zeitmessung erfordern, wie z. B. Stoppuhr- oder Countdown-Timer-Apps. Die Chronometer-Klasse ist von der TextView-Klasse abgeleitet, was bedeutet, dass sie alle Eigenschaften und Methoden eines TextViews erbt. Dies ermöglicht es Entwicklern, das Erscheinungsbild des Chronometers einfach anzupassen, einschließlich Textgröße, Farbe und Schriftart.</string>
     <string name="snack_this_is_a_snackbar">Das ist eine Snackbar.</string>
     <string name="snack_bar_clicked">geklickt</string>
@@ -455,7 +450,6 @@
     <string name="daily_tip_github_actions">GitHub verwenden Aktionen für automatisierte Build-Checks.</string>
     <string name="daily_tip_emulator_screen_sizes">Testen Sie Ihre App auf verschiedenen Bildschirmgrößen mit dem Emulator.</string>
     <string name="daily_tip_update_dependencies">Halten Sie Abhängigkeiten für die neuesten Funktionen und Fixes aktualisiert.</string>
-    <string name="daily_tip_kotlin_coroutines">Leverage Kotlin Coroutines für asynchrone Operationen.</string>
     <string name="daily_tip_hilt">Integrieren Sie Hilt für Abhängigkeitsinjektion.</string>
     <string name="daily_tip_unit_tests">Schreibeinheitstests mit JUnit und Espresso.</string>
     <string name="daily_tip_mvvm">Folgen Sie der MVVM-Architektur für den Aufrechterhaltungscode.</string>
diff --git a/app/src/main/res/values-es-rGQ/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
index f5f69d11..dca32af1 100644
--- a/app/src/main/res/values-es-rGQ/strings.xml
+++ b/app/src/main/res/values-es-rGQ/strings.xml
@@ -16,11 +16,8 @@
 
     <string name="home">Inicio</string>
     <string name="announcement_title">Hay una nueva aplicación.</string>
-    <string name="announcement_subtitle">Echa un vistazo a la última aplicación Android Studio Tutorials. Aprende Jetpack Compose, Material 3 y más.</string>
     <string name="profile_picture_desc">Foto de perfil de desarrollador</string>
     <string name="main_card_title">Descubre los tutoriales de Android Studio</string>
-    <string name="main_card_subtitle">Con ediciones para Kotlin y Java</string>
-    <string name="main_card_description">La edición de Kotlin se ha actualizado con lecciones dinámicas, asistente de IA y más. Experimenta el futuro del desarrollo de Android.</string>
     <string name="get_on_google_play">Consíguelo en Google Play</string>
     <string name="learn_more">Más información</string>
     <string name="play_store">Play Store</string>
@@ -396,8 +393,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat es una clase en la biblioteca de soporte de Android appCompat v7. Se agregó para admitir métodos que se agregaron en niveles de API más nuevos en los antiguos (como divisores). Si comparas los métodos en LinearLayout y LinearLayoutCompat, puedes ver que el diseño Compat tiene todos los métodos del LinearLayout sin ninguna limitación de nivel de API. Por ejemplo, el método setShowDividers se introdujo en el nivel de API 11. Entonces, en este caso, setShowDividers (y sus parámetros) deben invocarse usando LinearLayoutCompat en lugar de LinearLayout si te diriges a una plataforma con un nivel de API inferior a 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Aprende a usar barras de progreso en Android con esta lección interactiva. Esta lección incluye dos secciones: una para una barra de progreso horizontal y otra para una barra de progreso circular. En cada sección, puedes ver cómo se actualiza la barra de progreso a medida que avanza una descarga. También puedes ver el código de la lección haciendo clic en el botón de acción flotante en la parte inferior de la pantalla.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android es un sistema operativo móvil desarrollado por Google. Se lanzó por primera vez como una versión beta el 5 de noviembre de 2007 y la primera versión comercial, Android 1.0, se lanzó el 23 de septiembre de 2008. Android se basa en una versión modificada del kernel de Linux y otro software de código abierto.\n\nAndroid Studio es el entorno de desarrollo integrado (IDE) oficial para el desarrollo de aplicaciones Android. Fue anunciado por Google en su conferencia I/O el 15 de mayo de 2013 y lanzado para uso público el 8 de diciembre de 2014. Android Studio se basa en IntelliJ IDEA, un popular IDE de Java.\n\nKotlin es un lenguaje de programación multiplataforma que puede ejecutarse en Java Virtual Machine (JVM), Android, navegador y plataformas nativas. Fue creado por JetBrains, una compañía de software con sede en Praga. Kotlin se anunció por primera vez en julio de 2011 y se lanzó como un proyecto de código abierto en febrero de 2012.\n\nGoogle anunció su soporte para Kotlin como lenguaje oficial para el desarrollo de aplicaciones Android en su conferencia I/O el 17 de mayo de 2017. Desde entonces, Kotlin se ha convertido en uno de los lenguajes más populares para los desarrolladores de Android. Según datos de Google de octubre de 2020, más del 70% de las 1000 aplicaciones principales en Google Play usan Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interfaz for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Un Cronómetro es un widget especializado en el marco de Android que proporciona una funcionalidad similar a un temporizador para mostrar el tiempo transcurrido. Se puede configurar para contar hacia arriba o hacia abajo, y se usa comúnmente en aplicaciones que requieren cronometraje, como aplicaciones de cronómetro o temporizador de cuenta regresiva. La clase Chronometer se deriva de la clase TextView, lo que significa que hereda todas las propiedades y métodos de un TextView. Esto permite a los desarrolladores personalizar fácilmente la apariencia del Cronómetro, incluido el tamaño de su texto, color y fuente.</string>
     <string name="snack_this_is_a_snackbar">Esto es un Snackbar.</string>
     <string name="snack_bar_clicked">pulsado</string>
@@ -449,13 +444,11 @@
     <string name="daily_tip_use_string_resources">Utilice recursos de cadena para todo el texto para simplificar la localización.</string>
     <string name="daily_tip_optimize_webp">Optimize images with WebP to reduce APK size.</string>
     <string name="daily_tip_enable_proguard">Activar ProGuard para reducir y ocultar las construcciones de liberación.</string>
-    <string name="daily_tip_prefer_compose">Preferir Compose para la nueva interfaz de usuario si apunta a dispositivos modernos.</string>
     <string name="daily_tip_livedata_viewmodel">Aproveche LiveData y ViewModel para redes reactivas.</string>
     <string name="daily_tip_workmanager">Use WorkManager para tareas de fondo confiables.</string>
     <string name="daily_tip_github_actions">Utilizar GitHub Acciones para cheques de construcción automatizados.</string>
     <string name="daily_tip_emulator_screen_sizes">Pruebe su aplicación en diferentes tamaños de pantalla con el emulador.</string>
     <string name="daily_tip_update_dependencies">Mantenga las dependencias actualizadas para las últimas características y correcciones.</string>
-    <string name="daily_tip_kotlin_coroutines">Leverage Kotlin Coroutines for asynchronous operations.</string>
     <string name="daily_tip_hilt">Integrar Hilt para la inyección de dependencia.</string>
     <string name="daily_tip_unit_tests">Escribe pruebas de unidad con JUnit y Espresso.</string>
     <string name="daily_tip_mvvm">Siga la arquitectura MVVM para mantener código.</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 29961e9f..f68f7512 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Acepto</string>
     <string name="home">Inicio</string>
     <string name="announcement_title">Llegó una nueva app.</string>
-    <string name="announcement_subtitle">Échale un ojo a la nueva app de Tutoriales de Android Studio. Aprende Jetpack Compose, Material 3 y más.</string>
     <string name="profile_picture_desc">Foto de perfil de desarrollador</string>
     <string name="main_card_title">Descubre los Tutoriales de Android Studio</string>
-    <string name="main_card_subtitle">Con ediciones de Kotlin y Java</string>
-    <string name="main_card_description">La edición de Kotlin ha sido actualizada con lecciones dinámicas, asistente de IA y más. Experimenta el futuro del desarrollo de Android.</string>
     <string name="get_on_google_play">Descárgala en Google Play</string>
     <string name="learn_more">Más información</string>
     <string name="play_store">Play Store</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat es una clase en la biblioteca de soporte de Android appCompat v7. Se agregó para admitir métodos que se agregaron en niveles de API más nuevos en los antiguos (como los divisores). Si comparas los métodos en LinearLayout y LinearLayoutCompat, puedes ver que el diseño Compat tiene todos los métodos del LinearLayout sin ninguna limitación de nivel de API. Por ejemplo, el método setShowDividers se introdujo en el nivel de API 11. Por lo tanto, en este caso, setShowDividers (y sus parámetros) deben invocarse usando LinearLayoutCompat en lugar de LinearLayout si te diriges a una plataforma con un nivel de API inferior a 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Aprende a usar las barras de progreso en Android con esta lección interactiva. Esta lección incluye dos secciones: una para una barra de progreso horizontal y otra para una barra de progreso circular. En cada sección, puedes ver cómo se actualiza la barra de progreso a medida que avanza una descarga. También puedes ver el código de la lección haciendo clic en el botón de acción flotante en la parte inferior de la pantalla.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android es un sistema operativo móvil desarrollado por Google. Se lanzó por primera vez como una versión beta el 5 de noviembre de 2007 y la primera versión comercial, Android 1.0, se lanzó el 23 de septiembre de 2008. Android se basa en una versión modificada del kernel de Linux y otro software de código abierto.\n\nAndroid Studio es el entorno de desarrollo integrado (IDE) oficial para el desarrollo de apps de Android. Fue anunciado por Google en su conferencia I/O el 15 de mayo de 2013 y lanzado para uso público el 8 de diciembre de 2014. Android Studio se basa en IntelliJ IDEA, un popular IDE de Java.\n\nKotlin es un lenguaje de programación multiplataforma que puede ejecutarse en la Máquina Virtual de Java (JVM), Android, navegador y plataformas nativas. Fue creado por JetBrains, una empresa de software con sede en Praga. Kotlin se anunció por primera vez en julio de 2011 y se lanzó como un proyecto de código abierto en febrero de 2012.\n\nGoogle anunció su soporte para Kotlin como lenguaje oficial para el desarrollo de apps de Android en su conferencia I/O el 17 de mayo de 2017. Desde entonces, Kotlin se ha convertido en uno de los lenguajes más populares para los desarrolladores de Android. Según datos de Google de octubre de 2020, más del 70% de las 1000 apps principales en Google Play usan Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interfaz for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Un Cronómetro es un widget especializado en el framework de Android que proporciona una funcionalidad similar a un temporizador para mostrar el tiempo transcurrido. Se puede configurar para contar hacia arriba o hacia abajo, y se usa comúnmente en aplicaciones que requieren cronometraje, como aplicaciones de cronómetro o temporizador de cuenta regresiva. La clase Chronometer se deriva de la clase TextView, lo que significa que hereda todas las propiedades y métodos de un TextView. Esto permite a los desarrolladores personalizar fácilmente la apariencia del Cronómetro, incluido el tamaño del texto, el color y la fuente.</string>
     <string name="snack_this_is_a_snackbar">Esto es un snack bar.</string>
     <string name="snack_bar_clicked">Pulsado</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Usa recursos de cadena para todo el texto para simplificar la localización.</string>
     <string name="daily_tip_optimize_webp">Optimiza las imágenes con WebP para reducir el tamaño del APK.</string>
     <string name="daily_tip_enable_proguard">Habilita ProGuard para reducir y ofuscar las compilaciones de lanzamiento.</string>
-    <string name="daily_tip_prefer_compose">Prefiere Compose para la nueva UI si apuntas a dispositivos modernos.</string>
     <string name="daily_tip_livedata_viewmodel">Aprovecha LiveData y ViewModel para interfaces de usuario reactivas.</string>
     <string name="daily_tip_workmanager">Usa WorkManager para tareas en segundo plano confiables.</string>
     <string name="daily_tip_github_actions">Utiliza GitHub Actions para verificaciones de compilación automatizadas.</string>
     <string name="daily_tip_emulator_screen_sizes">Prueba tu app en diferentes tamaños de pantalla con el emulador.</string>
     <string name="daily_tip_update_dependencies">Mantén las dependencias actualizadas para las últimas funciones y correcciones.</string>
-    <string name="daily_tip_kotlin_coroutines">Aprovecha las Corrutinas de Kotlin para operaciones asíncronas.</string>
     <string name="daily_tip_hilt">Integra Hilt para la inyección de dependencias.</string>
     <string name="daily_tip_unit_tests">Escribe pruebas unitarias con JUnit y Espresso.</string>
     <string name="daily_tip_mvvm">Sigue la arquitectura MVVM para un código mantenible.</string>
diff --git a/app/src/main/res/values-fil-rPH/strings.xml b/app/src/main/res/values-fil-rPH/strings.xml
index e575d94c..5928526c 100644
--- a/app/src/main/res/values-fil-rPH/strings.xml
+++ b/app/src/main/res/values-fil-rPH/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Sumang-ayon</string>
     <string name="home">Home</string>
     <string name="announcement_title">May Bagong App.</string>
-    <string name="announcement_subtitle">Tingnan ang pinakabagong Android Studio Tutorials app. Alamin ang Jetpack Compose, Material 3, at marami pa.</string>
     <string name="profile_picture_desc">Larawan ng profile ng developer</string>
     <string name="main_card_title">Tuklasin ang Android Studio Tutorials</string>
-    <string name="main_card_subtitle">Nagtatampok ng mga Edisyon ng Kotlin at Java</string>
-    <string name="main_card_description">Ang Kotlin Edition ay na-update na may mga dynamic na aralin, AI assistant, at marami pa. Damhin ang hinaharap ng Android development.</string>
     <string name="get_on_google_play">Kunin ito sa Google Play</string>
     <string name="learn_more">Matuto pa</string>
     <string name="play_store">Play Store</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">Ang Linear Layout Compat ay isang klase sa Android support library appCompat v7. Idinagdag ito para suportahan ang mga method na idinagdag sa mas bagong mga antas ng API sa mga luma (tulad ng mga divider). Kung ikukumpara mo ang mga method sa LinearLayout at LinearLayoutCompat, makikita mo na ang Compat layout ay may lahat ng mga method ng Linear Layout nang walang anumang limitasyon sa antas ng API. Halimbawa, ang method na setShowDividers ay ipinakilala sa API level 11. Kaya, sa kasong ito, ang setShowDividers (at ang mga parameter nito) ay dapat tawagin gamit ang Linear Layout Compat sa halip na LinearLayout kung nagta-target ka ng isang platform na may API level na mas mababa sa 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Alamin kung paano gamitin ang mga progress bar sa Android sa interactive na araling ito. Kasama sa araling ito ang dalawang seksyon: isa para sa isang horizontal progress bar at isa para sa isang circular progress bar. Sa bawat seksyon, makikita mo kung paano nag-a-update ang progress bar habang umuusad ang isang download. Maaari mo ring tingnan ang code para sa aralin sa pamamagitan ng pag-click sa floating action button sa ibaba ng screen.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Ang Android ay isang mobile operating system na binuo ng Google. Unang inilabas ito bilang isang beta na bersyon noong Nobyembre 5, 2007 at ang unang komersyal na bersyon, ang Android 1.0, ay inilunsad noong Setyembre 23, 2008. Ang Android ay batay sa isang binagong bersyon ng Linux kernel at iba pang open source na software.\n\nAng Android Studio ay ang opisyal na integrated development environment (IDE) para sa pag-develop ng Android app. Inanunsyo ito ng Google sa kanilang I/O conference noong Mayo 15, 2013 at inilabas para sa pampublikong paggamit noong Disyembre 8, 2014. Ang Android Studio ay batay sa IntelliJ IDEA, isang sikat na Java IDE.\n\nAng Kotlin ay isang cross-platform na programming language na maaaring tumakbo sa Java Virtual Machine (JVM), Android, browser at mga native na platform. Nilikha ito ng JetBrains, isang kumpanya ng software na nakabase sa Prague. Unang inanunsyo ang Kotlin noong Hulyo 2011 at inilabas bilang isang open source na proyekto noong Pebrero 2012.\n\nInanunsyo ng Google ang suporta nito para sa Kotlin bilang isang opisyal na wika para sa pag-develop ng Android app sa kanilang I/O conference noong Mayo 17, 2017. Mula noon, naging isa sa pinakasikat na wika ang Kotlin para sa mga developer ng Android. Ayon sa data ng Google mula Oktubre 2020, higit sa 70% ng nangungunang 1000 app sa Google Play ay gumagamit ng Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Ang isang Chronometer ay isang espesyalisadong widget sa Android framework na nagbibigay ng isang functionality na parang timer para sa pagpapakita ng lumipas na oras. Maaari itong i-configure para magbilang pataas o pababa, at karaniwang ginagamit sa mga application na nangangailangan ng timekeeping, tulad ng mga stopwatch o countdown timer app. Ang Chronometer class ay nagmula sa TextView class, na nangangahulugang namamana nito ang lahat ng mga katangian at method ng isang TextView. Nagbibigay-daan ito sa mga developer na madaling i-customize ang hitsura ng Chronometer, kasama ang laki ng text, kulay, at font nito.</string>
     <string name="snack_this_is_a_snackbar">Ito ay isang snack bar.</string>
     <string name="snack_bar_clicked">na-click</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Gamitin ang mga string resource para sa lahat ng text para pasimplehin ang localization.</string>
     <string name="daily_tip_optimize_webp">I-optimize ang mga imahe gamit ang WebP para bawasan ang laki ng APK.</string>
     <string name="daily_tip_enable_proguard">I-enable ang ProGuard para paliitin at i-obfuscate ang mga release build.</string>
-    <string name="daily_tip_prefer_compose">Mas piliin ang Compose para sa bagong UI kung nagta-target ng mga modernong device.</string>
     <string name="daily_tip_livedata_viewmodel">Samantalahin ang LiveData at ViewModel para sa mga reactive na UI.</string>
     <string name="daily_tip_workmanager">Gamitin ang WorkManager para sa maaasahang mga gawain sa background.</string>
     <string name="daily_tip_github_actions">Gamitin ang GitHub Actions para sa mga automated na build check.</string>
     <string name="daily_tip_emulator_screen_sizes">Subukan ang iyong app sa iba\'t ibang laki ng screen gamit ang emulator.</string>
     <string name="daily_tip_update_dependencies">Panatilihing updated ang mga dependency para sa mga pinakabagong feature at pag-aayos.</string>
-    <string name="daily_tip_kotlin_coroutines">Gamitin ang Kotlin Coroutines para sa mga asynchronous na operasyon.</string>
     <string name="daily_tip_hilt">I-integrate ang Hilt para sa dependency injection.</string>
     <string name="daily_tip_unit_tests">Sumulat ng mga unit test gamit ang JUnit at Espresso.</string>
     <string name="daily_tip_mvvm">Sundin ang arkitektura ng MVVM para sa code na madaling i-maintain.</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ab01b40f..07246062 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -16,11 +16,8 @@
 
     <string name="home">Accueil</string>
     <string name="announcement_title">Une nouvelle application est là .</string>
-    <string name="announcement_subtitle">Découvrez la dernière application Android Studio Tutorials. Apprenez Jetpack Compose, Material 3, et plus encore.</string>
     <string name="profile_picture_desc">Image de profil de développeur</string>
     <string name="main_card_title">Découvrez les tutoriels Android Studio</string>
-    <string name="main_card_subtitle">Avec les éditions Kotlin et Java</string>
-    <string name="main_card_description">L\'édition Kotlin a été mise à jour avec des leçons dynamiques, un assistant IA, et plus encore. Découvrez l\'avenir du développement Android .</string>
     <string name="get_on_google_play">Obtenez-le sur Google Play</string>
     <string name="learn_more">En savoir plus</string>
     <string name="play_store">Play Store</string>
@@ -396,8 +393,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat est une classe de la bibliothèque de support Android appCompat v7. Elle a été ajoutée pour prendre en charge des méthodes qui ont été ajoutées dans des niveaux d\'API plus récents sur les anciens (comme les séparateurs). Si vous comparez les méthodes de LinearLayout et LinearLayoutCompat, vous pouvez voir que la mise en page Compat possède toutes les méthodes de LinearLayout sans aucune limitation de niveau d\'API. Par exemple, la méthode setShowDividers a été introduite au niveau d\'API 11. Ainsi, dans ce cas, setShowDividers (et ses paramètres) doit être invoqué en utilisant LinearLayoutCompat au lieu de LinearLayout si vous ciblez une plateforme avec un niveau d\'API inférieur à 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Apprenez à utiliser les barres de progression dans Android avec cette leçon interactive. Cette leçon comprend deux sections : une pour une barre de progression horizontale et une pour une barre de progression circulaire. Dans chaque section, vous pouvez voir comment la barre de progression se met à jour au fur et à mesure qu\'un téléchargement progresse. Vous pouvez également afficher le code de la leçon en cliquant sur le bouton d\'action flottant en bas de l\'écran.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android est un système d\'exploitation mobile développé par Google. Il a été publié pour la première fois en version bêta le 5 novembre 2007 et la première version commerciale, Android 1.0, a été lancée le 23 septembre 2008. Android est basé sur une version modifiée du noyau Linux et d\'autres logiciels open source.\n\nAndroid Studio est l\'environnement de développement intégré (IDE) officiel pour le développement d\'applications Android. Il a été annoncé par Google lors de sa conférence I/O le 15 mai 2013 et mis à la disposition du public le 8 décembre 2014. Android Studio est basé sur IntelliJ IDEA, un IDE Java populaire.\n\nKotlin est un langage de programmation multiplateforme qui peut s\'exécuter sur la machine virtuelle Java (JVM), Android, les navigateurs et les plateformes natives. Il a été créé par JetBrains, une société de logiciels basée à Prague. Kotlin a été annoncé pour la première fois en juillet 2011 et publié en tant que projet open source en février 2012.\n\nGoogle a annoncé son soutien à Kotlin en tant que langage officiel pour le développement d\'applications Android lors de sa conférence I/O le 17 mai 2017. Depuis lors, Kotlin est devenu l\'un des langages les plus populaires pour les développeurs Android. Selon les données de Google d\'octobre 2020, plus de 70 %% des 1000 meilleures applications sur Google Play utilisent Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Un Chronomètre est un widget spécialisé du framework Android qui fournit une fonctionnalité de type minuterie pour afficher le temps écoulé. Il peut être configuré pour compter en avant ou en arrière, et est couramment utilisé dans les applications qui nécessitent un chronométrage, telles que les applications de chronomètre ou de compte à rebours. La classe Chronomètre est dérivée de la classe TextView, ce qui signifie qu\'elle hérite de toutes les propriétés et méthodes d\'un TextView. Cela permet aux développeurs de personnaliser facilement l\'apparence du Chronomètre, y compris la taille de son texte, sa couleur et sa police.</string>
     <string name="snack_this_is_a_snackbar">Ceci est une Snackbar .</string>
     <string name="snack_bar_clicked">cliqué</string>
@@ -449,13 +444,11 @@
     <string name="daily_tip_use_string_resources">Utilisez des ressources de chaîne pour tous les textes pour simplifier la localisation.</string>
     <string name="daily_tip_optimize_webp">Optimisez les images avec WebP pour réduire la taille de l\'APK.</string>
     <string name="daily_tip_enable_proguard">Activer ProGuard pour réduire et masquer les builds de libération.</string>
-    <string name="daily_tip_prefer_compose">Préférez Composer pour une nouvelle interface si vous ciblez des appareils modernes.</string>
     <string name="daily_tip_livedata_viewmodel">Profitez de LiveData et ViewModel pour les interfaces réactives.</string>
     <string name="daily_tip_workmanager">Utilisez WorkManager pour des tâches de fond fiables.</string>
     <string name="daily_tip_github_actions">Utiliser GitHub Actions pour les contrôles automatisés de construction.</string>
     <string name="daily_tip_emulator_screen_sizes">Testez votre application sur différentes tailles d\'écran avec l\'émulateur.</string>
     <string name="daily_tip_update_dependencies">Gardez les dépendances mises à jour pour les dernières fonctionnalités et corrections.</string>
-    <string name="daily_tip_kotlin_coroutines">Tirez profit de Kotlin Coroutines pour des opérations asynchrones.</string>
     <string name="daily_tip_hilt">Intégrer Hilt pour injection de dépendance.</string>
     <string name="daily_tip_unit_tests">Écrire des tests unitaires avec Junit et Espresso.</string>
     <string name="daily_tip_mvvm">Suivez l\'architecture MVVM pour maintenir le code.</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index d5d115eb..92a55588 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -398,7 +398,6 @@
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">इस इंटरैक्टिव पाठ के साथ Android में प्रोग्रेस बार का उपयोग करना सीखें। इस पाठ में दो खंड शामिल हैं: एक क्षैतिज प्रोग्रेस बार के लिए और एक वृत्ताकार प्रोग्रेस बार के लिए। प्रत्येक खंड में, आप देख सकते हैं कि डाउनलोड की प्रगति के साथ प्रोग्रेस बार कैसे अपडेट होता है। आप स्क्रीन के निचले भाग में फ्लोटिंग एक्शन बटन पर क्लिक करके पाठ के लिए कोड भी देख सकते हैं।</string>
     <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android Google द्वारा विकसित एक मोबाइल ऑपरेटिंग सिस्टम है। इसे पहली बार 5 नवंबर, 2007 को बीटा संस्करण के रूप में जारी किया गया था और पहला वाणिज्यिक संस्करण, Android 1.0, 23 सितंबर, 2008 को लॉन्च किया गया था। Android लिनक्स कर्नेल और अन्य ओपन सोर्स सॉफ्टवेयर के संशोधित संस्करण पर आधारित है।\n\nAndroid Studio Android ऐप डेवलपमेंट के लिए आधिकारिक एकीकृत विकास वातावरण (IDE) है। इसकी घोषणा Google ने अपने I/O सम्मेलन में 15 मई, 2013 को की थी और इसे 8 दिसंबर, 2014 को सार्वजनिक उपयोग के लिए जारी किया गया था। Android Studio IntelliJ IDEA पर आधारित है, जो एक लोकप्रिय जावा IDE है।\n\nकोटलिन एक क्रॉस-प्लेटफ़ॉर्म प्रोग्रामिंग भाषा है जो जावा वर्चुअल मशीन (JVM), Android, ब्राउज़र और नेटिव प्लेटफ़ॉर्म पर चल सकती है। इसे प्राग स्थित एक सॉफ्टवेयर कंपनी JetBrains द्वारा बनाया गया था। कोटलिन की पहली घोषणा जुलाई 2011 में हुई थी और इसे फरवरी 2012 में एक ओपन सोर्स प्रोजेक्ट के रूप में जारी किया गया था।\n\nGoogle ने 17 मई, 2017 को अपने I/O सम्मेलन में Android ऐप डेवलपमेंट के लिए एक आधिकारिक भाषा के रूप में कोटलिन के लिए अपने समर्थन की घोषणा की। तब से, कोटलिन Android डेवलपर्स के लिए सबसे लोकप्रिय भाषाओं में से एक बन गई है। अक्टूबर 2020 के Google के आंकड़ों के अनुसार, Google Play पर शीर्ष 1000 ऐप्स में से 70% से अधिक कोटलिन का उपयोग करते हैं।</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">एक क्रोनोमीटर Android फ्रेमवर्क में एक विशेष विजेट है जो बीता हुआ समय प्रदर्शित करने के लिए टाइमर-जैसी कार्यक्षमता प्रदान करता है। इसे ऊपर या नीचे गिनने के लिए कॉन्फ़िगर किया जा सकता है, और आमतौर पर उन अनुप्रयोगों में उपयोग किया जाता है जिन्हें समयपालन की आवश्यकता होती है, जैसे स्टॉपवॉच या काउंटडाउन टाइमर ऐप। क्रोनोमीटर क्लास TextView क्लास से व्युत्पन्न है, जिसका अर्थ है कि यह एक TextView के सभी गुणों और तरीकों को विरासत में प्राप्त करता है। यह डेवलपर्स को क्रोनोमीटर की उपस्थिति को आसानी से अनुकूलित करने की अनुमति देता है, जिसमें उसका टेक्स्ट आकार, रंग और फ़ॉन्ट शामिल है।</string>
     <string name="snack_this_is_a_snackbar">यह एक स्नैक बार है.</string>
     <string name="snack_bar_clicked">क्लिक किया गया</string>
@@ -450,13 +449,11 @@
     <string name="daily_tip_use_string_resources">स्थानीयकरण को सरल बनाने के लिए सभी पाठों के लिए स्ट्रिंग संसाधनों का उपयोग करें।</string>
     <string name="daily_tip_optimize_webp">एपीके आकार को कम करने के लिए WebP के साथ छवियों का अनुकूलन करें।</string>
     <string name="daily_tip_enable_proguard">ProGuard को सिकुड़ने और रिलीज के निर्माण को रोकने में सक्षम बनाता है।</string>
-    <string name="daily_tip_prefer_compose">अगर आधुनिक उपकरणों को लक्षित करने के लिए नए यूआई के लिए Compose को प्राथमिकता दें।</string>
     <string name="daily_tip_livedata_viewmodel">Reactive UIs के लिए LiveData और ViewModel का लाभ उठाएं।</string>
     <string name="daily_tip_workmanager">विश्वसनीय पृष्ठभूमि कार्यों के लिए वर्क मैनेजर का उपयोग करें।</string>
     <string name="daily_tip_github_actions">GitHub स्वचालित निर्माण जांच के लिए कार्य।</string>
     <string name="daily_tip_emulator_screen_sizes">एमुलेटर के साथ विभिन्न स्क्रीन आकारों पर अपने ऐप का परीक्षण करें।</string>
     <string name="daily_tip_update_dependencies">नवीनतम सुविधाओं और फिक्स के लिए निर्भरता अद्यतन रखें।</string>
-    <string name="daily_tip_kotlin_coroutines">अतुल्यकालिक संचालन के लिए उत्तोलन Kotlin Coroutine।</string>
     <string name="daily_tip_hilt">निर्भरता इंजेक्शन के लिए हिल्ट को एकीकृत करें।</string>
     <string name="daily_tip_unit_tests">JUnit and Espresso के साथ यूनिट परीक्षण लिखें।</string>
     <string name="daily_tip_mvvm">रखरखाव योग्य कोड के लिए MVVM वास्तुकला का पालन करें।</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 1557f1f1..4c6f57b9 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -18,11 +18,8 @@
 
     <string name="home">Kezdőlap</string>
     <string name="announcement_title">Megérkezett egy új app</string>
-    <string name="announcement_subtitle">Tekintsd meg a legújabb Android Studio Tutorials alkalmazást. Tanulj Jetpack Compose-ról, Material 3-ról és még többről.</string>
     <string name="profile_picture_desc">Fejlesztő profilképe</string>
     <string name="main_card_title">Fedezd fel az Android Studio oktatóanyagokat</string>
-    <string name="main_card_subtitle">Kotlin és Java kiadásokkal</string>
-    <string name="main_card_description">A Kotlin kiadás frissült dinamikus leckékkel, AI asszisztenssel és még sok mással. Tapasztald meg az Android fejlesztés jövőjét.</string>
     <string name="get_on_google_play">Szerezd meg a Google Playen</string>
     <string name="learn_more">Tudj meg többet</string>
     <string name="play_store">Play Áruház</string>
@@ -418,8 +415,6 @@
     <string name="summary_linear_layout_compat">A Linear Layout Compat egy osztály az Android appCompat v7 támogatói könyvtárban. Azért adták hozzá, hogy a régebbi API-szinteken is támogassa az újabb API-szinteken bevezetett metódusokat (például az elválasztókat). Ha összehasonlítod a LinearLayout és a LinearLayoutCompat metódusait, láthatod, hogy a Compat elrendezés rendelkezik a LinearLayout összes metódusával API-szint korlátozás nélkül. Például a setShowDividers metódust az API 11-es szintjén vezették be. Ezért ebben az esetben a setShowDividers (és paraméterei) meghívásához a Linear Layout Compatet kell használni a LinearLayout helyett, ha 11 alatti API-szintű platformot célozol.</string>
     <string name="summary_donations">Adományod segít az alkalmazás működtetésében és a funkciók fejlesztésében. Köszönjük a nagylelkűségedet.</string>
     <string name="summary_progress_bar">Ismerd meg, hogyan használhatsz folyamatjelző sávokat Androidon ezzel az interaktív leckével. A lecke két részt tartalmaz: egyet a vízszintes folyamatjelző sávhoz és egyet a kör alakú folyamatjelző sávhoz. Mindegyik részben láthatod, hogyan frissül a folyamatjelző sáv, ahogy a letöltés halad. A lecke kódját is megtekintheted a képernyő alján található lebegő műveletgombra kattintva.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Az Android egy mobil operációs rendszer, amelyet a Google fejlesztett. Először 2007. november 5-én adták ki béta verzióként, az első kereskedelmi verziót, az Android 1.0-t pedig 2008. szeptember 23-án indították. Az Android a Linux kernel módosított verzióján és más nyílt forráskódú szoftvereken alapul.\n\nAz Android Studio az Android-alkalmazás-fejlesztés hivatalos integrált fejlesztőkörnyezete (IDE). A Google a 2013. május 15-i I/O konferenciáján jelentette be, és 2014. december 8-án tette elérhetővé a nagyközönség számára. Az Android Studio az IntelliJ IDEA-ra épül, egy népszerű Java IDE-re.\n\nA Kotlin egy többplatformos programozási nyelv, amely a Java virtuális gépen (JVM), Androidon, böngészőben és natív platformokon is fut. A JetBrains, egy prágai székhelyű szoftvercég hozta létre. A Kotlin első bejelentése 2011 júliusában történt, és 2012 februárjában adták ki nyílt forráskódú projektként.\n\nA Google 2017. május 17-én, az I/O konferencián jelentette be, hogy hivatalosan támogatja a Kotlin nyelvet az Android-alkalmazás-fejlesztéshez. Azóta a Kotlin az egyik legnépszerűbb nyelvvé vált az Android fejlesztők körében. A Google 2020 októberi adatai szerint az első 1000 alkalmazás több mint 70%-a a Google Playen Kotlin nyelvet használ.</string>
-    <string name="summary_android_features">Az Android nemcsak egy operációs rendszer, hanem egy olyan platform is, amely számos funkciót és lehetőséget kínál a felhasználók és a fejlesztők számára. Néhány Android funkció:\n\n- Near Field Communication (NFC), amely lehetővé teszi adatok megosztását, fizetések végrehajtását és más eszközökkel való vezeték nélküli kapcsolatot.\n- Alternatív billentyűzetek, amelyek lehetővé teszik a beviteli módszer testreszabását különböző kiosztásokkal, nyelvekkel és témákkal.\n- Infravörös (IR) átvitel, amellyel a telefonodat távirányítóként használhatod tévékhez, légkondicionálókhoz és más eszközökhöz.\n- Érintés nélküli vezérlés, amely lehetővé teszi műveletek végrehajtását a telefonon a képernyő megérintése nélkül, gesztusok vagy hangparancsok használatával.\n- Automatizálás, amellyel rutint és triggert állíthatsz be, hogy a telefon bizonyos feladatokat automatikusan végrehajtson.\n- Vezeték nélküli alkalmazásletöltések, amelyek lehetővé teszik az alkalmazások telepítését a számítógépről vagy a web böngészőből anélkül, hogy kábellel csatlakoztatnád a telefont.\n- Tárhely- és akkumulátorcsere, amely lehetőséget ad a telefon memóriájának bővítésére vagy az akkumulátor egyszerű cseréjére.\n- Testreszabható kezdőképernyő, amellyel személyre szabhatod a telefon megjelenését widgetekkel, háttérképekkel, ikonokkal és launcherekkel.\n\nAz Android Studio a legjobb eszköz Android alkalmazások fejlesztéséhez. Sok funkciót és előnyt kínál a fejlesztőknek, például:\n\n- Kódszerkesztő szintaxiskiemeléssel, kódkiegészítéssel, refaktoringgal, hibakereséssel, teszteléssel és lint eszközökkel.\n- Layout szerkesztő drag-and-drop felülettel a felhasználói felületek tervezéséhez.\n- Emulátor gyors indítással és pillanatkép támogatással különböző eszközökön és konfigurációkban való teszteléshez.\n- Firebase integráció olyan szolgáltatásokkal, mint hitelesítés, adatbázis, tárhely, analitika, hibajelentés és még sok más. \n- Gradle-alapú build rendszer függőségkezeléssel,\nszemélyre szabással,\noptimalizálással,\n aláírással,\nterjesztési lehetőségekkel és további funkciókkal. \n\nAz Android Studio segítségével lenyűgöző alkalmazásokat készíthetsz Android eszközökre Kotlin használatával,\na modern programozási nyelvvel, amely tömör,\nbiztonságos,\nkifejező,\nés kompatibilis a Java-val.</string>
     <string name="summary_chronometer">A Chronometer egy speciális widget az Android keretrendszerben, amely időzítő-szerű funkcionalitást biztosít az eltelt idő megjelenítéséhez. Beállítható felfelé vagy lefelé számolásra, és gyakran használják olyan alkalmazásokban, amelyek időmérést igényelnek, például stopper- vagy visszaszámláló alkalmazások. A Chronometer osztály a TextView osztályból származik, ami azt jelenti, hogy örökli a TextView összes tulajdonságát és metódusát. Ez lehetővé teszi a fejlesztők számára, hogy könnyen testre szabják a Chronometer megjelenését, beleértve a szöveg méretét, színét és betűtípusát.</string>
     <string name="snack_this_is_a_snackbar">Ez egy snackbar.</string>
     <string name="snack_bar_clicked">kattintva</string>
@@ -468,13 +463,11 @@
     <string name="daily_tip_use_string_resources">Használj szöveg erőforrásokat minden szöveghez a lokalizálás megkönnyítéséhez.</string>
     <string name="daily_tip_optimize_webp">Optimalizáld a képeket WebP-vel az APK méretének csökkentéséhez.</string>
     <string name="daily_tip_enable_proguard">Kapcsold be a ProGuardot a kiadási build-ek zsugorításához és obfuszkálásához.</string>
-    <string name="daily_tip_prefer_compose">Ha modern eszközöket célozol, részesítsd előnyben a Compose-t az új UI-hoz.</string>
     <string name="daily_tip_livedata_viewmodel">Használd a LiveData és ViewModel előnyeit reaktív UI-khoz.</string>
     <string name="daily_tip_workmanager">Használd a WorkManagert megbízható háttérfeladatokhoz.</string>
     <string name="daily_tip_github_actions">Használd a GitHub Actions-t automatizált build ellenőrzésekhez.</string>
     <string name="daily_tip_emulator_screen_sizes">Teszteld az appot különböző képernyőméreteken az emulátorban.</string>
     <string name="daily_tip_update_dependencies">Tartsd naprakészen a függőségeket a legújabb funkciók és javítások érdekében.</string>
-    <string name="daily_tip_kotlin_coroutines">Használd a Kotlin Coroutinekat az aszinkron műveletekhez.</string>
     <string name="daily_tip_hilt">Integráld a Hiltet a függőséginjekcióhoz.</string>
     <string name="daily_tip_unit_tests">Írj egységteszteket JUnittal és Espresso-val.</string>
     <string name="daily_tip_mvvm">Kövesd az MVVM architektúrát a karbantartható kódért.</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 5b6a7aee..1cee47b2 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -19,8 +19,6 @@
     <string name="announcement_subtitle">Lihat aplikasi Android Studio Tutorials terbaru.</string>
     <string name="profile_picture_desc">Gambar profil pengembang</string>
     <string name="main_card_title">Temukan Tutorial Android Studio</string>
-    <string name="main_card_subtitle">Menampilkan Edisi Kotlin dan Java</string>
-    <string name="main_card_description">Edisi Kotlin telah diperbarui dengan pelajaran dinamis, asisten AI, dan banyak lagi. Rasakan masa depan pengembangan Android.</string>
     <string name="get_on_google_play">Dapatkan di Google Play</string>
     <string name="learn_more">Pelajari lebih lanjut</string>
     <string name="play_store">Play Store</string>
@@ -396,8 +394,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat adalah kelas dalam pustaka dukungan Android appCompat v7. Ini ditambahkan untuk mendukung metode yang ditambahkan di level API yang lebih baru pada yang lama (seperti pembagi). Jika Anda membandingkan metode di LinearLayout dan LinearLayoutCompat, Anda dapat melihat bahwa tata letak Compat memiliki semua metode dari Tata Letak Linear tanpa batasan level API. Misalnya, metode setShowDividers diperkenalkan pada level API 11. Jadi, dalam kasus ini, setShowDividers (dan parameternya) harus dipanggil menggunakan Linear Layout Compat alih-alih LinearLayout jika Anda menargetkan platform dengan level API di bawah 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Pelajari cara menggunakan progress bar di Android dengan pelajaran interaktif ini. Pelajaran ini mencakup dua bagian: satu untuk progress bar horizontal dan satu untuk progress bar melingkar. Di setiap bagian, Anda dapat melihat bagaimana progress bar diperbarui saat unduhan berlangsung. Anda juga dapat melihat kode untuk pelajaran dengan mengeklik tombol aksi mengambang di bagian bawah layar.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android adalah sistem operasi seluler yang dikembangkan oleh Google. Ini pertama kali dirilis sebagai versi beta pada 5 November 2007 dan versi komersial pertama, Android 1.0, diluncurkan pada 23 September 2008. Android didasarkan pada versi modifikasi dari kernel Linux dan perangkat lunak sumber terbuka lainnya.\n\nAndroid Studio adalah lingkungan pengembangan terintegrasi (IDE) resmi untuk pengembangan aplikasi Android. Ini diumumkan oleh Google pada konferensi I/O pada 15 Mei 2013 dan dirilis untuk penggunaan publik pada 8 Desember 2014. Android Studio didasarkan pada IntelliJ IDEA, IDE Java yang populer.\n\nKotlin adalah bahasa pemrograman lintas platform yang dapat berjalan di Java Virtual Machine (JVM), Android, peramban, dan platform asli. Ini dibuat oleh JetBrains, perusahaan perangkat lunak yang berbasis di Praha. Kotlin pertama kali diumumkan pada Juli 2011 dan dirilis sebagai proyek sumber terbuka pada Februari 2012.\n\nGoogle mengumumkan dukungannya untuk Kotlin sebagai bahasa resmi untuk pengembangan aplikasi Android pada konferensi I/O pada 17 Mei 2017. Sejak saat itu, Kotlin telah menjadi salah satu bahasa paling populer untuk pengembang Android. Menurut data Google dari Oktober 2020, lebih dari 70% dari 1000 aplikasi teratas di Google Play menggunakan Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Kronometer adalah widget khusus dalam kerangka kerja Android yang menyediakan fungsionalitas seperti timer untuk menampilkan waktu yang berlalu. Ini dapat dikonfigurasi untuk menghitung naik atau turun, dan umumnya digunakan dalam aplikasi yang memerlukan pencatatan waktu, seperti aplikasi stopwatch atau timer hitung mundur. Kelas Kronometer berasal dari kelas TextView, yang berarti mewarisi semua properti dan metode dari TextView. Ini memungkinkan pengembang untuk dengan mudah menyesuaikan tampilan Kronometer, termasuk ukuran teks, warna, dan fontnya.</string>
     <string name="snack_this_is_a_snackbar">Ini adalah snack bar.</string>
     <string name="snack_bar_clicked">diklik</string>
@@ -449,13 +445,11 @@
     <string name="daily_tip_use_string_resources">Gunakan sumber daya string untuk semua teks untuk menyederhanakan lokalisasi.</string>
     <string name="daily_tip_optimize_webp">Optimasi gambar dengan WebP untuk mengurangi ukuran APK.</string>
     <string name="daily_tip_enable_proguard">Aktifkan ProGuard untuk menyusut dan obfuscate rilis membangun.</string>
-    <string name="daily_tip_prefer_compose">Lebih suka Compose untuk UI baru jika menargetkan perangkat modern.</string>
     <string name="daily_tip_livedata_viewmodel">Mengambil keuntungan dari LiveData dan ViewModel untuk UIs reaktif.</string>
     <string name="daily_tip_workmanager">Gunakan WorkManager untuk tugas latar belakang yang dapat diandalkan.</string>
     <string name="daily_tip_github_actions">Utilize GitHub Aksi untuk pemeriksaan pembuatan otomatis.</string>
     <string name="daily_tip_emulator_screen_sizes">Uji aplikasi Anda pada ukuran layar yang berbeda dengan emulator.</string>
     <string name="daily_tip_update_dependencies">Pertahankan ketergantungan diperbarui untuk fitur dan perbaikan terbaru.</string>
-    <string name="daily_tip_kotlin_coroutines">Leverage Kotlin Coroutines untuk operasi asynchronous.</string>
     <string name="daily_tip_hilt">Integrasikan Hilt untuk injeksi ketergantungan.</string>
     <string name="daily_tip_unit_tests">Tes unit tulis dengan JUnit dan Espresso.</string>
     <string name="daily_tip_mvvm">Ikuti arsitektur MVVM untuk kode yang dapat dipertahankan.</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 36bd1673..4f65581c 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -18,11 +18,8 @@
 
     <string name="home">Home</string>
     <string name="announcement_title">È arrivata una nuova app</string>
-    <string name="announcement_subtitle">Scopri la nuova app Android Studio Tutorials. Impara Jetpack Compose, Material 3 e altro.</string>
     <string name="profile_picture_desc">Immagine del profilo dello sviluppatore</string>
     <string name="main_card_title">Scopri i tutorial di Android Studio</string>
-    <string name="main_card_subtitle">Con edizioni Kotlin e Java</string>
-    <string name="main_card_description">L\'edizione Kotlin è stata aggiornata con lezioni dinamiche, assistente AI e altro. Vivi il futuro dello sviluppo Android.</string>
     <string name="get_on_google_play">Scaricalo su Google Play</string>
     <string name="learn_more">Scopri di più</string>
     <string name="play_store">Play Store</string>
@@ -418,8 +415,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat è una classe nella libreria di supporto Android appCompat v7. È stata aggiunta per supportare i metodi introdotti nei livelli API più recenti anche su quelli vecchi (come i divisori). Se confronti i metodi in LinearLayout e LinearLayoutCompat, puoi vedere che il layout Compat dispone di tutti i metodi del LinearLayout senza alcuna limitazione di livello API. Ad esempio, il metodo setShowDividers è stato introdotto nel livello API 11. Quindi, in questo caso, setShowDividers (e i suoi parametri) dovrebbe essere richiamato utilizzando Linear Layout Compat invece di LinearLayout se stai puntando a una piattaforma con livello API inferiore a 11.</string>
     <string name="summary_donations">La tua donazione aiuta a mantenere l\'app in funzione e a migliorare le funzionalità. Grazie per la tua generosità.</string>
     <string name="summary_progress_bar">Impara a usare le barre di avanzamento in Android con questa lezione interattiva. La lezione comprende due sezioni: una per una barra di avanzamento orizzontale e una per una barra di avanzamento circolare. In ogni sezione puoi vedere come la barra di avanzamento si aggiorna man mano che procede un download. Puoi anche visualizzare il codice della lezione toccando il pulsante di azione fluttuante nella parte inferiore dello schermo.</string>
-    <string name="summary_android_history">Android è un sistema operativo mobile sviluppato da Google. È stato rilasciato per la prima volta come versione beta il 5 novembre 2007 e la prima versione commerciale, Android 1.0, è stata lanciata il 23 settembre 2008. Android si basa su una versione modificata del kernel Linux e su altri software open source.\n\nAndroid Studio è l\'ambiente di sviluppo integrato (IDE) ufficiale per lo sviluppo di app Android. È stato annunciato da Google alla conferenza I/O del 15 maggio 2013 ed è stato rilasciato per l\'uso pubblico l\'8 dicembre 2014. Android Studio si basa su IntelliJ IDEA, un popolare IDE Java.\n\nKotlin è un linguaggio di programmazione multipiattaforma che può essere eseguito sulla Java Virtual Machine (JVM), su Android, nel browser e su piattaforme native. È stato creato da JetBrains, una società di software con sede a Praga. Kotlin è stato annunciato per la prima volta nel luglio 2011 e rilasciato come progetto open source nel febbraio 2012.\n\nGoogle ha annunciato il supporto ufficiale per Kotlin come linguaggio per lo sviluppo di app Android alla conferenza I/O del 17 maggio 2017. Da allora Kotlin è diventato uno dei linguaggi più popolari per gli sviluppatori Android. Secondo i dati di Google dell\'ottobre 2020, oltre il 70% delle prime 1000 app su Google Play usa Kotlin.</string>
-    <string name="summary_android_features">Android non è solo un sistema operativo, ma anche una piattaforma che offre una gamma di funzionalità e capacità per utenti e sviluppatori. Alcune delle funzionalità di Android includono:\n\n- Near Field Communication (NFC), che consente di condividere dati, effettuare pagamenti e connettersi con altri dispositivi in modalità wireless.\n- Tastiere alternative, che permettono di personalizzare il metodo di input con layout, lingue e temi diversi.\n- Trasmissione IR, che consente di usare il telefono come telecomando per TV, condizionatori e altri apparecchi.\n- Controllo senza tocco, che permette di eseguire azioni sul telefono senza toccare lo schermo, usando gesti o comandi vocali.\n- Automazione, che consente di impostare routine e trigger affinché il telefono esegua automaticamente determinate attività.\n- Download di app wireless, che permettono di installare app dal computer o dal browser web senza collegare il telefono con un cavo.\n- Sostituzione di memoria e batteria, che offre la possibilità di espandere la memoria del telefono o sostituirne facilmente la batteria.\n- Schermata iniziale personalizzata, che consente di personalizzare l\'aspetto del telefono con widget, sfondi, icone e launcher.\n\nAndroid Studio è il miglior strumento per sviluppare app Android. Offre molte funzionalità e vantaggi per gli sviluppatori, come:\n\n- Editor di codice con evidenziazione della sintassi, completamento del codice, refactoring, strumenti di debug, test e lint.\n- Editor di layout con interfaccia drag-and-drop per progettare le interfacce utente.\n- Emulatore con avvio rapido e supporto per snapshot per testare le app su diversi dispositivi e configurazioni.\n- Integrazione con Firebase con servizi come autenticazione, database, archiviazione, analisi, segnalazione di crash e altro. \n- Sistema di build basato su Gradle con gestione delle dipendenze,\npersonalizzazione,\nottimizzazione,\nfirma,\nopzioni di distribuzione e altro. \n\nCon Android Studio puoi creare app straordinarie per dispositivi Android usando Kotlin,\nun linguaggio di programmazione moderno che è conciso,\nsicuro,\nespressivo\ne interoperabile con Java.</string>
     <string name="summary_chronometer">Un Chronometer è un widget specializzato nel framework Android che fornisce una funzionalità simile a un timer per visualizzare il tempo trascorso. Può essere configurato per contare in avanti o all\'indietro ed è comunemente utilizzato nelle applicazioni che richiedono il cronometro, come quelle di stopwatch o di conto alla rovescia. La classe Chronometer deriva dalla classe TextView, il che significa che eredita tutte le proprietà e i metodi di una TextView. Ciò consente agli sviluppatori di personalizzare facilmente l\'aspetto del Chronometer, inclusi dimensione del testo, colore e carattere.</string>
     <string name="snack_this_is_a_snackbar">Questo è uno snackbar.</string>
     <string name="snack_bar_clicked">cliccato</string>
@@ -468,13 +463,11 @@
     <string name="daily_tip_use_string_resources">Usa risorse stringa per tutto il testo per semplificare la localizzazione.</string>
     <string name="daily_tip_optimize_webp">Ottimizza le immagini con WebP per ridurre la dimensione dell\'APK.</string>
     <string name="daily_tip_enable_proguard">Abilita ProGuard per ridurre e offuscare le build di rilascio.</string>
-    <string name="daily_tip_prefer_compose">Preferisci Compose per nuove UI se miri a dispositivi moderni.</string>
     <string name="daily_tip_livedata_viewmodel">Sfrutta LiveData e ViewModel per UI reattive.</string>
     <string name="daily_tip_workmanager">Usa WorkManager per attività in background affidabili.</string>
     <string name="daily_tip_github_actions">Utilizza GitHub Actions per controlli di build automatizzati.</string>
     <string name="daily_tip_emulator_screen_sizes">Testa la tua app su diverse dimensioni di schermo con l\'emulatore.</string>
     <string name="daily_tip_update_dependencies">Mantieni aggiornate le dipendenze per le ultime funzionalità e correzioni.</string>
-    <string name="daily_tip_kotlin_coroutines">Sfrutta le coroutine di Kotlin per operazioni asincrone.</string>
     <string name="daily_tip_hilt">Integra Hilt per l\'iniezione delle dipendenze.</string>
     <string name="daily_tip_unit_tests">Scrivi test unitari con JUnit ed Espresso.</string>
     <string name="daily_tip_mvvm">Segui l\'architettura MVVM per un codice manutenibile.</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 51680db4..deaf11e1 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -18,11 +18,8 @@
 
     <string name="home">ホーム</string>
     <string name="announcement_title">新しいアプリが登場</string>
-    <string name="announcement_subtitle">最新の Android Studio Tutorials アプリをチェック。Jetpack Compose、Material 3 などを学べます。</string>
     <string name="profile_picture_desc">開発者のプロフィール写真</string>
     <string name="main_card_title">Android Studio のチュートリアルを発見</string>
-    <string name="main_card_subtitle">Kotlin 版と Java 版を収録</string>
-    <string name="main_card_description">Kotlin 版は動的なレッスンや AI アシスタントなどで更新されました。Android 開発の未来を体験してください。</string>
     <string name="get_on_google_play">Google Play で入手しよう</string>
     <string name="learn_more">詳しく見る</string>
     <string name="play_store">Play ストア</string>
@@ -418,8 +415,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat は Android サポートライブラリ appCompat v7 のクラスです。これは、新しい API レベルで追加されたメソッドを古いものでもサポートするために追加されました（たとえば、区切り線）。LinearLayout と LinearLayoutCompat のメソッドを比較すると、Compat レイアウトには LinearLayout のすべてのメソッドが API レベルの制限なしで含まれていることがわかります。例えば、setShowDividers メソッドは API レベル 11 で導入されました。そのため、API レベル 11 未満のプラットフォームを対象とする場合は、setShowDividers（およびそのパラメータ）を LinearLayout の代わりに Linear Layout Compat を使用して呼び出す必要があります。</string>
     <string name="summary_donations">寄付はアプリの運用と機能改善に役立ちます。ご支援ありがとうございます。</string>
     <string name="summary_progress_bar">このインタラクティブなレッスンで、Android のプログレスバーの使い方を学びましょう。レッスンには横向きのプログレスバーと円形のプログレスバーの 2 つのセクションが含まれています。各セクションでは、ダウンロードの進行に伴ってプログレスバーがどのように更新されるかを見ることができます。また、画面下部のフローティングアクションボタンをクリックしてレッスンのコードを表示することもできます。</string>
-    <string name="summary_android_history">Android は Google が開発したモバイルオペレーティングシステムです。2007 年 11 月 5 日にベータ版として初めてリリースされ、最初の商用版である Android 1.0 は 2008 年 9 月 23 日にリリースされました。Android は Linux カーネルの修正版とその他のオープンソースソフトウェアを基にしています。\n\nAndroid Studio は Android アプリ開発のための公式統合開発環境 (IDE) です。2013 年 5 月 15 日の Google I/O カンファレンスで発表され、2014 年 12 月 8 日に一般公開されました。Android Studio は人気の Java IDE である IntelliJ IDEA をベースにしています。\n\nKotlin は、Java 仮想マシン (JVM)、Android、ブラウザ、ネイティブプラットフォームで実行できるクロスプラットフォームのプログラミング言語です。プラハに拠点を置くソフトウェア会社 JetBrains によって作成されました。Kotlin は 2011 年 7 月に初めて発表され、2012 年 2 月にオープンソースプロジェクトとしてリリースされました。\n\nGoogle は 2017 年 5 月 17 日の I/O カンファレンスで、Android アプリ開発の公式言語として Kotlin をサポートすることを発表しました。それ以来、Kotlin は Android 開発者の間で最も人気のある言語の 1 つになりました。Google の 2020 年 10 月のデータによると、Google Play 上位 1000 アプリの 70% 以上が Kotlin を使用しています。</string>
-    <string name="summary_android_features">Android は単なるオペレーティングシステムではなく、ユーザーと開発者のためにさまざまな機能と能力を提供するプラットフォームでもあります。Android の機能には次のようなものがあります:\n\n- 近距離無線通信 (NFC): データの共有、支払い、他のデバイスとのワイヤレス接続が可能。\n- 代替キーボード: さまざまなレイアウト、言語、テーマで入力方法をカスタマイズできる。\n- 赤外線 (IR) 送信: テレビやエアコンなどの家電のリモコンとして電話を使用できる。\n- タッチなし操作: ジェスチャーや音声コマンドを使用して、画面に触れずに電話を操作できる。\n- 自動化: ルーチンやトリガーを設定し、電話が特定のタスクを自動的に実行するようにできる。\n- ワイヤレスアプリダウンロード: ケーブルで電話を接続せずに、コンピュータや Web ブラウザからアプリをインストールできる。\n- ストレージとバッテリーの交換: 電話のメモリを拡張したり、バッテリーを簡単に交換したりできる。\n- カスタムホーム画面: ウィジェット、壁紙、アイコン、ランチャーで電話の外観をカスタマイズできる。\n\nAndroid Studio は Android アプリを開発するための最良のツールです。開発者に次のような多くの機能と利点を提供します:\n\n- 構文ハイライト、コード補完、リファクタリング、デバッグ、テスト、Lint ツールを備えたコードエディタ。\n- ドラッグアンドドロップインターフェースを備えたレイアウトエディタで UI を設計。\n- さまざまなデバイスや構成でアプリをテストするための高速起動とスナップショットをサポートするエミュレータ。\n- 認証、データベース、ストレージ、分析、クラッシュレポートなどのサービスを備えた Firebase 統合。 \n- 依存関係管理、\nカスタマイズ、\n最適化、\n署名、\n配布オプションなどを備えた Gradle ベースのビルドシステム。 \n\nAndroid Studio を使えば、簡潔で安全で表現力があり、Java と相互運用可能な最新のプログラミング言語である Kotlin を使用して、Android デバイス向けの素晴らしいアプリを作成できます。</string>
     <string name="summary_chronometer">クロノメータは Android フレームワークの特殊なウィジェットで、経過時間を表示するタイマーのような機能を提供します。カウントアップまたはカウントダウンに設定でき、ストップウォッチやカウントダウンタイマーなど時間計測が必要なアプリでよく使用されます。Chronometer クラスは TextView クラスから派生しているため、TextView のすべてのプロパティとメソッドを継承します。これにより、開発者は文字サイズ、色、フォントなど、クロノメータの外観を簡単にカスタマイズできます。</string>
     <string name="snack_this_is_a_snackbar">これはスナックバーです。</string>
     <string name="snack_bar_clicked">クリックされました</string>
@@ -468,13 +463,11 @@
     <string name="daily_tip_use_string_resources">ローカライズを簡単にするためにすべてのテキストに文字列リソースを使用。</string>
     <string name="daily_tip_optimize_webp">WebP で画像を最適化して APK サイズを削減。</string>
     <string name="daily_tip_enable_proguard">リリースビルドを縮小して難読化するために ProGuard を有効に。</string>
-    <string name="daily_tip_prefer_compose">最新デバイスをターゲットにする場合は新しい UI に Compose を優先。</string>
     <string name="daily_tip_livedata_viewmodel">LiveData と ViewModel を活用してリアクティブな UI を実現。</string>
     <string name="daily_tip_workmanager">信頼性の高いバックグラウンドタスクには WorkManager を使用。</string>
     <string name="daily_tip_github_actions">自動ビルドチェックに GitHub Actions を利用。</string>
     <string name="daily_tip_emulator_screen_sizes">エミュレーターで異なる画面サイズのアプリをテスト。</string>
     <string name="daily_tip_update_dependencies">最新の機能と修正のために依存関係を更新し続ける。</string>
-    <string name="daily_tip_kotlin_coroutines">非同期処理には Kotlin コルーチンを活用。</string>
     <string name="daily_tip_hilt">依存性注入には Hilt を統合。</string>
     <string name="daily_tip_unit_tests">JUnit と Espresso でユニットテストを書く。</string>
     <string name="daily_tip_mvvm">保守性の高いコードのために MVVM アーキテクチャに従う。</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 7fd7bc66..6f4c7eec 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">동의</string>
     <string name="home">홈</string>
     <string name="announcement_title">새로운 앱이 출시되었습니다.</string>
-    <string name="announcement_subtitle">최신 Android Studio 튜토리얼 앱을 확인해보세요. Jetpack Compose, Material 3 등을 배워보세요.</string>
     <string name="profile_picture_desc">개발자 프로필 사진</string>
     <string name="main_card_title">Android Studio 튜토리얼 살펴보기</string>
-    <string name="main_card_subtitle">Kotlin 및 Java 에디션 제공</string>
-    <string name="main_card_description">Kotlin 에디션이 동적 강의, AI 어시스턴트 등으로 업데이트되었습니다. Android 개발의 미래를 경험해보세요.</string>
     <string name="get_on_google_play">Google Play에서 다운로드</string>
     <string name="learn_more">자세히 알아보기</string>
     <string name="play_store">Play 스토어</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat은 Android 지원 라이브러리 appCompat v7의 클래스입니다. 이는 이전 버전에서 새로운 API 레벨에 추가된 메서드(예: 구분선)를 지원하기 위해 추가되었습니다. LinearLayout과 LinearLayoutCompat의 메서드를 비교하면 Compat 레이아웃이 API 레벨 제한 없이 Linear Layout의 모든 메서드를 가지고 있음을 알 수 있습니다. 예를 들어, setShowDividers 메서드는 API 레벨 11에서 도입되었습니다. 따라서 이 경우 API 레벨이 11 미만인 플랫폼을 대상으로 하는 경우 LinearLayout 대신 Linear Layout Compat을 사용하여 setShowDividers(및 해당 매개변수)를 호출해야 합니다.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">이 대화형 강의를 통해 Android에서 진행률 표시줄을 사용하는 방법을 배워보세요. 이 강의에는 수평 진행률 표시줄과 원형 진행률 표시줄의 두 섹션이 포함되어 있습니다. 각 섹션에서 다운로드가 진행됨에 따라 진행률 표시줄이 어떻게 업데이트되는지 볼 수 있습니다. 화면 하단의 플로팅 액션 버튼을 클릭하여 강의 코드를 볼 수도 있습니다.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android는 Google이 개발한 모바일 운영 체제입니다. 2007년 11월 5일에 베타 버전으로 처음 출시되었으며, 2008년 9월 23일에 첫 상용 버전인 Android 1.0이 출시되었습니다. Android는 수정된 버전의 Linux 커널 및 기타 오픈 소스 소프트웨어를 기반으로 합니다.\n\nAndroid Studio는 Android 앱 개발을 위한 공식 통합 개발 환경(IDE)입니다. 2013년 5월 15일 Google I/O 컨퍼런스에서 발표되었으며, 2014년 12월 8일에 공개되었습니다. Android Studio는 인기 있는 Java IDE인 IntelliJ IDEA를 기반으로 합니다.\n\nKotlin은 Java 가상 머신(JVM), Android, 브라우저 및 네이티브 플랫폼에서 실행할 수 있는 크로스 플랫폼 프로그래밍 언어입니다. 프라하에 본사를 둔 소프트웨어 회사인 JetBrains에서 만들었습니다. Kotlin은 2011년 7월에 처음 발표되었으며, 2012년 2월에 오픈 소스 프로젝트로 출시되었습니다.\n\nGoogle은 2017년 5월 17일 I/O 컨퍼런스에서 Android 앱 개발을 위한 공식 언어로 Kotlin을 지원한다고 발표했습니다. 그 이후로 Kotlin은 Android 개발자들에게 가장 인기 있는 언어 중 하나가 되었습니다. 2020년 10월 Google 데이터에 따르면 Google Play 상위 1000개 앱 중 70% 이상이 Kotlin을 사용합니다.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">크로노미터는 경과 시간을 표시하기 위한 타이머와 같은 기능을 제공하는 Android 프레임워크의 특수 위젯입니다. 카운트 업 또는 카운트 다운하도록 구성할 수 있으며, 스톱워치 또는 카운트다운 타이머 앱과 같이 시간 기록이 필요한 애플리케이션에서 일반적으로 사용됩니다. 크로노미터 클래스는 TextView 클래스에서 파생되므로 TextView의 모든 속성과 메서드를 상속합니다. 이를 통해 개발자는 텍스트 크기, 색상 및 글꼴을 포함하여 크로노미터의 모양을 쉽게 사용자 정의할 수 있습니다.</string>
     <string name="snack_this_is_a_snackbar">이것은 스낵바입니다.</string>
     <string name="snack_bar_clicked">클릭됨</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">현지화를 단순화하기 위해 모든 텍스트에 문자열 리소스를 사용하세요.</string>
     <string name="daily_tip_optimize_webp">APK 크기를 줄이기 위해 WebP로 이미지를 최적화하세요.</string>
     <string name="daily_tip_enable_proguard">릴리스 빌드를 축소하고 난독화하기 위해 ProGuard를 활성화하세요.</string>
-    <string name="daily_tip_prefer_compose">최신 기기를 대상으로 하는 경우 새로운 UI에 Compose를 선호하세요.</string>
     <string name="daily_tip_livedata_viewmodel">반응형 UI를 위해 LiveData와 ViewModel을 활용하세요.</string>
     <string name="daily_tip_workmanager">안정적인 백그라운드 작업을 위해 WorkManager를 사용하세요.</string>
     <string name="daily_tip_github_actions">자동화된 빌드 검사를 위해 GitHub Actions를 활용하세요.</string>
     <string name="daily_tip_emulator_screen_sizes">에뮬레이터로 다양한 화면 크기에서 앱을 테스트하세요.</string>
     <string name="daily_tip_update_dependencies">최신 기능과 수정 사항을 위해 종속성을 업데이트 상태로 유지하세요.</string>
-    <string name="daily_tip_kotlin_coroutines">비동기 작업을 위해 Kotlin 코루틴을 활용하세요.</string>
     <string name="daily_tip_hilt">종속성 주입을 위해 Hilt를 통합하세요.</string>
     <string name="daily_tip_unit_tests">JUnit과 Espresso로 단위 테스트를 작성하세요.</string>
     <string name="daily_tip_mvvm">유지보수가 용이한 코드를 위해 MVVM 아키텍처를 따르세요.</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index d374184e..07886359 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -18,11 +18,8 @@
 
     <string name="home">Strona główna</string>
     <string name="announcement_title">Nowa aplikacja już jest</string>
-    <string name="announcement_subtitle">Sprawdź najnowszą aplikację Android Studio Tutorials. Poznaj Jetpack Compose, Material 3 i nie tylko.</string>
     <string name="profile_picture_desc">Zdjęcie profilowe dewelopera</string>
     <string name="main_card_title">Odkryj samouczki Android Studio</string>
-    <string name="main_card_subtitle">Zawiera edycje Kotlin i Java</string>
-    <string name="main_card_description">Edycja Kotlin została zaktualizowana o dynamiczne lekcje, asystenta AI i więcej. Doświadcz przyszłości tworzenia aplikacji na Androida.</string>
     <string name="get_on_google_play">Pobierz z Google Play</string>
     <string name="learn_more">Dowiedz się więcej</string>
     <string name="play_store">Sklep Play</string>
@@ -418,8 +415,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat to klasa w bibliotece wsparcia Android appCompat v7. Dodano ją, aby obsługiwać metody wprowadzone w nowszych poziomach API na starszych (takie jak dzielniki). Jeśli porównasz metody w LinearLayout i LinearLayoutCompat, zobaczysz, że układ Compat ma wszystkie metody LinearLayout bez ograniczeń poziomu API. Na przykład metoda setShowDividers została wprowadzona na poziomie API 11. Zatem w tym przypadku setShowDividers (i jej parametry) należy wywoływać za pomocą Linear Layout Compat zamiast LinearLayout, jeśli celujesz w platformę z poziomem API poniżej 11.</string>
     <string name="summary_donations">Twoja darowizna pomaga utrzymać aplikację i ulepszać jej funkcje. Dziękujemy za Twoją hojność.</string>
     <string name="summary_progress_bar">Dowiedz się, jak używać pasków postępu w Androidzie dzięki tej interaktywnej lekcji. Lekcja zawiera dwie sekcje: jedną dla poziomego paska postępu i jedną dla okrągłego paska postępu. W każdej sekcji możesz zobaczyć, jak pasek postępu aktualizuje się w miarę postępu pobierania. Możesz także zobaczyć kod lekcji, klikając przycisk akcji unoszący się na dole ekranu.</string>
-    <string name="summary_android_history">Android to mobilny system operacyjny opracowany przez Google. Został po raz pierwszy wydany jako wersja beta 5 listopada 2007 r., a pierwsza komercyjna wersja, Android 1.0, została uruchomiona 23 września 2008 r. Android opiera się na zmodyfikowanej wersji jądra Linux i innym oprogramowaniu open source.\n\nAndroid Studio to oficjalne zintegrowane środowisko programistyczne (IDE) do tworzenia aplikacji na Androida. Zostało ogłoszone przez Google na konferencji I/O 15 maja 2013 r. i udostępnione publicznie 8 grudnia 2014 r. Android Studio bazuje na IntelliJ IDEA, popularnym środowisku Java IDE.\n\nKotlin to wieloplatformowy język programowania, który może działać na maszynie wirtualnej Java (JVM), Androidzie, w przeglądarce i na platformach natywnych. Został stworzony przez JetBrains, firmę programistyczną z siedzibą w Pradze. Kotlin został po raz pierwszy ogłoszony w lipcu 2011 r. i wydany jako projekt open source w lutym 2012 r.\n\nGoogle ogłosiło wsparcie dla Kotlina jako oficjalnego języka do tworzenia aplikacji na Androida na konferencji I/O 17 maja 2017 r. Od tego czasu Kotlin stał się jednym z najpopularniejszych języków wśród deweloperów Androida. Według danych Google z października 2020 r. ponad 70% z 1000 najlepszych aplikacji w Google Play używa Kotlina.</string>
-    <string name="summary_android_features">Android to nie tylko system operacyjny, ale także platforma oferująca szereg funkcji i możliwości dla użytkowników i deweloperów. Do funkcji Androida należą:\n\n- Near Field Communication (NFC), która umożliwia udostępnianie danych, dokonywanie płatności i łączenie się z innymi urządzeniami bezprzewodowo.\n- Alternatywne klawiatury, które pozwalają dostosować metodę wprowadzania za pomocą różnych układów, języków i motywów.\n- Transmisja podczerwieni, która pozwala używać telefonu jako pilota do telewizorów, klimatyzatorów i innych urządzeń.\n- Sterowanie bezdotykowe, które pozwala wykonywać czynności na telefonie bez dotykania ekranu, używając gestów lub poleceń głosowych.\n- Automatyzacja, która umożliwia ustawianie rutyn i wyzwalaczy, aby telefon automatycznie wykonywał określone zadania.\n- Bezprzewodowe pobieranie aplikacji, które pozwala instalować aplikacje z komputera lub przeglądarki internetowej bez podłączania telefonu kablem.\n- Wymiana pamięci i baterii, która daje możliwość łatwego rozszerzenia pamięci telefonu lub wymiany jego baterii.\n- Personalizowany ekran główny, który pozwala dostosować wygląd telefonu za pomocą widżetów, tapet, ikon i launcherów.\n\nAndroid Studio to najlepsze narzędzie do tworzenia aplikacji na Androida. Oferuje ono wiele funkcji i korzyści dla deweloperów, takich jak:\n\n- Edytor kodu z podświetlaniem składni, uzupełnianiem kodu, refaktoryzacją, debugowaniem, testowaniem i narzędziami lint.\n- Edytor układu z interfejsem drag-and-drop do projektowania interfejsów użytkownika.\n- Emulator z szybkim uruchamianiem i obsługą migawek do testowania aplikacji na różnych urządzeniach i konfiguracjach.\n- Integracja z Firebase z usługami takimi jak uwierzytelnianie, baza danych, przechowywanie, analityka, raportowanie awarii i wiele innych. \n- System budowania oparty na Gradle z zarządzaniem zależnościami,\npersonalizacją,\noptymalizacją,\npodpisywaniem,\nopcje dystrybucji i więcej. \n\nDzięki Android Studio możesz tworzyć niesamowite aplikacje na urządzenia z Androidem, używając Kotlina,\nnowoczesnego języka programowania, który jest zwięzły,\nbezpieczny,\nekspresyjny\ni współdziała z Javą.</string>
     <string name="summary_chronometer">Chronometr to specjalizowany widget w frameworku Android, który zapewnia funkcjonalność podobną do timera do wyświetlania upływającego czasu. Można go skonfigurować do liczenia w górę lub w dół i jest powszechnie używany w aplikacjach wymagających pomiaru czasu, takich jak stopery lub liczniki czasu. Klasa Chronometer pochodzi od klasy TextView, co oznacza, że dziedziczy wszystkie właściwości i metody TextView. Dzięki temu deweloperzy mogą łatwo dostosować wygląd Chronometru, w tym rozmiar tekstu, kolor i czcionkę.</string>
     <string name="snack_this_is_a_snackbar">To jest snackbar.</string>
     <string name="snack_bar_clicked">kliknięto</string>
@@ -468,13 +463,11 @@
     <string name="daily_tip_use_string_resources">Używaj zasobów string dla całego tekstu, by ułatwić lokalizację.</string>
     <string name="daily_tip_optimize_webp">Optymalizuj obrazy za pomocą WebP, aby zmniejszyć rozmiar APK.</string>
     <string name="daily_tip_enable_proguard">Włącz ProGuard, aby zmniejszyć i zaciemnić wydania.</string>
-    <string name="daily_tip_prefer_compose">Preferuj Compose dla nowych UI, jeśli celujesz w nowoczesne urządzenia.</string>
     <string name="daily_tip_livedata_viewmodel">Wykorzystaj LiveData i ViewModel dla reaktywnych UI.</string>
     <string name="daily_tip_workmanager">Używaj WorkManager do niezawodnych zadań w tle.</string>
     <string name="daily_tip_github_actions">Wykorzystaj GitHub Actions do zautomatyzowanych kontroli buildów.</string>
     <string name="daily_tip_emulator_screen_sizes">Testuj aplikację na różnych rozmiarach ekranów w emulatorze.</string>
     <string name="daily_tip_update_dependencies">Aktualizuj zależności, aby mieć najnowsze funkcje i poprawki.</string>
-    <string name="daily_tip_kotlin_coroutines">Wykorzystaj Kotlin Coroutines do operacji asynchronicznych.</string>
     <string name="daily_tip_hilt">Zintegruj Hilt do wstrzykiwania zależności.</string>
     <string name="daily_tip_unit_tests">Pisz testy jednostkowe za pomocą JUnit i Espresso.</string>
     <string name="daily_tip_mvvm">Stosuj architekturę MVVM dla łatwego w utrzymaniu kodu.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 29cd288f..26c7311f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Concordo</string>
     <string name="home">Início</string>
     <string name="announcement_title">Um Novo Aplicativo Chegou.</string>
-    <string name="announcement_subtitle">Confira o mais recente aplicativo de Tutoriais do Android Studio. Aprenda Jetpack Compose, Material 3 e muito mais.</string>
     <string name="profile_picture_desc">Imagem do perfil do desenvolvedor</string>
     <string name="main_card_title">Descubra os Tutoriais do Android Studio</string>
-    <string name="main_card_subtitle">Apresentando as edições Kotlin e Java</string>
-    <string name="main_card_description">A Edição Kotlin foi atualizada com lições dinâmicas, assistente de IA e muito mais. Experimente o futuro do desenvolvimento Android.</string>
     <string name="get_on_google_play">Disponível no Google Play</string>
     <string name="learn_more">Saiba mais</string>
     <string name="play_store">Play Store</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">O LinearLayoutCompat é uma classe na biblioteca de suporte do Android appCompat v7. Foi adicionado para suportar métodos que foram adicionados em níveis de API mais recentes em versões antigas (como divisores). Se você comparar os métodos no LinearLayout e no LinearLayoutCompat, poderá ver que o layout Compat tem todos os métodos do LinearLayout sem qualquer limitação de nível de API. Por exemplo, o método setShowDividers foi introduzido no nível de API 11. Portanto, neste caso, o setShowDividers (e seus parâmetros) deve ser invocado usando o LinearLayoutCompat em vez do LinearLayout se você estiver visando uma plataforma com nível de API inferior a 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Aprenda a usar barras de progresso no Android com esta lição interativa. Esta lição inclui duas seções: uma para uma barra de progresso horizontal e outra para uma barra de progresso circular. Em cada seção, você pode ver como a barra de progresso é atualizada à medida que um download avança. Você também pode visualizar o código da lição clicando no botão de ação flutuante na parte inferior da tela.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">O Android é um sistema operacional móvel desenvolvido pelo Google. Foi lançado pela primeira vez como uma versão beta em 5 de novembro de 2007 e a primeira versão comercial, o Android 1.0, foi lançada em 23 de setembro de 2008. O Android é baseado em uma versão modificada do kernel do Linux e outro software de código aberto.\n\nO Android Studio é o ambiente de desenvolvimento integrado (IDE) oficial para o desenvolvimento de aplicativos Android. Foi anunciado pelo Google em sua conferência I/O em 15 de maio de 2013 e lançado para uso público em 8 de dezembro de 2014. O Android Studio é baseado no IntelliJ IDEA, um popular IDE Java.\n\nO Kotlin é uma linguagem de programação multiplataforma que pode ser executada na Máquina Virtual Java (JVM), Android, navegador e plataformas nativas. Foi criado pela JetBrains, uma empresa de software com sede em Praga. O Kotlin foi anunciado pela primeira vez em julho de 2011 e lançado como um projeto de código aberto em fevereiro de 2012.\n\nO Google anunciou seu suporte ao Kotlin como linguagem oficial para o desenvolvimento de aplicativos Android em sua conferência I/O em 17 de maio de 2017. Desde então, o Kotlin se tornou uma das linguagens mais populares para desenvolvedores Android. De acordo com os dados do Google de outubro de 2020, mais de 70% dos 1000 principais aplicativos da Google Play usam Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Um Cronômetro é um widget especializado no framework do Android que fornece uma funcionalidade semelhante a um temporizador para exibir o tempo decorrido. Ele pode ser configurado para contar para cima ou para baixo e é comumente usado em aplicativos que exigem cronometragem, como aplicativos de cronômetro ou contagem regressiva. A classe Cronômetro é derivada da classe TextView, o que significa que ela herda todas as propriedades e métodos de um TextView. Isso permite que os desenvolvedores personalizem facilmente a aparência do Cronômetro, incluindo o tamanho do texto, cor e fonte.</string>
     <string name="snack_this_is_a_snackbar">Isto é um snackbar.</string>
     <string name="snack_bar_clicked">clicado</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Use recursos de string para todo o texto para simplificar a localização.</string>
     <string name="daily_tip_optimize_webp">Otimize as imagens com WebP para reduzir o tamanho do APK.</string>
     <string name="daily_tip_enable_proguard">Habilite o ProGuard para reduzir e ofuscar as compilações de lançamento.</string>
-    <string name="daily_tip_prefer_compose">Prefira o Compose para novas UIs se estiver visando dispositivos modernos.</string>
     <string name="daily_tip_livedata_viewmodel">Aproveite o LiveData e o ViewModel para UIs reativas.</string>
     <string name="daily_tip_workmanager">Use o WorkManager para tarefas em segundo plano confiáveis.</string>
     <string name="daily_tip_github_actions">Utilize o GitHub Actions para verificações de compilação automatizadas.</string>
     <string name="daily_tip_emulator_screen_sizes">Teste seu aplicativo em diferentes tamanhos de tela com o emulador.</string>
     <string name="daily_tip_update_dependencies">Mantenha as dependências atualizadas para os recursos e correções mais recentes.</string>
-    <string name="daily_tip_kotlin_coroutines">Aproveite as Corrotinas do Kotlin para operações assíncronas.</string>
     <string name="daily_tip_hilt">Integre o Hilt para injeção de dependência.</string>
     <string name="daily_tip_unit_tests">Escreva testes unitários com JUnit e Espresso.</string>
     <string name="daily_tip_mvvm">Siga a arquitetura MVVM para um código de fácil manutenção.</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 8bf7f088..6f8f205a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -19,8 +19,6 @@
     <string name="announcement_subtitle">Descoperă cea mai recentă aplicație Android Studio Tutorials.</string>
     <string name="profile_picture_desc">Poza de profil pentru dezvoltatori</string>
     <string name="main_card_title">Descoperă Tutorialele Android Studio</string>
-    <string name="main_card_subtitle">Disponibilă în edițiile Kotlin și Java</string>
-    <string name="main_card_description">Ediția Kotlin a fost actualizată cu lecții dinamice, asistent AI și multe altele. Experimentează viitorul dezvoltării Android.</string>
     <string name="get_on_google_play">Ia-l de pe Google Play</string>
     <string name="learn_more">Află mai multe</string>
     <string name="play_store">Magazin Play</string>
@@ -404,8 +402,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat este o clasă din biblioteca de suport Android appCompat v7. A fost adăugată pentru a suporta metodele care au fost adăugate în niveluri API mai noi pe cele vechi (cum ar fi divizoarele). Dacă comparați metodele din LinearLayout și LinearLayoutCompat, puteți vedea că aspectul Compat are toate metodele LinearLayout fără nicio limitare a nivelului API. De exemplu, metoda setShowDividers a fost introdusă la nivelul API 11. Prin urmare, în acest caz, setShowDividers (și parametrii săi) ar trebui să fie invocate utilizând Linear Layout Compat în loc de LinearLayout dacă vizați o platformă cu nivel API sub 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Aflați cum să utilizați barele de progres în Android cu această lecție interactivă. Această lecție include două secțiuni: una pentru o bară de progres orizontală și una pentru o bară de progres circulară. În fiecare secțiune, puteți vedea cum bara de progres se actualizează pe măsură ce o descărcare progresează. De asemenea, puteți vizualiza codul pentru lecție făcând clic pe butonul de acțiune plutitor din partea de jos a ecranului.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android este un sistem de operare mobil dezvoltat de Google. A fost lansat pentru prima dată ca versiune beta pe 5 noiembrie 2007, iar prima versiune comercială, Android 1.0, a fost lansată pe 23 septembrie 2008. Android se bazează pe o versiune modificată a nucleului Linux și pe alte software-uri open source.\n\nAndroid Studio este mediul oficial de dezvoltare integrat (IDE) pentru dezvoltarea aplicațiilor Android. A fost anunțat de Google la conferința I/O din 15 mai 2013 și lansat pentru uz public pe 8 decembrie 2014. Android Studio se bazează pe IntelliJ IDEA, un IDE Java popular.\n\nKotlin este un limbaj de programare multi-platformă care poate rula pe mașina virtuală Java (JVM), Android, browser și platforme native. A fost creat de JetBrains, o companie de software cu sediul în Praga. Kotlin a fost anunțat pentru prima dată în iulie 2011 și lansat ca proiect open source în februarie 2012.\n\nGoogle a anunțat suportul pentru Kotlin ca limbaj oficial pentru dezvoltarea aplicațiilor Android la conferința I/O din 17 mai 2017. De atunci, Kotlin a devenit unul dintre cele mai populare limbaje pentru dezvoltatorii Android. Conform datelor Google din octombrie 2020, peste 70% dintre primele 1000 de aplicații din Google Play folosesc Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Un Cronometru este un widget specializat în cadrul Android care oferă o funcționalitate similară cu un cronometru pentru afișarea timpului scurs. Poate fi configurat să numere în sus sau în jos și este utilizat în mod obișnuit în aplicațiile care necesită înregistrarea timpului, cum ar fi aplicațiile de cronometru sau de numărătoare inversă. Clasa Chronometer este derivată din clasa TextView, ceea ce înseamnă că moștenește toate proprietățile și metodele unui TextView. Acest lucru permite dezvoltatorilor să personalizeze cu ușurință aspectul cronometrului, inclusiv dimensiunea textului, culoarea și fontul.</string>
     <string name="snack_this_is_a_snackbar">Acesta este un snack bar.</string>
     <string name="snack_bar_clicked">apăsat</string>
@@ -463,7 +459,6 @@
     <string name="daily_tip_github_actions">Utilizați GitHub Acțiuni pentru controale automatizate de construire.</string>
     <string name="daily_tip_emulator_screen_sizes">Testați aplicația pe diferite dimensiuni ale ecranului cu emulatorul.</string>
     <string name="daily_tip_update_dependencies">Păstrați dependențe actualizate pentru cele mai recente caracteristici și remedieri.</string>
-    <string name="daily_tip_kotlin_coroutines">Pârghie Kotlin Coroutines pentru operațiuni asincrone.</string>
     <string name="daily_tip_hilt">Integraţi Hilt pentru injectarea dependenţei.</string>
     <string name="daily_tip_unit_tests">Scrieţi teste de unitate cu JUnit şi Espresso.</string>
     <string name="daily_tip_mvvm">Urmăriți arhitectura MVVM pentru un cod durabil.</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 24f277df..9dd26e44 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -19,8 +19,6 @@
     <string name="announcement_subtitle">Оцените последнее приложение Android Studio Tutorials.</string>
     <string name="profile_picture_desc">Изображение профиля разработчика</string>
     <string name="main_card_title">Откройте для себя уроки Android Studio</string>
-    <string name="main_card_subtitle">Включая версии на Kotlin и Java</string>
-    <string name="main_card_description">Версия Kotlin была обновлена динамическими уроками, помощником с ИИ и многим другим. Ощутите будущее разработки Android.</string>
     <string name="get_on_google_play">Получить в Google Play</string>
     <string name="learn_more">Узнать больше</string>
     <string name="play_store">Play Маркет</string>
@@ -396,8 +394,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat — это класс в библиотеке поддержки Android appCompat v7. Он был добавлен для поддержки методов, которые были добавлены в более новые уровни API для старых (например, разделителей). Если вы сравните методы в LinearLayout и LinearLayoutCompat, вы увидите, что макет Compat имеет все методы LinearLayout без каких-либо ограничений по уровню API. Например, метод setShowDividers был введен на уровне API 11. Таким образом, в этом случае setShowDividers (и его параметры) следует вызывать с использованием Linear Layout Compat вместо LinearLayout, если вы ориентируетесь на платформу с уровнем API ниже 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Узнайте, как использовать индикаторы выполнения в Android с этим интерактивным уроком. Этот урок включает два раздела: один для горизонтального индикатора выполнения и один для кругового индикатора выполнения. В каждом разделе вы можете увидеть, как индикатор выполнения обновляется по мере загрузки. Вы также можете просмотреть код урока, нажав на плавающую кнопку действия в нижней части экрана.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android — это мобильная операционная система, разработанная Google. Впервые она была выпущена в виде бета-версии 5 ноября 2007 года, а первая коммерческая версия, Android 1.0, была запущена 23 сентября 2008 года. Android основан на модифицированной версии ядра Linux и другом программном обеспечении с открытым исходным кодом.\n\nAndroid Studio — это официальная интегрированная среда разработки (IDE) для создания Android-приложений. Она была анонсирована Google на конференции I/O 15 мая 2013 года и выпущена для публичного использования 8 декабря 2014 года. Android Studio основана на IntelliJ IDEA, популярной IDE для Java.\n\nKotlin — это кроссплатформенный язык программирования, который может работать на виртуальной машине Java (JVM), Android, в браузере и на нативных платформах. Он был создан JetBrains, компанией-разработчиком программного обеспечения из Праги. Kotlin был впервые анонсирован в июле 2011 года и выпущен как проект с открытым исходным кодом в феврале 2012 года.\n\nGoogle объявил о своей поддержке Kotlin как официального языка для разработки Android-приложений на конференции I/O 17 мая 2017 года. С тех пор Kotlin стал одним из самых популярных языков для Android-разработчиков. Согласно данным Google от октября 2020 года, более 70% из 1000 лучших приложений в Google Play используют Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Хронометр — это специализированный виджет во фреймворке Android, который предоставляет функциональность, аналогичную таймеру, для отображения прошедшего времени. Его можно настроить для отсчета вверх или вниз, и он обычно используется в приложениях, требующих хронометража, таких как секундомеры или таймеры обратного отсчета. Класс Chronometer является производным от класса TextView, что означает, что он наследует все свойства и методы TextView. Это позволяет разработчикам легко настраивать внешний вид хронометра, включая размер текста, цвет и шрифт.</string>
     <string name="snack_this_is_a_snackbar">Это всплывающая панель.</string>
     <string name="snack_bar_clicked">нажато</string>
@@ -455,7 +451,6 @@
     <string name="daily_tip_github_actions">Используйте GitHub Действия для автоматизированных проверок сборки.</string>
     <string name="daily_tip_emulator_screen_sizes">Проверьте свое приложение на разных размерах экрана с помощью эмулятора.</string>
     <string name="daily_tip_update_dependencies">Держите зависимости обновленными для последних функций и исправлений.</string>
-    <string name="daily_tip_kotlin_coroutines">Использование Kotlin Coroutines для асинхронных операций.</string>
     <string name="daily_tip_hilt">Интегрируйте Hilt для инъекций зависимости.</string>
     <string name="daily_tip_unit_tests">Пишите единичные тесты с JUnit и Espresso.</string>
     <string name="daily_tip_mvvm">Следуйте архитектуре MVVM для поддерживающего кода.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index c0c5f03c..152ccf01 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Godkänn</string>
     <string name="home">Hem</string>
     <string name="announcement_title">En ny app har kommit.</string>
-    <string name="announcement_subtitle">Kolla in den senaste appen Android Studio Tutorials. Lär dig Jetpack Compose, Material 3 och mer.</string>
     <string name="profile_picture_desc">Utvecklarprofilbild</string>
     <string name="main_card_title">Upptäck Android Studio Tutorials</string>
-    <string name="main_card_subtitle">Med Kotlin- och Java-utgåvor</string>
-    <string name="main_card_description">Kotlin-utgåvan har uppdaterats med dynamiska lektioner, AI-assistent och mer. Upplev framtiden för Android-utveckling.</string>
     <string name="get_on_google_play">Hämta den på Google Play</string>
     <string name="learn_more">Läs mer</string>
     <string name="play_store">Play Butik</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat är en klass i Android-stöd-biblioteket appCompat v7. Den lades till för att stödja metoder som lades till i nyare API-nivåer på gamla (som avdelare). Om du jämför metoderna i LinearLayout och LinearLayoutCompat kan du se att Compat-layouten har alla metoder från LinearLayout utan någon API-nivåbegränsning. Till exempel introducerades metoden setShowDividers på API-nivå 11. Så i detta fall bör setShowDividers (och dess parametrar) anropas med LinearLayoutCompat istället för LinearLayout om du riktar dig mot en plattform med API-nivå under 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Lär dig hur du använder förloppsindikatorer i Android med denna interaktiva lektion. Lektionen innehåller två avsnitt: ett för en horisontell förloppsindikator och ett för en cirkulär förloppsindikator. I varje avsnitt kan du se hur förloppsindikatorn uppdateras när en nedladdning fortskrider. Du kan också se koden för lektionen genom att klicka på den flytande åtgärdsknappen längst ner på skärmen.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android är ett mobilt operativsystem utvecklat av Google. Det släpptes först som en betaversion den 5 november 2007 och den första kommersiella versionen, Android 1.0, lanserades den 23 september 2008. Android är baserat på en modifierad version av Linux-kärnan och annan öppen källkodsprogramvara.\n\nAndroid Studio är den officiella integrerade utvecklingsmiljön (IDE) för Android-apputveckling. Det tillkännagavs av Google på dess I/O-konferens den 15 maj 2013 och släpptes för allmän användning den 8 december 2014. Android Studio är baserat på IntelliJ IDEA, en populär Java-IDE.\n\nKotlin är ett plattformsoberoende programmeringsspråk som kan köras på Java Virtual Machine (JVM), Android, webbläsare och inbyggda plattformar. Det skapades av JetBrains, ett mjukvaruföretag baserat i Prag. Kotlin tillkännagavs först i juli 2011 och släpptes som ett öppen källkodsprojekt i februari 2012.\n\nGoogle tillkännagav sitt stöd för Kotlin som ett officiellt språk för Android-apputveckling på sin I/O-konferens den 17 maj 2017. Sedan dess har Kotlin blivit ett av de mest populära språken för Android-utvecklare. Enligt Googles data från oktober 2020 använder mer än 70 %% av de 1000 bästa apparna på Google Play Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">En kronometer är en specialiserad widget i Android-ramverket som tillhandahåller en timer-liknande funktionalitet för att visa förfluten tid. Den kan konfigureras för att räkna upp eller ner, och används vanligtvis i applikationer som kräver tidtagning, såsom stoppur eller nedräkningstimer-appar. Chronometer-klassen är härledd från TextView-klassen, vilket innebär att den ärver alla egenskaper och metoder från en TextView. Detta gör det möjligt för utvecklare att enkelt anpassa utseendet på kronometern, inklusive dess textstorlek, färg och teckensnitt.</string>
     <string name="snack_this_is_a_snackbar">Detta är en snackbar.</string>
     <string name="snack_bar_clicked">klickad</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Använd strängresurser för all text för att förenkla lokalisering.</string>
     <string name="daily_tip_optimize_webp">Optimera bilder med WebP för att minska APK-storleken.</string>
     <string name="daily_tip_enable_proguard">Aktivera ProGuard för att krympa och obfuskera release-versioner.</string>
-    <string name="daily_tip_prefer_compose">Föredra Compose för nya UI:n om du riktar dig mot moderna enheter.</string>
     <string name="daily_tip_livedata_viewmodel">Dra nytta av LiveData och ViewModel för reaktiva UI:n.</string>
     <string name="daily_tip_workmanager">Använd WorkManager för tillförlitliga bakgrundsuppgifter.</string>
     <string name="daily_tip_github_actions">Använd GitHub Actions för automatiserade byggkontroller.</string>
     <string name="daily_tip_emulator_screen_sizes">Testa din app på olika skärmstorlekar med emulatorn.</string>
     <string name="daily_tip_update_dependencies">Håll beroenden uppdaterade för de senaste funktionerna och fixarna.</string>
-    <string name="daily_tip_kotlin_coroutines">Utnyttja Kotlin Coroutines för asynkrona operationer.</string>
     <string name="daily_tip_hilt">Integrera Hilt för beroendeinjektion.</string>
     <string name="daily_tip_unit_tests">Skriv enhetstester med JUnit och Espresso.</string>
     <string name="daily_tip_mvvm">Följ MVVM-arkitekturen för underhållbar kod.</string>
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
index 68a4ec62..373b6fcd 100644
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ b/app/src/main/res/values-th-rTH/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">ยอมรับ</string>
     <string name="home">หน้าแรก</string>
     <string name="announcement_title">แอปใหม่มาแล้ว.</string>
-    <string name="announcement_subtitle">พบกับแอป Android Studio Tutorials ล่าสุด เรียนรู้ Jetpack Compose, Material 3 และอื่นๆ</string>
     <string name="profile_picture_desc">รูปโปรไฟล์นักพัฒนา</string>
     <string name="main_card_title">ค้นพบ Android Studio Tutorials</string>
-    <string name="main_card_subtitle">นำเสนอฉบับ Kotlin และ Java</string>
-    <string name="main_card_description">ฉบับ Kotlin ได้รับการอัปเดตด้วยบทเรียนแบบไดนามิก, ผู้ช่วย AI และอื่นๆ สัมผัสอนาคตของการพัฒนา Android.</string>
     <string name="get_on_google_play">ดาวน์โหลดได้ที่ Google Play</string>
     <string name="learn_more">เรียนรู้เพิ่มเติม</string>
     <string name="play_store">Play Store</string>
@@ -372,8 +369,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat คือคลาสในไลบรารีสนับสนุนของ Android appCompat v7 ถูกเพิ่มเข้ามาเพื่อรองรับเมธอดที่เพิ่มเข้ามาใน API level ที่ใหม่กว่าบนเมธอดเก่า (เช่น dividers) หากคุณเปรียบเทียบเมธอดใน LinearLayout และ LinearLayoutCompat, คุณจะเห็นว่า Compat layout มีเมธอดทั้งหมดของ Linear Layout โดยไม่มีข้อจำกัดของ API level ตัวอย่างเช่น, เมธอด setShowDividers ถูกนำมาใช้ใน API level 11 ดังนั้น, ในกรณีนี้, setShowDividers (และพารามิเตอร์ของมัน) ควรถูกเรียกใช้โดยใช้ Linear Layout Compat แทน LinearLayout หากคุณกำหนดเป้าหมายแพลตฟอร์มที่มี API level ต่ำกว่า 11</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">เรียนรู้วิธีใช้แถบความคืบหน้าใน Android ด้วยบทเรียนเชิงโต้ตอบนี้ บทเรียนนี้มีสองส่วน: ส่วนหนึ่งสำหรับแถบความคืบหน้าแนวนอนและอีกส่วนหนึ่งสำหรับแถบความคืบหน้าวงกลม ในแต่ละส่วน, คุณสามารถดูว่าแถบความคืบหน้าอัปเดตอย่างไรเมื่อการดาวน์โหลดดำเนินไป คุณยังสามารถดูโค้ดสำหรับบทเรียนได้โดยคลิกที่ปุ่มการกระทำลอยน้ำที่ด้านล่างของหน้าจอ</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android เป็นระบบปฏิบัติการมือถือที่พัฒนาโดย Google เปิดตัวครั้งแรกในรูปแบบเบต้าเมื่อวันที่ 5 พฤศจิกายน 2007 และเวอร์ชันเชิงพาณิชย์ครั้งแรก, Android 1.0, เปิดตัวเมื่อวันที่ 23 กันยายน 2008 Android ใช้เคอร์เนล Linux ที่แก้ไขแล้วและซอฟต์แวร์โอเพนซอร์สอื่นๆ เป็นพื้นฐาน\n\nAndroid Studio เป็นสภาพแวดล้อมการพัฒนาแบบเบ็ดเสร็จ (IDE) อย่างเป็นทางการสำหรับการพัฒนาแอป Android ประกาศโดย Google ในงาน I/O conference เมื่อวันที่ 15 พฤษภาคม 2013 และเปิดให้ใช้งานสาธารณะเมื่อวันที่ 8 ธันวาคม 2014 Android Studio ใช้ IntelliJ IDEA ซึ่งเป็น Java IDE ยอดนิยมเป็นพื้นฐาน\n\nKotlin เป็นภาษาโปรแกรมข้ามแพลตฟอร์มที่สามารถทำงานบน Java Virtual Machine (JVM), Android, เบราว์เซอร์ และแพลตฟอร์มเนทีฟ สร้างขึ้นโดย JetBrains, บริษัทซอฟต์แวร์ในกรุงปราก Kotlin ประกาศครั้งแรกในเดือนกรกฎาคม 2011 และเปิดตัวเป็นโครงการโอเพนซอร์สในเดือนกุมภาพันธ์ 2012\n\nGoogle ประกาศสนับสนุน Kotlin เป็นภาษาอย่างเป็นทางการสำหรับการพัฒนาแอป Android ในงาน I/O conference เมื่อวันที่ 17 พฤษภาคม 2017 ตั้งแต่นั้นมา, Kotlin ได้กลายเป็นหนึ่งในภาษาที่ได้รับความนิยมมากที่สุดสำหรับนักพัฒนา Android จากข้อมูลของ Google ณ เดือนตุลาคม 2020, มากกว่า 70% ของแอป 1000 อันดับแรกบน Google Play ใช้ Kotlin</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Chronometer เป็นวิดเจ็ตพิเศษในเฟรมเวิร์ก Android ที่ให้ฟังก์ชันการทำงานคล้ายนาฬิกาจับเวลาสำหรับแสดงเวลาที่ผ่านไป สามารถกำหนดค่าให้นับขึ้นหรือลงได้ และมักใช้ในแอปพลิเคชันที่ต้องการการจับเวลา เช่น แอปนาฬิกาจับเวลาหรือแอปนับถอยหลัง คลาส Chronometer สืบทอดมาจากคลาส TextView ซึ่งหมายความว่ามันสืบทอดคุณสมบัติและเมธอดทั้งหมดของ TextView ซึ่งช่วยให้นักพัฒนาสามารถปรับแต่งรูปลักษณ์ของ Chronometer ได้ง่าย รวมถึงขนาดตัวอักษร, สี, และแบบอักษร</string>
     <string name="snack_this_is_a_snackbar">นี่คือ Snackbar.</string>
     <string name="snack_bar_clicked">คลิกแล้ว</string>
@@ -423,13 +418,11 @@
     <string name="daily_tip_use_string_resources">ใช้ทรัพยากรสตริงสำหรับข้อความทั้งหมดเพื่อทำให้การแปลง่ายขึ้น</string>
     <string name="daily_tip_optimize_webp">ปรับแต่งรูปภาพด้วย WebP เพื่อลดขนาด APK</string>
     <string name="daily_tip_enable_proguard">เปิดใช้งาน ProGuard เพื่อลดขนาดและทำให้บิลด์รีลีสซับซ้อนขึ้น</string>
-    <string name="daily_tip_prefer_compose">เลือกใช้ Compose สำหรับ UI ใหม่หากเป้าหมายเป็นอุปกรณ์ที่ทันสมัย</string>
     <string name="daily_tip_livedata_viewmodel">ใช้ประโยชน์จาก LiveData และ ViewModel สำหรับ UI ที่ตอบสนองได้ดี</string>
     <string name="daily_tip_workmanager">ใช้ WorkManager สำหรับงานเบื้องหลังที่เชื่อถือได้</string>
     <string name="daily_tip_github_actions">ใช้ GitHub Actions สำหรับการตรวจสอบบิลด์อัตโนมัติ</string>
     <string name="daily_tip_emulator_screen_sizes">ทดสอบแอปของคุณบนขนาดหน้าจอต่างๆ ด้วยอีมูเลเตอร์</string>
     <string name="daily_tip_update_dependencies">อัปเดตการพึ่งพาอยู่เสมอเพื่อรับฟีเจอร์และการแก้ไขล่าสุด</string>
-    <string name="daily_tip_kotlin_coroutines">ใช้ประโยชน์จาก Kotlin Coroutines สำหรับการดำเนินการแบบอะซิงโครนัส</string>
     <string name="daily_tip_hilt">ผสานรวม Hilt สำหรับการฉีดการพึ่งพา</string>
     <string name="daily_tip_unit_tests">เขียนการทดสอบหน่วยด้วย JUnit และ Espresso</string>
     <string name="daily_tip_mvvm">ปฏิบัติตามสถาปัตยกรรม MVVM เพื่อโค้ดที่บำรุงรักษาง่าย</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index af7bbe4c..a1420a11 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Kabul Et</string>
     <string name="home">Ana Sayfa</string>
     <string name="announcement_title">Yeni Bir Uygulama Geldi.</string>
-    <string name="announcement_subtitle">En son Android Studio Eğitimleri uygulamasını inceleyin. Jetpack Compose, Material 3 ve daha fazlasını öğrenin.</string>
     <string name="profile_picture_desc">Geliştirici Profil Resmi</string>
     <string name="main_card_title">Android Studio Eğitimlerini Keşfedin</string>
-    <string name="main_card_subtitle">Kotlin ve Java Sürümleriyle</string>
-    <string name="main_card_description">Kotlin Sürümü dinamik dersler, yapay zeka asistanı ve daha fazlasıyla güncellendi. Android geliştirmenin geleceğini deneyimleyin.</string>
     <string name="get_on_google_play">Google Play\'den edinin</string>
     <string name="learn_more">Daha fazla bilgi edinin</string>
     <string name="play_store">Play Store</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat, Android destek kütüphanesi appCompat v7\'de bir sınıftır. Yeni API seviyelerinde eklenen metotları eskilerinde desteklemek için eklenmiştir (bölücüler gibi). LinearLayout ve LinearLayoutCompat\'taki metotları karşılaştırırsanız, Compat düzeninin herhangi bir API seviyesi sınırlaması olmaksızın Linear Layout\'un tüm metotlarına sahip olduğunu görebilirsiniz. Örneğin, setShowDividers metodu API seviyesi 11\'de tanıtılmıştır. Bu durumda, API seviyesi 11\'in altında bir platformu hedefliyorsanız, setShowDividers (ve parametreleri) LinearLayout yerine Linear Layout Compat kullanılarak çağrılmalıdır.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Bu etkileşimli dersle Android\'de ilerleme çubuklarını nasıl kullanacağınızı öğrenin. Bu ders iki bölüm içerir: biri yatay bir ilerleme çubuğu için, diğeri ise dairesel bir ilerleme çubuğu için. Her bölümde, bir indirme ilerledikçe ilerleme çubuğunun nasıl güncellendiğini görebilirsiniz. Ayrıca, ekranın altındaki yüzen eylem düğmesine tıklayarak dersin kodunu görüntüleyebilirsiniz.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android, Google tarafından geliştirilen bir mobil işletim sistemidir. İlk olarak 5 Kasım 2007\'de bir beta sürümü olarak piyasaya sürüldü ve ilk ticari sürüm olan Android 1.0, 23 Eylül 2008\'de piyasaya sürüldü. Android, Linux çekirdeğinin değiştirilmiş bir sürümüne ve diğer açık kaynaklı yazılımlara dayanmaktadır.\n\nAndroid Studio, Android uygulama geliştirme için resmi entegre geliştirme ortamıdır (IDE). 15 Mayıs 2013\'te Google I/O konferansında duyuruldu ve 8 Aralık 2014\'te halka açık kullanıma sunuldu. Android Studio, popüler bir Java IDE\'si olan IntelliJ IDEA\'ya dayanmaktadır.\n\nKotlin, Java Sanal Makinesi (JVM), Android, tarayıcı ve yerel platformlarda çalışabilen bir çapraz platform programlama dilidir. Prag merkezli bir yazılım şirketi olan JetBrains tarafından oluşturulmuştur. Kotlin ilk olarak Temmuz 2011\'de duyuruldu ve Şubat 2012\'de bir açık kaynak projesi olarak piyasaya sürüldü.\n\nGoogle, 17 Mayıs 2017\'deki I/O konferansında Android uygulama geliştirme için resmi bir dil olarak Kotlin\'e desteğini duyurdu. O zamandan beri Kotlin, Android geliştiricileri için en popüler dillerden biri haline geldi. Ekim 2020\'deki Google verilerine göre, Google Play\'deki en iyi 1000 uygulamanın %70\'inden fazlası Kotlin kullanmaktadır.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Bir Kronometre, geçen süreyi görüntülemek için zamanlayıcı benzeri bir işlevsellik sağlayan Android çerçevesindeki özel bir widget\'tır. Yukarı veya aşağı sayacak şekilde yapılandırılabilir ve genellikle kronometre veya geri sayım sayacı uygulamaları gibi zaman tutma gerektiren uygulamalarda kullanılır. Kronometre sınıfı, TextView sınıfından türetilmiştir, bu da bir TextView\'in tüm özelliklerini ve metotlarını devraldığı anlamına gelir. Bu, geliştiricilerin metin boyutu, rengi ve yazı tipi dahil olmak üzere Kronometrenin görünümünü kolayca özelleştirmesine olanak tanır.</string>
     <string name="snack_this_is_a_snackbar">Bu bir snackbar.</string>
     <string name="snack_bar_clicked">tıklandı</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Yerelleştirmeyi basitleştirmek için tüm metinler için dize kaynakları kullanın.</string>
     <string name="daily_tip_optimize_webp">APK boyutunu küçültmek için görüntüleri WebP ile optimize edin.</string>
     <string name="daily_tip_enable_proguard">Sürüm derlemelerini küçültmek ve karartmak için ProGuard\'ı etkinleştirin.</string>
-    <string name="daily_tip_prefer_compose">Modern cihazları hedefliyorsanız yeni kullanıcı arayüzü için Compose\'u tercih edin.</string>
     <string name="daily_tip_livedata_viewmodel">Reaktif kullanıcı arayüzleri için LiveData ve ViewModel\'den yararlanın.</string>
     <string name="daily_tip_workmanager">Güvenilir arka plan görevleri için WorkManager kullanın.</string>
     <string name="daily_tip_github_actions">Otomatik derleme kontrolleri için GitHub Actions\'ı kullanın.</string>
     <string name="daily_tip_emulator_screen_sizes">Uygulamanızı emülatörle farklı ekran boyutlarında test edin.</string>
     <string name="daily_tip_update_dependencies">En son özellikler ve düzeltmeler için bağımlılıkları güncel tutun.</string>
-    <string name="daily_tip_kotlin_coroutines">Asenkron işlemler için Kotlin Coroutines\'den yararlanın.</string>
     <string name="daily_tip_hilt">Bağımlılık enjeksiyonu için Hilt\'i entegre edin.</string>
     <string name="daily_tip_unit_tests">JUnit ve Espresso ile birim testleri yazın.</string>
     <string name="daily_tip_mvvm">Bakımı kolay kod için MVVM mimarisini takip edin.</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index eac6fbed..6641b642 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Погоджуюсь</string>
     <string name="home">Головна</string>
     <string name="announcement_title">Новий додаток вже тут.</string>
-    <string name="announcement_subtitle">Перегляньте найновіший додаток Android Studio Tutorials. Вивчайте Jetpack Compose, Material 3 та багато іншого.</string>
     <string name="profile_picture_desc">Зображення профілю розробника</string>
     <string name="main_card_title">Відкрийте для себе посібники з Android Studio</string>
-    <string name="main_card_subtitle">З версіями на Kotlin та Java</string>
-    <string name="main_card_description">Версія на Kotlin оновлена динамічними уроками, ШІ-асистентом та іншим. Відчуйте майбутнє розробки на Android.</string>
     <string name="get_on_google_play">Завантажте з Google Play</string>
     <string name="learn_more">Дізнайтеся більше</string>
     <string name="play_store">Play Store</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">LinearLayoutCompat — це клас у бібліотеці підтримки Android appCompat v7. Він був доданий для підтримки методів, які були додані в нових рівнях API, на старих (наприклад, роздільники). Якщо ви порівняєте методи в LinearLayout та LinearLayoutCompat, ви побачите, що макет Compat має всі методи лінійного макета без будь-яких обмежень рівня API. Наприклад, метод setShowDividers був введений на рівні API 11. Отже, в цьому випадку setShowDividers (та його параметри) слід викликати за допомогою LinearLayoutCompat замість LinearLayout, якщо ви націлюєтесь на платформу з рівнем API нижче 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Дізнайтеся, як використовувати індикатори прогресу в Android за допомогою цього інтерактивного уроку. Цей урок містить два розділи: один для горизонтального індикатора прогресу та один для кругового. У кожному розділі ви можете побачити, як індикатор прогресу оновлюється в міру завантаження. Ви також можете переглянути код уроку, натиснувши на плаваючу кнопку дії внизу екрана.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android — це мобільна операційна система, розроблена Google. Вперше вона була випущена як бета-версія 5 листопада 2007 року, а перша комерційна версія, Android 1.0, була запущена 23 вересня 2008 року. Android базується на модифікованій версії ядра Linux та іншому програмному забезпеченні з відкритим вихідним кодом.\n\nAndroid Studio — це офіційне інтегроване середовище розробки (IDE) для розробки додатків для Android. Воно було анонсовано Google на конференції I/O 15 травня 2013 року і випущено для загального користування 8 грудня 2014 року. Android Studio базується на IntelliJ IDEA, популярному Java IDE.\n\nKotlin — це кросплатформна мова програмування, яка може працювати на віртуальній машині Java (JVM), Android, у браузері та на нативних платформах. Вона була створена компанією JetBrains, що базується в Празі. Kotlin вперше був анонсований у липні 2011 року і випущений як проект з відкритим вихідним кодом у лютому 2012 року.\n\nGoogle оголосила про підтримку Kotlin як офіційної мови для розробки додатків для Android на своїй конференції I/O 17 травня 2017 року. З того часу Kotlin став однією з найпопулярніших мов для розробників Android. За даними Google на жовтень 2020 року, понад 70% з 1000 найкращих додатків у Google Play використовують Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Хронометр — це спеціалізований віджет у фреймворку Android, який надає функціональність, подібну до таймера, для відображення минулого часу. Його можна налаштувати на відлік часу вгору або вниз, і він зазвичай використовується в додатках, які вимагають обліку часу, таких як секундоміри або таймери зворотного відліку. Клас Chronometer походить від класу TextView, що означає, що він успадковує всі властивості та методи TextView. Це дозволяє розробникам легко налаштовувати зовнішній вигляд хронометра, включаючи розмір тексту, колір та шрифт.</string>
     <string name="snack_this_is_a_snackbar">Це snackbar.</string>
     <string name="snack_bar_clicked">натиснуто</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Використовуйте рядкові ресурси для всього тексту, щоб спростити локалізацію.</string>
     <string name="daily_tip_optimize_webp">Оптимізуйте зображення за допомогою WebP, щоб зменшити розмір APK.</string>
     <string name="daily_tip_enable_proguard">Увімкніть ProGuard, щоб зменшити та обфускувати релізні збірки.</string>
-    <string name="daily_tip_prefer_compose">Надавайте перевагу Compose для нового інтерфейсу, якщо орієнтуєтеся на сучасні пристрої.</string>
     <string name="daily_tip_livedata_viewmodel">Використовуйте LiveData та ViewModel для реактивних інтерфейсів.</string>
     <string name="daily_tip_workmanager">Використовуйте WorkManager для надійних фонових завдань.</string>
     <string name="daily_tip_github_actions">Використовуйте GitHub Actions для автоматизованих перевірок збірки.</string>
     <string name="daily_tip_emulator_screen_sizes">Тестуйте свій додаток на різних розмірах екрана за допомогою емулятора.</string>
     <string name="daily_tip_update_dependencies">Оновлюйте залежності, щоб отримувати найновіші функції та виправлення.</string>
-    <string name="daily_tip_kotlin_coroutines">Використовуйте Kotlin Coroutines для асинхронних операцій.</string>
     <string name="daily_tip_hilt">Інтегруйте Hilt для впровадження залежностей.</string>
     <string name="daily_tip_unit_tests">Пишіть юніт-тести з JUnit та Espresso.</string>
     <string name="daily_tip_mvvm">Дотримуйтесь архітектури MVVM для коду, який легко підтримувати.</string>
diff --git a/app/src/main/res/values-ur-rPK/strings.xml b/app/src/main/res/values-ur-rPK/strings.xml
index a760da4d..284a71e7 100644
--- a/app/src/main/res/values-ur-rPK/strings.xml
+++ b/app/src/main/res/values-ur-rPK/strings.xml
@@ -371,7 +371,6 @@
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">اس انٹرایکٹو سبق کے ساتھ اینڈرائیڈ میں پروگریس بار استعمال کرنے کا طریقہ سیکھیں۔ اس سبق میں دو حصے شامل ہیں: ایک افقی پروگریس بار کے لیے اور ایک سرکلر پروگریس بار کے لیے۔ ہر حصے میں، آپ دیکھ سکتے ہیں کہ ڈاؤن لوڈ کے آگے بڑھنے کے ساتھ پروگریس بار کیسے اپ ڈیٹ ہوتا ہے۔ آپ اسکرین کے نیچے فلوٹنگ ایکشن بٹن پر کلک کرکے سبق کا کوڈ بھی دیکھ سکتے ہیں۔</string>
     <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">اینڈرائیڈ گوگل کا تیار کردہ ایک موبائل آپریٹنگ سسٹم ہے۔ یہ پہلی بار 5 نومبر 2007 کو بیٹا ورژن کے طور پر جاری کیا گیا تھا اور پہلا تجارتی ورژن، اینڈرائیڈ 1.0، 23 ستمبر 2008 کو لانچ کیا گیا تھا۔ اینڈرائیڈ لینکس کرنل کے ایک ترمیم شدہ ورژن اور دیگر اوپن سورس سافٹ ویئر پر مبنی ہے۔\n\nاینڈرائیڈ اسٹوڈیو اینڈرائیڈ ایپ ڈیولپمنٹ کے لیے آفیشل انٹیگریٹڈ ڈیولپمنٹ انوائرمنٹ (IDE) ہے۔ اس کا اعلان گوگل نے 15 مئی 2013 کو اپنی I/O کانفرنس میں کیا تھا اور 8 دسمبر 2014 کو عوامی استعمال کے لیے جاری کیا گیا تھا۔ اینڈرائیڈ اسٹوڈیو IntelliJ IDEA پر مبنی ہے، جو ایک مقبول جاوا IDE ہے۔\n\nکوٹلن ایک کراس پلیٹ فارم پروگرامنگ زبان ہے جو جاوا ورچوئل مشین (JVM)، اینڈرائیڈ، براؤزر اور مقامی پلیٹ فارمز پر چل سکتی ہے۔ اسے جیٹ برینز نے بنایا ہے، جو پراگ میں واقع ایک سافٹ ویئر کمپنی ہے۔ کوٹلن کا پہلی بار اعلان جولائی 2011 میں کیا گیا تھا اور فروری 2012 میں اوپن سورس پروجیکٹ کے طور پر جاری کیا گیا تھا۔\n\nگوگل نے 17 مئی 2017 کو اپنی I/O کانفرنس میں اینڈرائیڈ ایپ ڈیولپمنٹ کے لیے کوٹلن کو بطور آفیشل زبان سپورٹ کرنے کا اعلان کیا۔ تب سے، کوٹلن اینڈرائیڈ ڈیولپرز کے لیے سب سے مقبول زبانوں میں سے ایک بن گئی ہے۔ اکتوبر 2020 کے گوگل کے ڈیٹا کے مطابق، گوگل پلے پر ٹاپ 1000 ایپس میں سے 70% سے زیادہ کوٹلن استعمال کرتی ہیں۔</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">کرونومیٹر اینڈرائیڈ فریم ورک میں ایک خصوصی ویجیٹ ہے جو گزرے ہوئے وقت کو دکھانے کے لیے ٹائمر جیسی فعالیت فراہم کرتا ہے۔ اسے اوپر یا نیچے گننے کے لیے کنفیگر کیا جاسکتا ہے، اور عام طور پر ان ایپلی کیشنز میں استعمال ہوتا ہے جن کے لیے ٹائم کیپنگ کی ضرورت ہوتی ہے، جیسے اسٹاپ واچ یا کاؤنٹ ڈاؤن ٹائمر ایپس۔ کرونومیٹر کلاس TextView کلاس سے اخذ کی گئی ہے، جس کا مطلب ہے کہ یہ TextView کی تمام خصوصیات اور طریقوں کو وراثت میں ملتی ہے۔ یہ ڈیولپرز کو کرونومیٹر کی ظاہری شکل کو آسانی سے اپنی مرضی کے مطابق بنانے کی اجازت دیتا ہے، بشمول اس کا ٹیکسٹ سائز، رنگ اور فونٹ۔</string>
     <string name="snack_this_is_a_snackbar">یہ ایک اسنیک بار ہے.</string>
     <string name="snack_bar_clicked">کلک کیا گیا</string>
@@ -421,13 +420,11 @@
     <string name="daily_tip_use_string_resources">مقامیانے کو آسان بنانے کے لیے تمام متن کے لیے اسٹرنگ وسائل استعمال کریں۔</string>
     <string name="daily_tip_optimize_webp">APK کا سائز کم کرنے کے لیے WebP کے ساتھ تصاویر کو بہتر بنائیں۔</string>
     <string name="daily_tip_enable_proguard">ریلیز بلڈز کو سکڑانے اور مبہم کرنے کے لیے ProGuard کو فعال کریں۔</string>
-    <string name="daily_tip_prefer_compose">اگر جدید ڈیوائسز کو ہدف بنا رہے ہیں تو نئے UI کے لیے Compose کو ترجیح دیں۔</string>
     <string name="daily_tip_livedata_viewmodel">ری ایکٹیو UIs کے لیے LiveData اور ViewModel کا فائدہ اٹھائیں۔</string>
     <string name="daily_tip_workmanager">قابل اعتماد پس منظر کے کاموں کے لیے WorkManager استعمال کریں۔</string>
     <string name="daily_tip_github_actions">خودکار بلڈ چیکس کے لیے GitHub Actions کا استعمال کریں۔</string>
     <string name="daily_tip_emulator_screen_sizes">ایمولیٹر کے ساتھ اپنی ایپ کو مختلف اسکرین سائز پر ٹیسٹ کریں۔</string>
     <string name="daily_tip_update_dependencies">تازہ ترین خصوصیات اور اصلاحات کے لیے انحصار کو اپ ڈیٹ رکھیں۔</string>
-    <string name="daily_tip_kotlin_coroutines">غیر مطابقت پذیر کارروائیوں کے لیے Kotlin Coroutines کا فائدہ اٹھائیں۔</string>
     <string name="daily_tip_hilt">انحصار انجیکشن کے لیے Hilt کو مربوط کریں۔</string>
     <string name="daily_tip_unit_tests">JUnit اور Espresso کے ساتھ یونٹ ٹیسٹ لکھیں۔</string>
     <string name="daily_tip_mvvm">قابل دیکھ بھال کوڈ کے لیے MVVM آرکیٹیکچر کی پیروی کریں۔</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 970ce08a..8fbc73ae 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">Đồng ý</string>
     <string name="home">Trang chủ</string>
     <string name="announcement_title">Một ứng dụng mới đã ra mắt.</string>
-    <string name="announcement_subtitle">Hãy xem ứng dụng Hướng dẫn Android Studio mới nhất. Tìm hiểu Jetpack Compose, Material 3, v.v.</string>
     <string name="profile_picture_desc">Hình ảnh hồ sơ nhà phát triển</string>
     <string name="main_card_title">Khám phá Hướng dẫn Android Studio</string>
-    <string name="main_card_subtitle">Bao gồm các phiên bản Kotlin và Java</string>
-    <string name="main_card_description">Phiên bản Kotlin đã được cập nhật với các bài học động, trợ lý AI, v.v. Trải nghiệm tương lai của phát triển Android.</string>
     <string name="get_on_google_play">Tải trên Google Play</string>
     <string name="learn_more">Tìm hiểu thêm</string>
     <string name="play_store">Cửa hàng Play</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat là một lớp trong thư viện hỗ trợ Android appCompat v7. Nó được thêm vào để hỗ trợ các phương thức đã được thêm vào trong các cấp API mới hơn trên các cấp cũ hơn (như dải phân cách). Nếu bạn so sánh các phương thức trong LinearLayout và LinearLayoutCompat, bạn có thể thấy rằng bố cục Compat có tất cả các phương thức của Linear Layout mà không có bất kỳ giới hạn cấp API nào. Ví dụ: phương thức setShowDividers đã được giới thiệu ở cấp API 11. Vì vậy, trong trường hợp này, setShowDividers (và các tham số của nó) nên được gọi bằng Linear Layout Compat thay vì LinearLayout nếu bạn đang nhắm mục tiêu một nền tảng có cấp API dưới 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Tìm hiểu cách sử dụng thanh tiến trình trong Android với bài học tương tác này. Bài học này bao gồm hai phần: một phần cho thanh tiến trình ngang và một phần cho thanh tiến trình tròn. Trong mỗi phần, bạn có thể xem thanh tiến trình cập nhật như thế nào khi quá trình tải xuống tiến triển. Bạn cũng có thể xem mã cho bài học bằng cách nhấp vào nút hành động nổi ở cuối màn hình.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android là một hệ điều hành di động do Google phát triển. Nó được phát hành lần đầu tiên dưới dạng phiên bản beta vào ngày 5 tháng 11 năm 2007 và phiên bản thương mại đầu tiên, Android 1.0, được ra mắt vào ngày 23 tháng 9 năm 2008. Android dựa trên một phiên bản sửa đổi của nhân Linux và các phần mềm mã nguồn mở khác.\n\nAndroid Studio là môi trường phát triển tích hợp (IDE) chính thức để phát triển ứng dụng Android. Nó được Google công bố tại hội nghị I/O vào ngày 15 tháng 5 năm 2013 và được phát hành cho công chúng sử dụng vào ngày 8 tháng 12 năm 2014. Android Studio dựa trên IntelliJ IDEA, một IDE Java phổ biến.\n\nKotlin là một ngôn ngữ lập trình đa nền tảng có thể chạy trên Máy ảo Java (JVM), Android, trình duyệt và các nền tảng gốc. Nó được tạo ra bởi JetBrains, một công ty phần mềm có trụ sở tại Praha. Kotlin được công bố lần đầu tiên vào tháng 7 năm 2011 và được phát hành dưới dạng dự án mã nguồn mở vào tháng 2 năm 2012.\n\nGoogle đã công bố hỗ trợ Kotlin như một ngôn ngữ chính thức để phát triển ứng dụng Android tại hội nghị I/O vào ngày 17 tháng 5 năm 2017. Kể từ đó, Kotlin đã trở thành một trong những ngôn ngữ phổ biến nhất đối với các nhà phát triển Android. Theo dữ liệu của Google từ tháng 10 năm 2020, hơn 70% trong số 1000 ứng dụng hàng đầu trên Google Play sử dụng Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Chronometer là một tiện ích chuyên dụng trong khuôn khổ Android cung cấp chức năng giống như bộ đếm thời gian để hiển thị thời gian đã trôi qua. Nó có thể được cấu hình để đếm lên hoặc xuống, và thường được sử dụng trong các ứng dụng yêu cầu chấm công, chẳng hạn như ứng dụng đồng hồ bấm giờ hoặc đồng hồ đếm ngược. Lớp Chronometer có nguồn gốc từ lớp TextView, điều đó có nghĩa là nó kế thừa tất cả các thuộc tính và phương thức của một TextView. Điều này cho phép các nhà phát triển dễ dàng tùy chỉnh giao diện của Chronometer, bao gồm kích thước văn bản, màu sắc và phông chữ của nó.</string>
     <string name="snack_this_is_a_snackbar">Đây là một thanh thông báo nhanh.</string>
     <string name="snack_bar_clicked">đã nhấp</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">Sử dụng tài nguyên chuỗi cho tất cả văn bản để đơn giản hóa việc bản địa hóa.</string>
     <string name="daily_tip_optimize_webp">Tối ưu hóa hình ảnh bằng WebP để giảm kích thước APK.</string>
     <string name="daily_tip_enable_proguard">Bật ProGuard để thu nhỏ và làm rối mã các bản dựng phát hành.</string>
-    <string name="daily_tip_prefer_compose">Ưu tiên Compose cho giao diện người dùng mới nếu nhắm mục tiêu các thiết bị hiện đại.</string>
     <string name="daily_tip_livedata_viewmodel">Tận dụng LiveData và ViewModel cho giao diện người dùng phản ứng.</string>
     <string name="daily_tip_workmanager">Sử dụng WorkManager cho các tác vụ nền đáng tin cậy.</string>
     <string name="daily_tip_github_actions">Sử dụng GitHub Actions để kiểm tra bản dựng tự động.</string>
     <string name="daily_tip_emulator_screen_sizes">Kiểm tra ứng dụng của bạn trên các kích thước màn hình khác nhau bằng trình giả lập.</string>
     <string name="daily_tip_update_dependencies">Giữ các phụ thuộc được cập nhật để có các tính năng và bản vá mới nhất.</string>
-    <string name="daily_tip_kotlin_coroutines">Tận dụng Kotlin Coroutines cho các hoạt động không đồng bộ.</string>
     <string name="daily_tip_hilt">Tích hợp Hilt để tiêm phụ thuộc.</string>
     <string name="daily_tip_unit_tests">Viết các bài kiểm tra đơn vị với JUnit và Espresso.</string>
     <string name="daily_tip_mvvm">Tuân theo kiến trúc MVVM để có mã có thể bảo trì.</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e58d7704..6d58b209 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -13,11 +13,8 @@
     <string name="agree">同意</string>
     <string name="home">首頁</string>
     <string name="announcement_title">新應用程式來了！</string>
-    <string name="announcement_subtitle">快來看看最新的 Android Studio 教學應用程式。學習 Jetpack Compose、Material 3 等等。</string>
     <string name="profile_picture_desc">開發人員個人資料圖片</string>
     <string name="main_card_title">探索 Android Studio 教學</string>
-    <string name="main_card_subtitle">包含 Kotlin 和 Java 版本</string>
-    <string name="main_card_description">Kotlin 版本已更新，增加了動態課程、AI 助理等功能。體驗 Android 開發的未來！</string>
     <string name="get_on_google_play">在 Google Play 上取得</string>
     <string name="learn_more">瞭解更多</string>
     <string name="play_store">Play 商店</string>
@@ -370,8 +367,6 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat 是 Android 支援函式庫 appCompat v7 中的一個類別。它被加入以支援在較舊的 API 等級上新增於較新 API 等級的方法（如分隔線）。如果您比較 LinearLayout 和 LinearLayoutCompat 中的方法，您會發現 Compat 版面配置擁有 Linear Layout 的所有方法，且沒有任何 API 等級限制。例如，setShowDividers 方法是在 API 等級 11 中引入的。因此，在這種情況下，如果您針對 API 等級低於 11 的平台，則應使用 Linear Layout Compat 而非 LinearLayout 來調用 setShowDividers（及其參數）。</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">透過這個互動式課程，學習如何在 Android 中使用進度列。本課程包括兩個部分：一個用於水平進度列，另一個用於圓形進度列。在每個部分，您都可以看到隨著下載進度，進度列如何更新。您還可以透過點擊螢幕底部的浮動操作按鈕來查看本課程的程式碼。</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android 是由 Google 開發的行動作業系統。它於 2007 年 11 月 5 日首次以 Beta 版本發布，而第一個商業版本 Android 1.0 則於 2008 年 9 月 23 日推出。Android 基於 Linux 核心的修改版本和其他開源軟體。\n\nAndroid Studio 是用於 Android 應用程式開發的官方整合開發環境 (IDE)。它由 Google 在 2013 年 5 月 15 日的 I/O 大會上宣布，並於 2014 年 12 月 8 日公開發布。Android Studio 基於流行的 Java IDE - IntelliJ IDEA。\n\nKotlin 是一種跨平台程式語言，可以在 Java 虛擬機器 (JVM)、Android、瀏覽器和原生平台上執行。它由位於布拉格的軟體公司 JetBrains 創建。Kotlin 於 2011 年 7 月首次宣布，並於 2012 年 2 月作為開源專案發布。\n\nGoogle 在 2017 年 5 月 17 日的 I/O 大會上宣布支持 Kotlin 作為 Android 應用程式開發的官方語言。從那時起，Kotlin 已成為 Android 開發人員最受歡迎的語言之一。根據 Google 2020 年 10 月的數據，Google Play 上排名前 1000 的應用程式中有超過 70% 使用 Kotlin。</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
     <string name="summary_chronometer">Chronometer 是 Android 框架中的一個專用小工具，提供類似計時器的功能來顯示經過的時間。它可以被設定為向上或向下計數，通常用於需要計時的應用程式中，例如碼錶或倒數計時器應用程式。Chronometer 類別源自 TextView 類別，這意味著它繼承了 TextView 的所有屬性和方法。這使得開發人員可以輕鬆地自訂 Chronometer 的外觀，包括其文字大小、顏色和字型。</string>
     <string name="snack_this_is_a_snackbar">這是一個 Snack bar！</string>
     <string name="snack_bar_clicked">已點擊</string>
@@ -421,13 +416,11 @@
     <string name="daily_tip_use_string_resources">對所有文字使用字串資源以簡化本地化。</string>
     <string name="daily_tip_optimize_webp">使用 WebP 優化圖像以減少 APK 大小。</string>
     <string name="daily_tip_enable_proguard">啟用 ProGuard 來縮減和混淆發布版本。</string>
-    <string name="daily_tip_prefer_compose">如果目標是現代裝置，請優先使用 Compose 建立新 UI。</string>
     <string name="daily_tip_livedata_viewmodel">利用 LiveData 和 ViewModel 實現響應式 UI。</string>
     <string name="daily_tip_workmanager">使用 WorkManager 執行可靠的背景任務。</string>
     <string name="daily_tip_github_actions">利用 GitHub Actions 進行自動化建置檢查。</string>
     <string name="daily_tip_emulator_screen_sizes">使用模擬器在不同螢幕尺寸上測試您的應用程式。</string>
     <string name="daily_tip_update_dependencies">保持依賴項更新以獲得最新的功能和修復。</string>
-    <string name="daily_tip_kotlin_coroutines">利用 Kotlin 協程進行非同步操作。</string>
     <string name="daily_tip_hilt">整合 Hilt 進行依賴注入。</string>
     <string name="daily_tip_unit_tests">使用 JUnit 和 Espresso 編寫單元測試。</string>
     <string name="daily_tip_mvvm">遵循 MVVM 架構以獲得可維護的程式碼。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1daeca7e..836e73e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,11 +16,11 @@
 
     <string name="home">Home</string>
     <string name="announcement_title">A new app is here</string>
-    <string name="announcement_subtitle">Check out the latest Android Studio Tutorials app. Learn Jetpack Compose, Material 3, and more.</string>
+    <string name="announcement_subtitle">Check out the latest Android Studio Tutorials app. Learn Material 3, XML layouts, and more.</string>
     <string name="profile_picture_desc">Developer profile picture</string>
     <string name="main_card_title">Discover Android Studio tutorials</string>
-    <string name="main_card_subtitle">Featuring Kotlin and Java editions</string>
-    <string name="main_card_description">The Kotlin Edition has been updated with dynamic lessons, AI assistant, and more. Experience the future of Android development.</string>
+    <string name="main_card_subtitle">Built with Java and XML examples</string>
+    <string name="main_card_description">Learn Android development through practical Java code and XML layout samples.</string>
       <string name="get_on_google_play">Get it on Google Play</string>
       <string name="learn_more">Learn more</string>
     <string name="play_store">Play Store</string>
@@ -400,8 +400,8 @@
     <string name="summary_linear_layout_compat">Linear Layout Compat is a class in the Android support library appCompat v7. It was added to support methods which were added in newer API levels on old ones (like dividers). If you compare the methods in LinearLayout and LinearLayoutCompat, you can see that the Compat layout has all methods of the Linear Layout without any API level limitation. For example, the method setShowDividers was introduced on API level 11. So, in this case, setShowDividers (and its parameters) should be invoked using Linear Layout Compat instead of LinearLayout if you are targeting a platform with API level below 11.</string>
     <string name="summary_donations">Your donation helps keep the app running and improve features. Thank you for your generosity.</string>
     <string name="summary_progress_bar">Learn how to use progress bars in Android with this interactive lesson. This lesson includes two sections: one for a horizontal progress bar and one for a circular progress bar. In each section, you can see how the progress bar updates as a download progresses. You can also view the code for the lesson by clicking on the floating action button at the bottom of the screen.</string>
-    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android is a mobile operating system developed by Google. It was first released as a beta version on November 5, 2007 and the first commercial version, Android 1.0, was launched on September 23, 2008. Android is based on a modified version of the Linux kernel and other open source software.\n\nAndroid Studio is the official integrated development environment (IDE) for Android app development. It was announced by Google at its I/O conference on May 15, 2013 and released for public use on December 8, 2014. Android Studio is based on IntelliJ IDEA, a popular Java IDE.\n\nKotlin is a cross-platform programming language that can run on Java Virtual Machine (JVM), Android, browser and native platforms. It was created by JetBrains, a software company based in Prague. Kotlin was first announced in July 2011 and released as an open source project in February 2012.\n\nGoogle announced its support for Kotlin as an official language for Android app development at its I/O conference on May 17, 2017. Since then, Kotlin has become one of the most popular languages for Android developers. According to Google\'s data from October 2020, more than 70% of the top 1000 apps on Google Play use Kotlin.</string>
-    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Kotlin,\na modern programming language that is concise,\nsafe,\nexpressive,\nand interoperable with Java.</string>
+    <string name="summary_android_history" tools:ignore="StringFormatCount,StringFormatMatches">Android is a mobile operating system developed by Google. It was first released as a beta version on November 5, 2007 and the first commercial version, Android 1.0, was launched on September 23, 2008. Android is based on a modified version of the Linux kernel and other open source software.\n\nAndroid Studio is the official integrated development environment (IDE) for Android app development. It was announced by Google at its I/O conference on May 15, 2013 and released for public use on December 8, 2014. Android Studio is based on IntelliJ IDEA, a popular Java IDE.</string>
+    <string name="summary_android_features">Android is not only an operating system, but also a platform that offers a range of features and capabilities for users and developers. Some of the features of Android include:\n\n- Near Field Communication (NFC), which allows you to share data, make payments, and connect with other devices wirelessly.\n- Alternate keyboards, which let you customize your input method with different layouts, languages, and themes.\n- IR transmission, which enables you to use your phone as a remote control for TVs, air conditioners, and other appliances.\n- No-touch control, which lets you perform actions on your phone without touching the screen by using gestures or voice commands.\n- Automation, which allows you to set up routines and triggers for your phone to perform certain tasks automatically.\n- Wireless app downloads, which let you install apps from your computer or web browser without connecting your phone with a cable.\n- Storage and battery swap, which give you the option to expand your phone\'s memory or replace its battery easily.\n- Custom home screen, which lets you personalize your phone\'s appearance with widgets, wallpapers, icons, and launchers.\n\nAndroid Studio is the best tool for developing Android apps. It offers many features and benefits for developers such as:\n\n- Code editor with syntax highlighting, code completion, refactoring, debugging, testing, and linting tools.\n- Layout editor with drag-and-drop interface for designing user interfaces.\n- Emulator with fast boot and snapshot support for testing apps on different devices and configurations.\n- Firebase integration with services such as authentication, database, storage, analytics, crash reporting, and more. \n- Gradle-based build system with dependency management,\ncustomization,\noptimization,\nsigning,\ndistribution options, and more. \n\nWith Android Studio,\nyou can create amazing apps for Android devices using Java,\na powerful and widely-used programming language.</string>
     <string name="summary_chronometer">A Chronometer is a specialized widget in the Android framework that provides a timer-like functionality for displaying elapsed time. It can be configured to count up or down, and is commonly used in applications that require timekeeping, such as stopwatch or countdown timer apps. The Chronometer class is derived from the TextView class, which means that it inherits all of the properties and methods of a TextView. This allows developers to easily customize the appearance of the Chronometer, including its text size, color, and font.</string>
     <string name="snack_this_is_a_snackbar">This is a snack bar.</string>
     <string name="snack_bar_clicked">clicked</string>
@@ -448,13 +448,13 @@
     <string name="daily_tip_use_string_resources">Use string resources for all text to simplify localization.</string>
     <string name="daily_tip_optimize_webp">Optimize images with WebP to reduce APK size.</string>
     <string name="daily_tip_enable_proguard">Enable ProGuard to shrink and obfuscate release builds.</string>
-    <string name="daily_tip_prefer_compose">Prefer Compose for new UI if targeting modern devices.</string>
+    <string name="daily_tip_prefer_compose">Prefer XML layouts for broad device compatibility.</string>
     <string name="daily_tip_livedata_viewmodel">Take advantage of LiveData and ViewModel for reactive UIs.</string>
     <string name="daily_tip_workmanager">Use WorkManager for reliable background tasks.</string>
     <string name="daily_tip_github_actions">Utilize GitHub Actions for automated build checks.</string>
     <string name="daily_tip_emulator_screen_sizes">Test your app on different screen sizes with the emulator.</string>
     <string name="daily_tip_update_dependencies">Keep dependencies updated for the latest features and fixes.</string>
-    <string name="daily_tip_kotlin_coroutines">Leverage Kotlin Coroutines for asynchronous operations.</string>
+    <string name="daily_tip_kotlin_coroutines">Use ExecutorService for asynchronous operations.</string>
     <string name="daily_tip_hilt">Integrate Hilt for dependency injection.</string>
     <string name="daily_tip_unit_tests">Write unit tests with JUnit and Espresso.</string>
     <string name="daily_tip_mvvm">Follow the MVVM architecture for maintainable code.</string>
diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
index 7e7d24e1..027611e9 100644
--- a/app/src/main/res/values/untranslatable_strings.xml
+++ b/app/src/main/res/values/untranslatable_strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Android Studio Tutorials: Java Edition</string>
-    <string name="shortcut_kotlin_edition_short" translatable="false">Kotlin Edition</string>
-    <string name="shortcut_kotlin_edition_long" translatable="false">Android Studio Tutorials: Kotlin Edition</string>
     <string name="code_java" translatable="false">Java</string>
     <string name="layout_xml" translatable="false">XML</string>
     <string name="twitter" translatable="false">Twitter</string>
diff --git a/docs/android-architecture-recommendations.md b/docs/android-architecture-recommendations.md
index e44a5b87..99a7b38a 100644
--- a/docs/android-architecture-recommendations.md
+++ b/docs/android-architecture-recommendations.md
@@ -21,7 +21,6 @@ Our recommended layered architecture favors separation of concerns. It drives th
 | **Use a clearly defined data layer.**<br/>Strongly recommended | The data layer exposes application data to the rest of the app and contains the vast majority of business logic of your app.<br/>You should create repositories even if they just contain a single data source.<br/>In small apps, you can choose to place data layer types in a `data` package or module. |
 | **Use a clearly defined UI layer.**<br/>Strongly recommended | The UI layer displays the application data on the screen and serves as the primary point of user interaction.<br/>In small apps, you can choose to place UI layer types in a `ui` package or module.<br/>More UI layer best practices here. |
 | **The data layer should expose application data using a repository.**<br/>Strongly recommended | Components in the UI layer such as Activities, Fragments, or ViewModels shouldn't interact directly with a data source. Examples of data sources are databases, SharedPreferences, Firebase APIs, GPS, Bluetooth, or network status providers. |
-| **Use coroutines and flows.**<br/>Strongly recommended | Use Kotlin coroutines and flows to communicate between layers. Java code can access these APIs through interoperability. |
 | **Use a domain layer.**<br/>Recommended in big apps | Use a domain layer (use cases) if you need to reuse business logic that interacts with the data layer across multiple ViewModels, or you want to simplify the business logic complexity of a particular ViewModel. |
 
 ## UI layer
@@ -32,10 +31,9 @@ The role of the UI layer is to display the application data on the screen and se
 | --- | --- |
 | **Follow Unidirectional Data Flow (UDF).**<br/>Strongly recommended | Follow UDF principles, where ViewModels expose UI state using the observer pattern and receive actions from the UI through method calls. |
 | **Use AAC ViewModels if their benefits apply to your app.**<br/>Strongly recommended | Use AndroidX ViewModels to handle business logic and fetch application data to expose UI state to the UI. |
-| **Use lifecycle-aware UI state collection.**<br/>Strongly recommended | Collect UI state from the UI using the appropriate lifecycle-aware coroutine builder: `repeatOnLifecycle` in the View system and `collectAsStateWithLifecycle` in Jetpack Compose. |
+| **Use lifecycle-aware UI state collection.**<br/>Strongly recommended | Collect UI state from the UI using lifecycle-aware APIs such as `repeatOnLifecycle`. |
 | **Do not send events from the ViewModel to the UI.**<br/>Strongly recommended | Process the event immediately in the ViewModel and cause a state update with the result of handling the event. |
-| **Use a single-activity application.**<br/>Recommended | Use Navigation Fragments or Navigation Compose to navigate between screens and deep link to your app if your app has more than one screen. |
-| **Use Jetpack Compose.**<br/>Recommended | Use Jetpack Compose to build new apps for phones, tablets, foldables, and Wear OS. Compose code lives in Kotlin but can be integrated with Java-based projects. |
+| **Use a single-activity application.**<br/>Recommended | Use Navigation Fragments to navigate between screens and deep link to your app if your app has more than one screen. |
 
 The following snippet outlines how to collect the UI state in a lifecycle-aware manner from a Java `Fragment`:
 
@@ -49,35 +47,9 @@ public class MyFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         viewModel = new ViewModelProvider(this).get(MyViewModel.class);
 
-        LifecycleOwner owner = getViewLifecycleOwner();
-        LifecycleOwnerKt.getLifecycleScope(owner).launch(() ->
-            LifecycleKt.repeatOnLifecycle(owner.getLifecycle(), Lifecycle.State.STARTED, () ->
-                viewModel.getUiState().collect(value -> {
-                    // Process item
-                    return Unit.INSTANCE;
-                })
-            )
-        );
-    }
-}
-```
-
-```kotlin
-// Compose (Kotlin)
-class MyFragment : Fragment() {
-
-    private val viewModel: MyViewModel by viewModel()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.uiState.collect {
-                    // Process item
-                }
-            }
-        }
+        viewModel.getUiState().observe(getViewLifecycleOwner(), value -> {
+            // Process item
+        });
     }
 }
 ```
@@ -89,11 +61,11 @@ ViewModels are responsible for providing the UI state and access to the data lay
 | Recommendation | Description |
 | --- | --- |
 | **ViewModels should be agnostic of the Android lifecycle.**<br/>Strongly recommended | ViewModels shouldn't hold a reference to any lifecycle-related type. Don't pass `Activity`, `Fragment`, `Context`, or `Resources` as a dependency. If something needs a `Context` in the ViewModel, evaluate if it is in the right layer. |
-| **Use coroutines and flows.**<br/>Strongly recommended | The ViewModel interacts with the data or domain layers using Kotlin flows for receiving application data and suspend functions to perform actions using `viewModelScope`. |
-| **Use ViewModels at screen level.**<br/>Strongly recommended | Do not use ViewModels in reusable pieces of UI. Use ViewModels in screen-level composables, Activities, Fragments, or destinations/graphs when using Jetpack Navigation. |
+| **Expose observable data.**<br/>Strongly recommended | Use `LiveData` or other observable classes to expose application data from the ViewModel. |
+| **Use ViewModels at screen level.**<br/>Strongly recommended | Do not use ViewModels in reusable pieces of UI. Use ViewModels in screen-level Activities, Fragments, or destinations/graphs when using Jetpack Navigation. |
 | **Use plain state holder classes in reusable UI components.**<br/>Strongly recommended | Use plain state holder classes for handling complexity in reusable UI components. By doing this, the state can be hoisted and controlled externally. |
 | **Do not use AndroidViewModel.**<br/>Recommended | Use the `ViewModel` class, not `AndroidViewModel`. The `Application` class shouldn't be used in the ViewModel. Instead, move the dependency to the UI or the data layer. |
-| **Expose a UI state.**<br/>Recommended | ViewModels should expose data to the UI through a single property called `uiState`. You should make `uiState` a `StateFlow`. Use the `stateIn` operator with the `WhileSubscribed(5000)` policy when the data comes as a stream. For simpler cases, expose a `MutableStateFlow` as an immutable `StateFlow`. |
+| **Expose a UI state.**<br/>Recommended | ViewModels should expose data to the UI through a single `LiveData` or other observable property representing the UI state. |
 
 The following snippet outlines how to expose UI state from a ViewModel in Java:
 
@@ -101,21 +73,15 @@ The following snippet outlines how to expose UI state from a ViewModel in Java:
 @HiltViewModel
 public class BookmarksViewModel extends ViewModel {
 
-    private final StateFlow<NewsFeedUiState> feedState;
+    private final MutableLiveData<NewsFeedUiState> feedState = new MutableLiveData<>();
 
     @Inject
     public BookmarksViewModel(NewsRepository newsRepository) {
-        feedState = newsRepository
-            .getNewsResourcesStream()
-            .mapToFeedState(savedNewsResourcesState)
-            .stateIn(
-                ViewModelKt.getViewModelScope(this),
-                SharingStarted.Companion.WhileSubscribed(5000),
-                NewsFeedUiState.Loading
-            );
+        feedState.setValue(NewsFeedUiState.loading());
+        // fetch data from repository and post updates
     }
 
-    public StateFlow<NewsFeedUiState> getFeedState() {
+    public LiveData<NewsFeedUiState> getFeedState() {
         return feedState;
     }
 }
@@ -168,9 +134,9 @@ The following are some best practices for testing:
 
 | Recommendation | Description |
 | --- | --- |
-| **Know what to test.**<br/>Strongly recommended | Unless the project is roughly as simple as a hello world app, you should test it, at minimum with: unit test ViewModels (including flows), unit test data layer entities (repositories and data sources), and UI navigation tests that are useful as regression tests in CI. |
+| **Know what to test.**<br/>Strongly recommended | Unless the project is roughly as simple as a hello world app, you should test it, at minimum with: unit test ViewModels (including observable data), unit test data layer entities (repositories and data sources), and UI navigation tests that are useful as regression tests in CI. |
 | **Prefer fakes to mocks.**<br/>Strongly recommended | Read more in the “Use test doubles in Android” documentation. |
-| **Test StateFlows.**<br/>Strongly recommended | When testing `StateFlow`, assert on the `value` property whenever possible. Create a collectJob if using `WhileSubscribed`. For more information, check the “What to test in Android” guide. |
+| **Test LiveData.**<br/>Strongly recommended | When testing `LiveData`, observe it and assert on emitted values. |
 
 ## Models
 
@@ -188,5 +154,5 @@ When naming your codebase, you should be aware of the following best practices:
 | --- | --- |
 | **Naming methods.**<br/>Optional | Methods should be a verb phrase. For example, `makePayment()`. |
 | **Naming properties.**<br/>Optional | Properties should be a noun phrase. For example, `inProgressTopicSelection`. |
-| **Naming streams of data.**<br/>Optional | When a class exposes a `Flow` stream, `LiveData`, or any other stream, the naming convention is `get{Model}Stream()`. For example, `getAuthorStream(): Flow<Author>`. If the function returns a list of models the model name should be in the plural: `getAuthorsStream(): Flow<List<Author>>`. |
+| **Naming streams of data.**<br/>Optional | When a class exposes a stream such as `LiveData`, the naming convention is `get{Model}Stream()`. For example, `getAuthorStream(): LiveData<Author>`. If the function returns a list of models the model name should be in the plural: `getAuthorsStream(): LiveData<List<Author>>`. |
 | **Naming interfaces implementations.**<br/>Optional | Names for the implementations of interfaces should be meaningful. Use `Default` as the prefix if a better name cannot be found. For example, for a `NewsRepository` interface, you could have an `OfflineFirstNewsRepository` or `InMemoryNewsRepository`. If you can find no good name, use `DefaultNewsRepository`. Fake implementations should be prefixed with `Fake`, as in `FakeAuthorsRepository`. |

From ba895995d8666e3416dc9f23167986bb97b0207f Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 11 Sep 2025 23:53:05 +0300
Subject: [PATCH 5/8] style onboarding with swipe pager and dots

---
 .../onboarding/BottomLabelsFragment.java      |  24 ++---
 .../ui/screens/onboarding/DataFragment.java   |   4 -
 .../onboarding/OnboardingActivity.java        | 100 ++++++++++++++++--
 .../screens/onboarding/StartPageFragment.java |  24 ++---
 .../ui/screens/onboarding/ThemeFragment.java  |  28 ++---
 .../res/drawable/onboarding_dot_selected.xml  |   5 +
 .../drawable/onboarding_dot_unselected.xml    |   5 +
 .../main/res/layout/activity_onboarding.xml   |  38 ++++++-
 .../fragment_onboarding_bottom_labels.xml     |   5 -
 .../res/layout/fragment_onboarding_data.xml   |   6 --
 .../layout/fragment_onboarding_start_page.xml |   5 -
 .../res/layout/fragment_onboarding_theme.xml  |   5 -
 app/src/main/res/values/strings.xml           |   1 +
 13 files changed, 180 insertions(+), 70 deletions(-)
 create mode 100644 app/src/main/res/drawable/onboarding_dot_selected.xml
 create mode 100644 app/src/main/res/drawable/onboarding_dot_unselected.xml

diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
index e3e054bd..4a1627c0 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/BottomLabelsFragment.java
@@ -29,18 +29,18 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
-        binding.buttonNext.setOnClickListener(v -> {
-            int checkedId = binding.labelsGroup.getCheckedRadioButtonId();
-            String[] values = getResources().getStringArray(R.array.preference_bottom_navigation_bar_labels_values);
-            String value = values[0];
-            if (checkedId == R.id.radio_selected) {
-                value = values[1];
-            } else if (checkedId == R.id.radio_unlabeled) {
-                value = values[2];
-            }
-            viewModel.setBottomNavLabels(value);
-            ((OnboardingActivity) requireActivity()).nextPage();
-        });
+    }
+
+    public void saveSelection() {
+        int checkedId = binding.labelsGroup.getCheckedRadioButtonId();
+        String[] values = getResources().getStringArray(R.array.preference_bottom_navigation_bar_labels_values);
+        String value = values[0];
+        if (checkedId == R.id.radio_selected) {
+            value = values[1];
+        } else if (checkedId == R.id.radio_unlabeled) {
+            value = values[2];
+        }
+        viewModel.setBottomNavLabels(value);
     }
 
     @Override
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
index c8e1f486..0a1e8645 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/DataFragment.java
@@ -28,10 +28,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
-        binding.buttonFinish.setOnClickListener(v -> {
-            viewModel.markOnboardingComplete();
-            ((OnboardingActivity) requireActivity()).finishOnboarding();
-        });
     }
 
     @Override
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
index d50e50ee..940211b3 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
@@ -2,14 +2,20 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
+import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityOnboardingBinding;
 import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
@@ -18,6 +24,8 @@ public class OnboardingActivity extends AppCompatActivity {
 
     private ActivityOnboardingBinding binding;
     private OnboardingPagerAdapter adapter;
+    private OnboardingViewModel viewModel;
+    private int currentPosition = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,16 +33,87 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = ActivityOnboardingBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        viewModel = new ViewModelProvider(this).get(OnboardingViewModel.class);
+
         adapter = new OnboardingPagerAdapter(this);
         binding.viewPager.setAdapter(adapter);
-        binding.viewPager.setUserInputEnabled(false);
-    }
 
-    void nextPage() {
-        int current = binding.viewPager.getCurrentItem();
-        if (current < adapter.getItemCount() - 1) {
-            binding.viewPager.setCurrentItem(current + 1);
+        binding.viewPager.registerOnPageChangeCallback(new androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback() {
+            @Override
+            public void onPageSelected(int position) {
+                super.onPageSelected(position);
+                if (position > currentPosition) {
+                    Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + currentPosition);
+                    if (fragment instanceof ThemeFragment) {
+                        ((ThemeFragment) fragment).saveSelection();
+                    } else if (fragment instanceof StartPageFragment) {
+                        ((StartPageFragment) fragment).saveSelection();
+                    } else if (fragment instanceof BottomLabelsFragment) {
+                        ((BottomLabelsFragment) fragment).saveSelection();
+                    }
+                }
+                currentPosition = position;
+            }
+        });
+
+        new TabLayoutMediator(binding.tabIndicator, binding.viewPager, (tab, position) -> {
+            ImageView dot = new ImageView(this);
+            dot.setImageResource(R.drawable.onboarding_dot_unselected);
+            tab.setCustomView(dot);
+        }).attach();
+
+        TabLayout.Tab firstTab = binding.tabIndicator.getTabAt(0);
+        if (firstTab != null && firstTab.getCustomView() instanceof ImageView) {
+            ((ImageView) firstTab.getCustomView()).setImageResource(R.drawable.onboarding_dot_selected);
         }
+
+        binding.tabIndicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                if (tab.getCustomView() instanceof ImageView) {
+                    ((ImageView) tab.getCustomView()).setImageResource(R.drawable.onboarding_dot_selected);
+                }
+                updateButtons(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                if (tab.getCustomView() instanceof ImageView) {
+                    ((ImageView) tab.getCustomView()).setImageResource(R.drawable.onboarding_dot_unselected);
+                }
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) { }
+        });
+
+        binding.buttonBack.setOnClickListener(v -> {
+            int current = binding.viewPager.getCurrentItem();
+            if (current > 0) {
+                binding.viewPager.setCurrentItem(current - 1);
+            }
+        });
+
+        binding.buttonNext.setOnClickListener(v -> {
+            int current = binding.viewPager.getCurrentItem();
+            Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + current);
+            if (fragment instanceof ThemeFragment) {
+                ((ThemeFragment) fragment).saveSelection();
+            } else if (fragment instanceof StartPageFragment) {
+                ((StartPageFragment) fragment).saveSelection();
+            } else if (fragment instanceof BottomLabelsFragment) {
+                ((BottomLabelsFragment) fragment).saveSelection();
+            }
+
+            if (current < adapter.getItemCount() - 1) {
+                binding.viewPager.setCurrentItem(current + 1);
+            } else {
+                viewModel.markOnboardingComplete();
+                finishOnboarding();
+            }
+        });
+
+        updateButtons(0);
     }
 
     void finishOnboarding() {
@@ -42,6 +121,15 @@ void finishOnboarding() {
         finish();
     }
 
+    private void updateButtons(int position) {
+        binding.buttonBack.setVisibility(position == 0 ? View.INVISIBLE : View.VISIBLE);
+        if (position == adapter.getItemCount() - 1) {
+            binding.buttonNext.setText(R.string.finish);
+        } else {
+            binding.buttonNext.setText(R.string.next);
+        }
+    }
+
     private static class OnboardingPagerAdapter extends FragmentStateAdapter {
 
         OnboardingPagerAdapter(@NonNull AppCompatActivity activity) {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
index f010f1a3..63e60ae2 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/StartPageFragment.java
@@ -29,18 +29,18 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
-        binding.buttonNext.setOnClickListener(v -> {
-            int checkedId = binding.startPageGroup.getCheckedRadioButtonId();
-            String[] values = getResources().getStringArray(R.array.preference_default_tab_values);
-            String value = values[0];
-            if (checkedId == R.id.radio_android_studio) {
-                value = values[1];
-            } else if (checkedId == R.id.radio_about) {
-                value = values[2];
-            }
-            viewModel.setDefaultTab(value);
-            ((OnboardingActivity) requireActivity()).nextPage();
-        });
+    }
+
+    public void saveSelection() {
+        int checkedId = binding.startPageGroup.getCheckedRadioButtonId();
+        String[] values = getResources().getStringArray(R.array.preference_default_tab_values);
+        String value = values[0];
+        if (checkedId == R.id.radio_android_studio) {
+            value = values[1];
+        } else if (checkedId == R.id.radio_about) {
+            value = values[2];
+        }
+        viewModel.setDefaultTab(value);
     }
 
     @Override
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
index 65a45f2b..93c46b94 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/ThemeFragment.java
@@ -29,20 +29,20 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
-        binding.buttonNext.setOnClickListener(v -> {
-            int checkedId = binding.themeGroup.getCheckedRadioButtonId();
-            String[] values = getResources().getStringArray(R.array.preference_theme_values);
-            String value = values[0];
-            if (checkedId == R.id.radio_light) {
-                value = values[1];
-            } else if (checkedId == R.id.radio_dark) {
-                value = values[2];
-            } else if (checkedId == R.id.radio_auto_battery) {
-                value = values[3];
-            }
-            viewModel.setTheme(value);
-            ((OnboardingActivity) requireActivity()).nextPage();
-        });
+    }
+
+    public void saveSelection() {
+        int checkedId = binding.themeGroup.getCheckedRadioButtonId();
+        String[] values = getResources().getStringArray(R.array.preference_theme_values);
+        String value = values[0];
+        if (checkedId == R.id.radio_light) {
+            value = values[1];
+        } else if (checkedId == R.id.radio_dark) {
+            value = values[2];
+        } else if (checkedId == R.id.radio_auto_battery) {
+            value = values[3];
+        }
+        viewModel.setTheme(value);
     }
 
     @Override
diff --git a/app/src/main/res/drawable/onboarding_dot_selected.xml b/app/src/main/res/drawable/onboarding_dot_selected.xml
new file mode 100644
index 00000000..0dbd4abe
--- /dev/null
+++ b/app/src/main/res/drawable/onboarding_dot_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="8dp" android:height="8dp" />
+    <solid android:color="?attr/colorPrimary" />
+</shape>
diff --git a/app/src/main/res/drawable/onboarding_dot_unselected.xml b/app/src/main/res/drawable/onboarding_dot_unselected.xml
new file mode 100644
index 00000000..27944915
--- /dev/null
+++ b/app/src/main/res/drawable/onboarding_dot_unselected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="8dp" android:height="8dp" />
+    <solid android:color="@android:color/darker_gray" />
+</shape>
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 34750d77..53aaf356 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -9,8 +9,44 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/bottomBar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <LinearLayout
+        android:id="@+id/bottomBar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/buttonBack"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/back" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabIndicator"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            app:tabIndicatorGravity="center"
+            app:tabIndicatorFullWidth="false"
+            app:tabRippleColor="@android:color/transparent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/buttonNext"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next" />
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
index caab66c1..2b36eef9 100644
--- a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
+++ b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
@@ -40,10 +40,5 @@
                 android:text="@string/unlabeled" />
         </RadioGroup>
 
-        <Button
-            android:id="@+id/button_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_data.xml b/app/src/main/res/layout/fragment_onboarding_data.xml
index 7b25e824..ba940acb 100644
--- a/app/src/main/res/layout/fragment_onboarding_data.xml
+++ b/app/src/main/res/layout/fragment_onboarding_data.xml
@@ -13,11 +13,5 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/data_dialog_message" />
-
-        <Button
-            android:id="@+id/button_finish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/finish" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_start_page.xml b/app/src/main/res/layout/fragment_onboarding_start_page.xml
index d8cf0fbe..cf9ac73c 100644
--- a/app/src/main/res/layout/fragment_onboarding_start_page.xml
+++ b/app/src/main/res/layout/fragment_onboarding_start_page.xml
@@ -40,10 +40,5 @@
                 android:text="@string/about" />
         </RadioGroup>
 
-        <Button
-            android:id="@+id/button_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_theme.xml b/app/src/main/res/layout/fragment_onboarding_theme.xml
index 1d4a960e..b35616a0 100644
--- a/app/src/main/res/layout/fragment_onboarding_theme.xml
+++ b/app/src/main/res/layout/fragment_onboarding_theme.xml
@@ -46,10 +46,5 @@
                 android:text="@string/auto_battery_mode" />
         </RadioGroup>
 
-        <Button
-            android:id="@+id/button_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 836e73e8..6f08bb81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -340,6 +340,7 @@
     <string name="summary_preference_permissions_check_license">Allows the app to verify its compliance with the license agreement and enforce licensing terms to protect intellectual property.</string>
     <string name="next">Next</string>
     <string name="finish">Finish</string>
+    <string name="back">Back</string>
     <string name="bottom_navigation_labels">Bottom navigation labels</string>
     <string name="data_dialog_message">We collect data to improve your experience.</string>
     <string name="summary_preference_permissions_access_notification_policy">Allows the app to access and modify the device\'s notification policy, controlling how and when notifications are displayed to the user and providing custom notification management features.</string>

From 06437f272c7a1e493ff8d02d2aa738b01a53169e Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Fri, 12 Sep 2025 10:05:42 +0300
Subject: [PATCH 6/8] Allow onboarding font selection

---
 .../ui/screens/onboarding/FontFragment.java   | 59 +++++++++++++
 .../onboarding/OnboardingActivity.java        |  8 +-
 .../onboarding/OnboardingViewModel.java       |  4 +
 .../main/res/layout/activity_onboarding.xml   |  3 +-
 app/src/main/res/layout/activity_startup.xml  |  3 +-
 .../fragment_onboarding_bottom_labels.xml     | 73 +++++++++-------
 .../res/layout/fragment_onboarding_data.xml   | 16 +++-
 .../res/layout/fragment_onboarding_font.xml   | 83 ++++++++++++++++++
 .../layout/fragment_onboarding_start_page.xml | 73 +++++++++-------
 .../res/layout/fragment_onboarding_theme.xml  | 85 +++++++++++--------
 10 files changed, 307 insertions(+), 100 deletions(-)
 create mode 100644 app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/FontFragment.java
 create mode 100644 app/src/main/res/layout/fragment_onboarding_font.xml

diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/FontFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/FontFragment.java
new file mode 100644
index 00000000..2c996e56
--- /dev/null
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/FontFragment.java
@@ -0,0 +1,59 @@
+package com.d4rk.androidtutorials.java.ui.screens.onboarding;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.d4rk.androidtutorials.java.R;
+import com.d4rk.androidtutorials.java.databinding.FragmentOnboardingFontBinding;
+
+public class FontFragment extends Fragment {
+
+    private FragmentOnboardingFontBinding binding;
+    private OnboardingViewModel viewModel;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = FragmentOnboardingFontBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(OnboardingViewModel.class);
+    }
+
+    public void saveSelection() {
+        int checkedId = binding.fontGroup.getCheckedRadioButtonId();
+        String[] values = getResources().getStringArray(R.array.code_font_values);
+        String value = values[6];
+        if (checkedId == R.id.radio_font_audiowide) {
+            value = values[0];
+        } else if (checkedId == R.id.radio_font_fira_code) {
+            value = values[1];
+        } else if (checkedId == R.id.radio_font_jetbrains_mono) {
+            value = values[2];
+        } else if (checkedId == R.id.radio_font_noto_sans_mono) {
+            value = values[3];
+        } else if (checkedId == R.id.radio_font_poppins) {
+            value = values[4];
+        } else if (checkedId == R.id.radio_font_roboto_mono) {
+            value = values[5];
+        }
+        viewModel.setMonospaceFont(value);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
index 940211b3..b74c7c52 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
@@ -50,6 +50,8 @@ public void onPageSelected(int position) {
                         ((StartPageFragment) fragment).saveSelection();
                     } else if (fragment instanceof BottomLabelsFragment) {
                         ((BottomLabelsFragment) fragment).saveSelection();
+                    } else if (fragment instanceof FontFragment) {
+                        ((FontFragment) fragment).saveSelection();
                     }
                 }
                 currentPosition = position;
@@ -103,6 +105,8 @@ public void onTabReselected(TabLayout.Tab tab) { }
                 ((StartPageFragment) fragment).saveSelection();
             } else if (fragment instanceof BottomLabelsFragment) {
                 ((BottomLabelsFragment) fragment).saveSelection();
+            } else if (fragment instanceof FontFragment) {
+                ((FontFragment) fragment).saveSelection();
             }
 
             if (current < adapter.getItemCount() - 1) {
@@ -146,6 +150,8 @@ public Fragment createFragment(int position) {
                     return new StartPageFragment();
                 case 2:
                     return new BottomLabelsFragment();
+                case 3:
+                    return new FontFragment();
                 default:
                     return new DataFragment();
             }
@@ -153,7 +159,7 @@ public Fragment createFragment(int position) {
 
         @Override
         public int getItemCount() {
-            return 4;
+            return 5;
         }
     }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
index 78e3a1aa..dd02e95f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingViewModel.java
@@ -37,6 +37,10 @@ public void setBottomNavLabels(String value) {
         prefs.edit().putString(context.getString(R.string.key_bottom_navigation_bar_labels), value).apply();
     }
 
+    public void setMonospaceFont(String value) {
+        prefs.edit().putString(context.getString(R.string.key_monospace_font), value).apply();
+    }
+
     public void markOnboardingComplete() {
         prefs.edit().putBoolean(context.getString(R.string.key_onboarding_complete), true).apply();
     }
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 53aaf356..4d05475c 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager"
diff --git a/app/src/main/res/layout/activity_startup.xml b/app/src/main/res/layout/activity_startup.xml
index 87489e2c..0829745c 100644
--- a/app/src/main/res/layout/activity_startup.xml
+++ b/app/src/main/res/layout/activity_startup.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
         android:id="@+id/scroll_view"
diff --git a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
index 2b36eef9..d275a4ac 100644
--- a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
+++ b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
@@ -1,44 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
-        android:padding="16dp"
+        android:padding="24dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/bottom_navigation_labels"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+            app:cardElevation="0dp"
+            android:padding="16dp">
 
-        <RadioGroup
-            android:id="@+id/labels_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RadioButton
-                android:id="@+id/radio_labeled"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="@string/labeled" />
-
-            <RadioButton
-                android:id="@+id/radio_selected"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/selected" />
-
-            <RadioButton
-                android:id="@+id/radio_unlabeled"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/unlabeled" />
-        </RadioGroup>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/bottom_navigation_labels"
+                    android:layout_marginBottom="16dp"
+                    style="@style/TextAppearance.Material3.TitleLarge" />
+
+                <RadioGroup
+                    android:id="@+id/labels_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_labeled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/labeled" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_selected"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/selected" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_unlabeled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/unlabeled" />
+                </RadioGroup>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_data.xml b/app/src/main/res/layout/fragment_onboarding_data.xml
index ba940acb..a718d5d5 100644
--- a/app/src/main/res/layout/fragment_onboarding_data.xml
+++ b/app/src/main/res/layout/fragment_onboarding_data.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
-        android:padding="16dp"
+        android:padding="24dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/data_dialog_message" />
+            app:cardElevation="0dp"
+            android:padding="16dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/data_dialog_message" />
+        </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_font.xml b/app/src/main/res/layout/fragment_onboarding_font.xml
new file mode 100644
index 00000000..b501af0e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_font.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:padding="24dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="0dp"
+            android:padding="16dp">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/code_font"
+                    android:layout_marginBottom="16dp"
+                    style="@style/TextAppearance.Material3.TitleLarge" />
+
+                <RadioGroup
+                    android:id="@+id/font_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_audiowide"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/audiowide" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_fira_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/fira_code" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_jetbrains_mono"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/jetbrains_mono" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_noto_sans_mono"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/noto_sans_mono" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_poppins"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/poppins" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_roboto_mono"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/roboto_mono" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_font_google_sans_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/google_sans_code" />
+                </RadioGroup>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_start_page.xml b/app/src/main/res/layout/fragment_onboarding_start_page.xml
index cf9ac73c..0b2bb04f 100644
--- a/app/src/main/res/layout/fragment_onboarding_start_page.xml
+++ b/app/src/main/res/layout/fragment_onboarding_start_page.xml
@@ -1,44 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
-        android:padding="16dp"
+        android:padding="24dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/default_tab"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+            app:cardElevation="0dp"
+            android:padding="16dp">
 
-        <RadioGroup
-            android:id="@+id/start_page_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RadioButton
-                android:id="@+id/radio_home"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="@string/home" />
-
-            <RadioButton
-                android:id="@+id/radio_android_studio"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/android_studio" />
-
-            <RadioButton
-                android:id="@+id/radio_about"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/about" />
-        </RadioGroup>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/default_tab"
+                    android:layout_marginBottom="16dp"
+                    style="@style/TextAppearance.Material3.TitleLarge" />
+
+                <RadioGroup
+                    android:id="@+id/start_page_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_home"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/home" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_android_studio"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/android_studio" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_about"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/about" />
+                </RadioGroup>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_onboarding_theme.xml b/app/src/main/res/layout/fragment_onboarding_theme.xml
index b35616a0..6c264862 100644
--- a/app/src/main/res/layout/fragment_onboarding_theme.xml
+++ b/app/src/main/res/layout/fragment_onboarding_theme.xml
@@ -1,50 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
-        android:padding="16dp"
+        android:padding="24dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/theme"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+            app:cardElevation="0dp"
+            android:padding="16dp">
 
-        <RadioGroup
-            android:id="@+id/theme_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RadioButton
-                android:id="@+id/radio_system"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="@string/follow_system" />
-
-            <RadioButton
-                android:id="@+id/radio_light"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/light_mode" />
-
-            <RadioButton
-                android:id="@+id/radio_dark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/dark_mode" />
-
-            <RadioButton
-                android:id="@+id/radio_auto_battery"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/auto_battery_mode" />
-        </RadioGroup>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/theme"
+                    android:layout_marginBottom="16dp"
+                    style="@style/TextAppearance.Material3.TitleLarge" />
+
+                <RadioGroup
+                    android:id="@+id/theme_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_system"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/follow_system" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_light"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/light_mode" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_dark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dark_mode" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/radio_auto_battery"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/auto_battery_mode" />
+                </RadioGroup>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 </ScrollView>

From 33eaab432a0ca9c1c18fc73cf49d31b482e90b7e Mon Sep 17 00:00:00 2001
From: D4rK7355608 <d4rk7355608@gmail.com>
Date: Fri, 12 Sep 2025 10:13:51 +0300
Subject: [PATCH 7/8] Refactor imports and update strings

- Organize imports in various files for better readability.
- Update announcement and main card text in `strings.xml`.
---
 .../java/data/repository/DefaultHomeRepository.java   |  1 -
 .../data/repository/DefaultSupportRepository.java     |  2 --
 .../java/data/repository/HelpRepository.java          |  1 +
 .../java/data/repository/HomeRepository.java          |  1 +
 .../java/data/repository/StartupRepository.java       |  1 +
 .../java/data/repository/SupportRepository.java       |  4 +++-
 .../java/data/source/DefaultHomeRemoteDataSource.java |  1 +
 .../java/data/source/DefaultQuizLocalDataSource.java  |  3 +--
 .../com/d4rk/androidtutorials/java/di/AppModule.java  | 11 ++++++-----
 .../java/domain/help/LaunchReviewFlowUseCase.java     |  1 +
 .../RegisterPreferenceChangeListenerUseCase.java      |  1 +
 .../UnregisterPreferenceChangeListenerUseCase.java    |  1 +
 .../java/domain/startup/LoadConsentFormUseCase.java   |  1 +
 .../domain/startup/RequestConsentInfoUseCase.java     |  1 +
 .../domain/support/QueryProductDetailsUseCase.java    |  3 ++-
 .../java/ui/screens/about/AboutFragment.java          |  5 ++---
 .../java/ui/screens/about/AboutViewModel.java         |  7 ++++---
 .../ui/screens/android/AndroidStudioFragment.java     |  2 +-
 .../java/ui/screens/android/CodeActivity.java         |  2 +-
 .../java/ui/screens/android/CodeViewModel.java        |  2 +-
 .../alerts/alertdialog/AlertDialogActivity.java       |  3 +--
 .../lessons/alerts/snackbar/SnackBarActivity.java     |  3 +--
 .../android/lessons/alerts/toast/ToastActivity.java   |  3 +--
 .../lessons/basics/history/AndroidHistory.java        |  3 +--
 .../permissions/PermissionsTutorialActivity.java      |  3 +--
 .../android/lessons/basics/sdk/AndroidSDK.java        |  3 +--
 .../lessons/basics/shortcuts/ShortcutsActivity.java   |  2 +-
 .../basics/shortcuts/tabs/BuildShortcutsActivity.java |  3 +--
 .../basics/shortcuts/tabs/CodeShortcutsActivity.java  |  3 +--
 .../shortcuts/tabs/DebuggingShortcutsActivity.java    |  3 +--
 .../shortcuts/tabs/GeneralShortcutsActivity.java      |  3 +--
 .../tabs/NavigationAndSearchingShortcutsActivity.java |  3 +--
 .../shortcuts/tabs/RefactoringShortcutsActivity.java  |  3 +--
 .../tabs/VersionControlShortcutsActivity.java         |  3 +--
 .../viewbinding/ViewBindingTutorialActivity.java      | 10 +++++-----
 .../lessons/buttons/buttons/ButtonsActivity.java      |  3 +--
 .../lessons/buttons/buttons/ButtonsCodeActivity.java  |  2 +-
 .../lessons/buttons/image/ImageButtonsActivity.java   |  3 +--
 .../lessons/buttons/radio/RadioButtonsActivity.java   |  3 +--
 .../lessons/buttons/switches/SwitchActivity.java      |  3 +--
 .../clocks/chronometer/ChronometerActivity.java       |  2 +-
 .../android/lessons/clocks/clock/ClockActivity.java   |  3 +--
 .../lessons/clocks/clock/ClockCodeActivity.java       |  2 +-
 .../lessons/clocks/datepicker/DatePickerActivity.java |  3 +--
 .../lessons/clocks/timepicker/TimePickerActivity.java |  3 +--
 .../lessons/layouts/linear/LinearLayoutActivity.java  |  3 +--
 .../layouts/linear/LinearLayoutCodeActivity.java      |  2 +-
 .../layouts/relative/RelativeLayoutActivity.java      |  3 +--
 .../layouts/relative/RelativeLayoutCodeActivity.java  |  2 +-
 .../lessons/layouts/table/TableLayoutActivity.java    |  3 +--
 .../layouts/table/TableLayoutCodeActivity.java        |  2 +-
 .../bottomnavigation/BottomNavigationActivity.java    |  3 +--
 .../lessons/networking/retrofit/RetrofitActivity.java |  3 +--
 .../inbox/InboxNotificationActivity.java              |  2 +-
 .../simple/SimpleNotificationActivity.java            |  2 +-
 .../progress/progressbar/ProgressBarActivity.java     |  3 +--
 .../progress/progressbar/ProgressBarCodeActivity.java |  2 +-
 .../lessons/reviews/ratingbar/RatingBarActivity.java  |  3 +--
 .../lessons/start/AndroidStartProjectActivity.java    |  3 +--
 .../textboxes/passwordbox/PasswordBoxActivity.java    |  3 +--
 .../lessons/textboxes/textbox/TextboxActivity.java    |  3 +--
 .../android/lessons/views/grid/GirdViewActivity.java  |  3 +--
 .../android/lessons/views/images/ImagesActivity.java  |  3 +--
 .../lessons/views/images/ImagesCodeActivity.java      |  2 +-
 .../android/lessons/views/web/WebViewActivity.java    |  3 +--
 .../java/ui/screens/android/tabs/CodeFragment.java    |  5 ++---
 .../java/ui/screens/android/tabs/LayoutFragment.java  |  4 ++--
 .../java/ui/screens/help/HelpActivity.java            |  2 +-
 .../java/ui/screens/help/HelpViewModel.java           |  7 ++++---
 .../java/ui/screens/home/HomeFragment.java            |  9 ++++-----
 .../java/ui/screens/home/HomeUiState.java             |  4 ++--
 .../java/ui/screens/home/HomeViewModel.java           | 11 ++++++-----
 .../java/ui/screens/main/MainActivity.java            |  4 ++--
 .../java/ui/screens/main/MainViewModel.java           | 11 ++++++-----
 .../java/ui/screens/quiz/QuizActivity.java            | 11 ++++-------
 .../java/ui/screens/quiz/QuizViewModel.java           |  5 +++--
 .../java/ui/screens/settings/SettingsActivity.java    |  3 ---
 .../java/ui/screens/settings/SettingsViewModel.java   |  9 +++++----
 .../settings/repository/SettingsRepository.java       |  5 +++--
 .../screens/permissions/PermissionsActivity.java      |  2 +-
 .../java/ui/screens/startup/StartupActivity.java      |  1 -
 .../java/ui/screens/startup/StartupViewModel.java     |  7 ++++---
 .../screens/startup/repository/StartupRepository.java |  1 -
 .../java/ui/screens/support/SupportActivity.java      |  3 ++-
 .../java/ui/screens/support/SupportViewModel.java     |  9 +++++----
 app/src/main/res/values/strings.xml                   |  6 +++---
 86 files changed, 138 insertions(+), 163 deletions(-)

diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepository.java
index e5f62b79..f2714fe5 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepository.java
@@ -2,7 +2,6 @@
 
 import com.d4rk.androidtutorials.java.data.source.HomeLocalDataSource;
 import com.d4rk.androidtutorials.java.data.source.HomeRemoteDataSource;
-import com.d4rk.androidtutorials.java.data.repository.HomeRepository.PromotedAppsCallback;
 
 /**
  * Default implementation of {@link HomeRepository} combining local and remote sources.
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultSupportRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultSupportRepository.java
index 10049f98..54225f15 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultSupportRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultSupportRepository.java
@@ -11,8 +11,6 @@
 import com.android.billingclient.api.PendingPurchasesParams;
 import com.android.billingclient.api.ProductDetails;
 import com.android.billingclient.api.QueryProductDetailsParams;
-import com.d4rk.androidtutorials.java.data.repository.SupportRepository.BillingFlowLauncher;
-import com.d4rk.androidtutorials.java.data.repository.SupportRepository.OnProductDetailsListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
index f2f19139..b4acdd81 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 import android.app.Activity;
+
 import com.google.android.play.core.review.ReviewInfo;
 
 public interface HelpRepository {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HomeRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HomeRepository.java
index ab2fe615..26254989 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HomeRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HomeRepository.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 import com.d4rk.androidtutorials.java.data.model.PromotedApp;
+
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/StartupRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/StartupRepository.java
index 01ef39e2..4946e478 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/StartupRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/StartupRepository.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 import android.app.Activity;
+
 import com.google.android.ump.ConsentRequestParameters;
 import com.google.android.ump.FormError;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
index 079d3be4..daadae00 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
@@ -1,8 +1,10 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 import android.app.Activity;
-import com.google.android.gms.ads.AdRequest;
+
 import com.android.billingclient.api.ProductDetails;
+import com.google.android.gms.ads.AdRequest;
+
 import java.util.List;
 
 public interface SupportRepository {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultHomeRemoteDataSource.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultHomeRemoteDataSource.java
index ff74b671..c475809e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultHomeRemoteDataSource.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultHomeRemoteDataSource.java
@@ -2,6 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
+
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.JsonObjectRequest;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultQuizLocalDataSource.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultQuizLocalDataSource.java
index 91e90290..fb3bcaaa 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultQuizLocalDataSource.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/DefaultQuizLocalDataSource.java
@@ -1,11 +1,10 @@
 package com.d4rk.androidtutorials.java.data.source;
 
 import android.content.res.AssetManager;
+import android.util.JsonReader;
 
 import com.d4rk.androidtutorials.java.data.model.QuizQuestion;
 
-import android.util.JsonReader;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
index d7e2f529..9e6ae471 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
@@ -23,10 +23,10 @@
 import com.d4rk.androidtutorials.java.domain.about.GetVersionStringUseCase;
 import com.d4rk.androidtutorials.java.domain.help.LaunchReviewFlowUseCase;
 import com.d4rk.androidtutorials.java.domain.help.RequestReviewFlowUseCase;
+import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetDailyTipUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetPlayStoreUrlUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
+import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ApplyLanguageSettingsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ApplyThemeSettingsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetAppUpdateManagerUseCase;
@@ -37,10 +37,10 @@
 import com.d4rk.androidtutorials.java.domain.quiz.LoadQuizQuestionsUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.ApplyConsentUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.GetDarkModeUseCase;
+import com.d4rk.androidtutorials.java.domain.settings.OnPreferenceChangedUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.RegisterPreferenceChangeListenerUseCase;
-import com.d4rk.androidtutorials.java.domain.settings.UnregisterPreferenceChangeListenerUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.SetConsentAcceptedUseCase;
-import com.d4rk.androidtutorials.java.domain.settings.OnPreferenceChangedUseCase;
+import com.d4rk.androidtutorials.java.domain.settings.UnregisterPreferenceChangeListenerUseCase;
 import com.d4rk.androidtutorials.java.domain.startup.LoadConsentFormUseCase;
 import com.d4rk.androidtutorials.java.domain.startup.RequestConsentInfoUseCase;
 import com.d4rk.androidtutorials.java.domain.support.InitBillingClientUseCase;
@@ -55,11 +55,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
 import dagger.Provides;
 import dagger.hilt.InstallIn;
 import dagger.hilt.components.SingletonComponent;
-import javax.inject.Singleton;
 
 @Module
 @InstallIn(SingletonComponent.class)
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
index a2da94bb..ecf72737 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.help;
 
 import android.app.Activity;
+
 import com.d4rk.androidtutorials.java.data.repository.HelpRepository;
 import com.google.android.play.core.review.ReviewInfo;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
index d2d8bd30..6852dedc 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.settings;
 
 import android.content.SharedPreferences;
+
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
 /** Registers a listener for preference changes. */
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
index 10fe4b35..07966b4b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.settings;
 
 import android.content.SharedPreferences;
+
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
 /** Unregisters a listener for preference changes. */
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
index f73c6fe8..31300a61 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.startup;
 
 import android.app.Activity;
+
 import com.d4rk.androidtutorials.java.data.repository.StartupRepository;
 
 /** Loads and shows the consent form if required. */
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
index f0243ae8..d7fcaaff 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
@@ -1,6 +1,7 @@
 package com.d4rk.androidtutorials.java.domain.startup;
 
 import android.app.Activity;
+
 import com.d4rk.androidtutorials.java.data.repository.StartupRepository;
 import com.google.android.ump.ConsentRequestParameters;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
index ddaaa540..c5cc3308 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
@@ -1,8 +1,9 @@
 package com.d4rk.androidtutorials.java.domain.support;
 
-import java.util.List;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 
+import java.util.List;
+
 /** Queries in-app product details. */
 public class QueryProductDetailsUseCase {
     private final SupportRepository repository;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutFragment.java
index 50fae896..8d905467 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutFragment.java
@@ -17,13 +17,12 @@
 import com.d4rk.androidtutorials.java.BuildConfig;
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.FragmentAboutBinding;
+import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
-import com.d4rk.androidtutorials.java.utils.ConsentUtils;
-
-import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 
 import dagger.hilt.android.AndroidEntryPoint;
+import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 
 @AndroidEntryPoint
 public class AboutFragment extends Fragment {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutViewModel.java
index 28762b66..cc8e81e9 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/about/AboutViewModel.java
@@ -2,11 +2,12 @@
 
 import androidx.lifecycle.ViewModel;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
+import com.d4rk.androidtutorials.java.domain.about.GetCurrentYearUseCase;
+import com.d4rk.androidtutorials.java.domain.about.GetVersionStringUseCase;
+
 import javax.inject.Inject;
 
-import com.d4rk.androidtutorials.java.domain.about.GetVersionStringUseCase;
-import com.d4rk.androidtutorials.java.domain.about.GetCurrentYearUseCase;
+import dagger.hilt.android.lifecycle.HiltViewModel;
 
 
 /**
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
index 88b4e611..646174ae 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
@@ -29,6 +29,7 @@
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView;
+import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.google.android.gms.ads.AdListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.LoadAdError;
@@ -36,7 +37,6 @@
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.shape.CornerFamily;
 import com.google.android.material.shape.ShapeAppearanceModel;
-import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeActivity.java
index 9fb34204..29da8513 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeActivity.java
@@ -3,13 +3,13 @@
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.repository.LessonRepository;
 import com.d4rk.androidtutorials.java.ui.screens.android.tabs.CodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.tabs.LayoutFragment;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeViewModel.java
index 4842974c..4994f7a1 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/CodeViewModel.java
@@ -4,8 +4,8 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import com.d4rk.androidtutorials.java.ui.screens.android.repository.LessonRepository;
 import com.d4rk.androidtutorials.java.domain.android.GetLessonUseCase;
+import com.d4rk.androidtutorials.java.ui.screens.android.repository.LessonRepository;
 
 public class CodeViewModel extends ViewModel {
     private final MutableLiveData<LessonRepository.Lesson> lesson = new MutableLiveData<>();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
index 462a29dc..822e7a6e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityAlertDialogBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
index a91de999..16cddc1e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivitySnackBarBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.snackbar.Snackbar;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
index 2f873302..abe0f4ee 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
@@ -6,10 +6,9 @@
 import android.os.Looper;
 import android.widget.Toast;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityToastBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java
index 82ef7caf..bac5e923 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/history/AndroidHistory.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityAndroidHistoryBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/permissions/PermissionsTutorialActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/permissions/PermissionsTutorialActivity.java
index da3fa1a3..565e835d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/permissions/PermissionsTutorialActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/permissions/PermissionsTutorialActivity.java
@@ -4,9 +4,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityPermissionsTutorialBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
index f0b5bcee..a4328cf7 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
@@ -7,11 +7,10 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.data.model.AndroidVersion;
 import com.d4rk.androidtutorials.java.databinding.ActivityAndroidSdkBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/ShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/ShortcutsActivity.java
index 3af29237..7c3bc3d3 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/ShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/ShortcutsActivity.java
@@ -5,11 +5,11 @@
 import android.os.Bundle;
 
 import androidx.appcompat.app.ActionBar;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/BuildShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/BuildShortcutsActivity.java
index 27432a17..05fb19b8 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/BuildShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/BuildShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsBuildBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/CodeShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/CodeShortcutsActivity.java
index e8ace869..c8b4ec0f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/CodeShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/CodeShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsCodeBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/DebuggingShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/DebuggingShortcutsActivity.java
index bfeb7cde..a80f0aa2 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/DebuggingShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/DebuggingShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsDebuggingBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/GeneralShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/GeneralShortcutsActivity.java
index 88822a55..294cf17f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/GeneralShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/GeneralShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsGeneralBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/NavigationAndSearchingShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/NavigationAndSearchingShortcutsActivity.java
index 1e2c6e54..36939060 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/NavigationAndSearchingShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/NavigationAndSearchingShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsNavigationAndSearchingBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/RefactoringShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/RefactoringShortcutsActivity.java
index 23477a25..ad62352b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/RefactoringShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/RefactoringShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsRefractoringBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/VersionControlShortcutsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/VersionControlShortcutsActivity.java
index 12b1406a..00cfcc99 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/VersionControlShortcutsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/shortcuts/tabs/VersionControlShortcutsActivity.java
@@ -2,9 +2,8 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityShortcutsVersionControlBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/viewbinding/ViewBindingTutorialActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/viewbinding/ViewBindingTutorialActivity.java
index e7f0d22c..a45ae0bc 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/viewbinding/ViewBindingTutorialActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/viewbinding/ViewBindingTutorialActivity.java
@@ -5,18 +5,18 @@
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.preference.PreferenceManager;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityViewBindingTutorialBinding;
-import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
-import com.google.android.gms.ads.AdRequest;
-import com.d4rk.androidtutorials.java.utils.FontManager;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.CodeHighlighter;
 import com.d4rk.androidtutorials.java.utils.CodeViewUtils;
-import android.util.Log;
+import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
+import com.d4rk.androidtutorials.java.utils.FontManager;
+import com.google.android.gms.ads.AdRequest;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
index 6759f024..363b23e8 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityButtonsBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.snackbar.Snackbar;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsCodeActivity.java
index 978c5598..5baabe2f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.buttons.buttons.tabs.ButtonsTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.buttons.buttons.tabs.ButtonsTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
index 20a179f3..eb69bdc8 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityImageButtonsBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.snackbar.Snackbar;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
index 63dc0565..1303f371 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
@@ -6,9 +6,8 @@
 import android.os.Looper;
 import android.widget.RadioButton;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityRadioButtonsBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.snackbar.Snackbar;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
index a719a906..efd6b5bd 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivitySwitchBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.snackbar.Snackbar;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
index b4ffbd4a..14313295 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
@@ -7,9 +7,9 @@
 import android.os.SystemClock;
 
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 
 import com.d4rk.androidtutorials.java.databinding.ActivityChronometerBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
index cec21ab3..01b36624 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityClockBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockCodeActivity.java
index 6bbcfdfe..933acd2a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.clocks.clock.tabs.ClockTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.clocks.clock.tabs.ClockTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
index 7331b519..f26fdc5c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
@@ -6,9 +6,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityDatePickerBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
index a4d8cd04..e459413c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
@@ -6,9 +6,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityTimePickerBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
index 7b0bf6f9..42d63016 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityLinearLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutCodeActivity.java
index 1f325cb0..e1e5b43e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutCodeActivity.java
@@ -4,13 +4,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.linear.tabs.LinearLayoutTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.linear.tabs.LinearLayoutTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
index 775a11e3..3ca8d59d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityRelativeLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutCodeActivity.java
index e94f903e..576bc689 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.relative.tabs.RelativeLayoutTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.relative.tabs.RelativeLayoutTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
index 9dc44c4d..b591a546 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityTableLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutCodeActivity.java
index 66cf55ab..efc2a266 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.table.tabs.TableLayoutTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.layouts.table.tabs.TableLayoutTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
index 4663ebbf..0cd568e9 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
@@ -5,10 +5,9 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.R;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityBottomNavigationBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
index 1145d81d..9cee7f69 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
@@ -7,12 +7,11 @@
 
 import androidx.annotation.Nullable;
 
+import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityRetrofitBinding;
 import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
-import com.d4rk.androidtutorials.java.R;
-
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
index 74805af8..38ee5271 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
@@ -11,11 +11,11 @@
 import android.os.Looper;
 
 import androidx.annotation.RequiresApi;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.core.app.NotificationCompat;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityNotificationBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 
 public class InboxNotificationActivity extends UpNavigationActivity {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
index 18dcebcd..78534cce 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
@@ -11,11 +11,11 @@
 import android.os.Looper;
 
 import androidx.annotation.RequiresApi;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.core.app.NotificationCompat;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityNotificationBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 
 public class SimpleNotificationActivity extends UpNavigationActivity {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
index dcd274df..d43e1485 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityProgressBarBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarCodeActivity.java
index 32b46ed4..44e5fd19 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.progress.progressbar.tabs.ProgressBarTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.progress.progressbar.tabs.ProgressBarTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
index bedf8d46..9545a3f4 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
@@ -6,10 +6,9 @@
 import android.os.Looper;
 import android.widget.Toast;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityRatingBarBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 
 public class RatingBarActivity extends UpNavigationActivity {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/start/AndroidStartProjectActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/start/AndroidStartProjectActivity.java
index 6af4a7a3..08cd83ab 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/start/AndroidStartProjectActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/start/AndroidStartProjectActivity.java
@@ -4,11 +4,10 @@
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.BuildConfig;
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityAndroidStartProjectBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
index 2ce33b80..fdc16daa 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
@@ -8,10 +8,9 @@
 import android.text.method.HideReturnsTransformationMethod;
 import android.text.method.PasswordTransformationMethod;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityPasswordBoxBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.google.android.material.snackbar.Snackbar;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
index 2609fdd6..c6585bb6 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityTextBoxBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.google.android.material.snackbar.Snackbar;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
index 3c8d4563..5d1e4290 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
@@ -8,9 +8,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityGridViewBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
index 26b6bfba..fd96d22c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
@@ -5,9 +5,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityImagesBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesCodeActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesCodeActivity.java
index b16722d3..a35235d0 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesCodeActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesCodeActivity.java
@@ -4,12 +4,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityTabLayoutBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.views.images.tabs.ImagesTabCodeFragment;
 import com.d4rk.androidtutorials.java.ui.screens.android.lessons.views.images.tabs.ImagesTabLayoutFragment;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
index 7575653a..221d89f9 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
@@ -8,9 +8,8 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
-
 import com.d4rk.androidtutorials.java.databinding.ActivityWebviewBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.ui.screens.android.CodeActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/CodeFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/CodeFragment.java
index 40956688..2dcab1de 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/CodeFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/CodeFragment.java
@@ -15,11 +15,10 @@
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.FragmentCodeBinding;
-import com.d4rk.androidtutorials.java.utils.FontManager;
+import com.d4rk.androidtutorials.java.utils.CodeHighlighter;
 import com.d4rk.androidtutorials.java.utils.CodeViewUtils;
+import com.d4rk.androidtutorials.java.utils.FontManager;
 import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.MobileAds;
-import com.d4rk.androidtutorials.java.utils.CodeHighlighter;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/LayoutFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/LayoutFragment.java
index 62c9e75b..04f0d557 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/LayoutFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/tabs/LayoutFragment.java
@@ -15,10 +15,10 @@
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.FragmentLayoutBinding;
-import com.d4rk.androidtutorials.java.utils.FontManager;
-import com.google.android.gms.ads.AdRequest;
 import com.d4rk.androidtutorials.java.utils.CodeHighlighter;
 import com.d4rk.androidtutorials.java.utils.CodeViewUtils;
+import com.d4rk.androidtutorials.java.utils.FontManager;
+import com.google.android.gms.ads.AdRequest;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java
index f1e0e8db..920d98a3 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpActivity.java
@@ -10,7 +10,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import com.d4rk.androidtutorials.java.ui.components.navigation.BaseActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -19,6 +18,7 @@
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityHelpBinding;
 import com.d4rk.androidtutorials.java.databinding.DialogVersionInfoBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.BaseActivity;
 import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
 import com.d4rk.androidtutorials.java.utils.OpenSourceLicensesUtils;
 import com.google.android.material.snackbar.Snackbar;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpViewModel.java
index 100b4970..4f5232d8 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/help/HelpViewModel.java
@@ -5,14 +5,15 @@
 
 import androidx.lifecycle.ViewModel;
 
-import com.d4rk.androidtutorials.java.domain.help.RequestReviewFlowUseCase;
 import com.d4rk.androidtutorials.java.domain.help.LaunchReviewFlowUseCase;
-import com.google.android.play.core.review.ReviewInfo;
+import com.d4rk.androidtutorials.java.domain.help.RequestReviewFlowUseCase;
 import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
+import com.google.android.play.core.review.ReviewInfo;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
 
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 /**
  * ViewModel for the Help screen. Delegates to HelpRepository for
  * requesting or launching in-app reviews.
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java
index eaf501a3..af22fb7f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java
@@ -10,16 +10,15 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.bumptech.glide.Glide;
+import com.d4rk.androidtutorials.java.data.model.PromotedApp;
 import com.d4rk.androidtutorials.java.databinding.FragmentHomeBinding;
+import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
-import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 
-import me.zhanghai.android.fastscroll.FastScrollerBuilder;
-
-import com.bumptech.glide.Glide;
 import dagger.hilt.android.AndroidEntryPoint;
-import com.d4rk.androidtutorials.java.data.model.PromotedApp;
+import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 
 @AndroidEntryPoint
 public class HomeFragment extends Fragment {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
index a4814ec0..18ee0d2c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
@@ -1,9 +1,9 @@
 package com.d4rk.androidtutorials.java.ui.screens.home;
 
-import java.util.List;
-
 import com.d4rk.androidtutorials.java.data.model.PromotedApp;
 
+import java.util.List;
+
 /**
  * Represents the UI state for the Home screen.
  */
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java
index 851a9dbf..be596d2a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java
@@ -8,17 +8,18 @@
 import androidx.lifecycle.ViewModel;
 
 import com.d4rk.androidtutorials.java.data.model.PromotedApp;
+import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetDailyTipUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetPlayStoreUrlUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
-
-import dagger.hilt.android.lifecycle.HiltViewModel;
-import javax.inject.Inject;
+import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 
 @HiltViewModel
 public class HomeViewModel extends ViewModel {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
index 10b1bc08..6ebe757e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
@@ -28,6 +28,7 @@
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
+import androidx.preference.PreferenceManager;
 
 import com.d4rk.androidtutorials.java.BuildConfig;
 import com.d4rk.androidtutorials.java.R;
@@ -41,7 +42,6 @@
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.MobileAds;
 import com.google.android.material.navigation.NavigationBarView;
-import com.google.android.material.navigationrail.NavigationRailView;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.play.core.appupdate.AppUpdateInfo;
 import com.google.android.play.core.appupdate.AppUpdateManager;
@@ -50,7 +50,7 @@
 import com.google.android.play.core.install.model.AppUpdateType;
 import com.google.android.play.core.install.model.InstallStatus;
 import com.google.android.play.core.install.model.UpdateAvailability;
-import androidx.preference.PreferenceManager;
+
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
index 0c71f217..9a14bf8f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainViewModel.java
@@ -1,24 +1,25 @@
 package com.d4rk.androidtutorials.java.ui.screens.main;
 
 
-import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
 
 import com.d4rk.androidtutorials.java.R;
+import com.d4rk.androidtutorials.java.domain.main.ApplyLanguageSettingsUseCase;
 import com.d4rk.androidtutorials.java.domain.main.ApplyThemeSettingsUseCase;
+import com.d4rk.androidtutorials.java.domain.main.GetAppUpdateManagerUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetBottomNavLabelVisibilityUseCase;
 import com.d4rk.androidtutorials.java.domain.main.GetDefaultTabPreferenceUseCase;
-import com.d4rk.androidtutorials.java.domain.main.ApplyLanguageSettingsUseCase;
-import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
 import com.d4rk.androidtutorials.java.domain.main.MarkStartupScreenShownUseCase;
-import com.d4rk.androidtutorials.java.domain.main.GetAppUpdateManagerUseCase;
+import com.d4rk.androidtutorials.java.domain.main.ShouldShowStartupScreenUseCase;
 import com.google.android.material.navigation.NavigationBarView;
 import com.google.android.play.core.appupdate.AppUpdateManager;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
 
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 /**
  * ViewModel for MainActivity. It interacts with MainRepository to retrieve or
  * update data, and exposes it to the UI.
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizActivity.java
index 2dfc4ac2..86319e98 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizActivity.java
@@ -1,26 +1,23 @@
 package com.d4rk.androidtutorials.java.ui.screens.quiz;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.airbnb.lottie.LottieAnimationView;
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.data.model.QuizQuestion;
 import com.d4rk.androidtutorials.java.databinding.ActivityQuizBinding;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-import com.airbnb.lottie.LottieAnimationView;
 
-/**
- * Activity that displays a simple multiple-choice quiz.
- */
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizViewModel.java
index 22300e4c..6365b501 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/quiz/QuizViewModel.java
@@ -1,8 +1,8 @@
 package com.d4rk.androidtutorials.java.ui.screens.quiz;
 
-import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
 
 import com.d4rk.androidtutorials.java.data.model.QuizQuestion;
 import com.d4rk.androidtutorials.java.domain.quiz.LoadQuizQuestionsUseCase;
@@ -10,9 +10,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
 
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 /**
  * ViewModel managing quiz state and scoring.
  */
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsActivity.java
index 2d52301d..11b22c4c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsActivity.java
@@ -13,9 +13,6 @@
 import com.d4rk.androidtutorials.java.databinding.ActivitySettingsBinding;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
-/**
- * Settings screen that delegates preference change logic to a ViewModel/Repository.
- */
 import dagger.hilt.android.AndroidEntryPoint;
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsViewModel.java
index eb56cad7..c450a98d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/SettingsViewModel.java
@@ -4,16 +4,17 @@
 
 import androidx.lifecycle.ViewModel;
 
+import com.d4rk.androidtutorials.java.domain.settings.ApplyConsentUseCase;
+import com.d4rk.androidtutorials.java.domain.settings.GetDarkModeUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.OnPreferenceChangedUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.RegisterPreferenceChangeListenerUseCase;
-import com.d4rk.androidtutorials.java.domain.settings.UnregisterPreferenceChangeListenerUseCase;
-import com.d4rk.androidtutorials.java.domain.settings.GetDarkModeUseCase;
 import com.d4rk.androidtutorials.java.domain.settings.SetConsentAcceptedUseCase;
-import com.d4rk.androidtutorials.java.domain.settings.ApplyConsentUseCase;
+import com.d4rk.androidtutorials.java.domain.settings.UnregisterPreferenceChangeListenerUseCase;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
 
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 
 /**
  * ViewModel for the Settings screen. Delegates to SettingsRepository for
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
index f4a8d5eb..90b8a083 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
@@ -6,12 +6,13 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.os.LocaleListCompat;
 import androidx.preference.PreferenceManager;
+
+import com.d4rk.androidtutorials.java.R;
 import com.google.firebase.analytics.FirebaseAnalytics;
+
 import java.util.EnumMap;
 import java.util.Map;
 
-import com.d4rk.androidtutorials.java.R;
-
 /**
  * Repository that handles reading/writing preferences (e.g., theme, language)
  * and applies the changes (e.g., calls setDefaultNightMode).
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/screens/permissions/PermissionsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/screens/permissions/PermissionsActivity.java
index 881cb13f..eb40c99b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/screens/permissions/PermissionsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/screens/permissions/PermissionsActivity.java
@@ -2,11 +2,11 @@
 
 import android.os.Bundle;
 
-import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityPermissionsBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.UpNavigationActivity;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
 
 public class PermissionsActivity extends UpNavigationActivity {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
index 1d4143eb..7b75b49b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupActivity.java
@@ -10,7 +10,6 @@
 import com.d4rk.androidtutorials.java.databinding.ActivityStartupBinding;
 import com.d4rk.androidtutorials.java.ui.screens.onboarding.OnboardingActivity;
 import com.google.android.ump.ConsentRequestParameters;
-import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
index 21b703c2..47e88784 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
@@ -5,14 +5,15 @@
 
 import androidx.lifecycle.ViewModel;
 
-import com.d4rk.androidtutorials.java.domain.startup.RequestConsentInfoUseCase;
 import com.d4rk.androidtutorials.java.domain.startup.LoadConsentFormUseCase;
-import com.google.android.ump.ConsentRequestParameters;
+import com.d4rk.androidtutorials.java.domain.startup.RequestConsentInfoUseCase;
 import com.d4rk.androidtutorials.java.ui.screens.startup.repository.StartupRepository;
+import com.google.android.ump.ConsentRequestParameters;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
 import javax.inject.Inject;
 
+import dagger.hilt.android.lifecycle.HiltViewModel;
+
 /**
  * ViewModel for the startup screen.
  * Handles consent logic by delegating to StartupRepository.
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/repository/StartupRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/repository/StartupRepository.java
index de83d952..7e28f35b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/repository/StartupRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/repository/StartupRepository.java
@@ -6,7 +6,6 @@
 import com.google.android.ump.ConsentForm;
 import com.google.android.ump.ConsentInformation;
 import com.google.android.ump.ConsentRequestParameters;
-import com.google.android.ump.FormError;
 import com.google.android.ump.UserMessagingPlatform;
 
 /**
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java
index 228319a3..0de20f93 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportActivity.java
@@ -3,12 +3,13 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import com.d4rk.androidtutorials.java.ui.components.navigation.BaseActivity;
+
 import androidx.lifecycle.ViewModelProvider;
 
 import com.android.billingclient.api.ProductDetails;
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 import com.d4rk.androidtutorials.java.databinding.ActivitySupportBinding;
+import com.d4rk.androidtutorials.java.ui.components.navigation.BaseActivity;
 import com.google.android.gms.ads.AdRequest;
 
 import java.util.List;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
index 47854c38..0e8aa890 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
@@ -4,15 +4,16 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 import com.d4rk.androidtutorials.java.domain.support.InitBillingClientUseCase;
-import com.d4rk.androidtutorials.java.domain.support.QueryProductDetailsUseCase;
-import com.d4rk.androidtutorials.java.domain.support.InitiatePurchaseUseCase;
 import com.d4rk.androidtutorials.java.domain.support.InitMobileAdsUseCase;
+import com.d4rk.androidtutorials.java.domain.support.InitiatePurchaseUseCase;
+import com.d4rk.androidtutorials.java.domain.support.QueryProductDetailsUseCase;
 import com.google.android.gms.ads.AdRequest;
 
-import dagger.hilt.android.lifecycle.HiltViewModel;
+import java.util.List;
+
 import javax.inject.Inject;
 
-import java.util.List;
+import dagger.hilt.android.lifecycle.HiltViewModel;
 
 @HiltViewModel
 public class SupportViewModel extends ViewModel {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f08bb81..1fe2eb11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,11 +16,11 @@
 
     <string name="home">Home</string>
     <string name="announcement_title">A new app is here</string>
-    <string name="announcement_subtitle">Check out the latest Android Studio Tutorials app. Learn Material 3, XML layouts, and more.</string>
+    <string name="announcement_subtitle">Check out the latest Android Studio Tutorials app. Learn Jetpack Compose, Material 3, and more.</string>
     <string name="profile_picture_desc">Developer profile picture</string>
     <string name="main_card_title">Discover Android Studio tutorials</string>
-    <string name="main_card_subtitle">Built with Java and XML examples</string>
-    <string name="main_card_description">Learn Android development through practical Java code and XML layout samples.</string>
+    <string name="main_card_subtitle">Featuring Kotlin and Java editions</string>
+    <string name="main_card_description">The Kotlin Edition has been updated with dynamic lessons, AI assistant, and more. Experience the future of Android development.</string>
       <string name="get_on_google_play">Get it on Google Play</string>
       <string name="learn_more">Learn more</string>
     <string name="play_store">Play Store</string>

From 3fe3ff769b3b5ff5b21cee90e9a3fdc2ecdea8c0 Mon Sep 17 00:00:00 2001
From: D4rK7355608 <d4rk7355608@gmail.com>
Date: Fri, 12 Sep 2025 10:18:53 +0300
Subject: [PATCH 8/8] Cleanup and reformat code

Reformatted XML files and Java classes to improve readability and consistency.
Removed unused XML attributes and imports.
Ensured consistent spacing and line breaks across files.
---
 app/src/main/AndroidManifest.xml              |   15 +-
 app/src/main/assets/quiz_questions.json       |   42 +-
 .../java/ads/managers/AppOpenAd.java          |    2 +-
 .../java/data/model/AndroidVersion.java       |    3 +-
 .../java/data/model/PromotedApp.java          |    3 +-
 .../java/data/model/QuizQuestion.java         |    3 +-
 .../java/data/repository/AboutRepository.java |    1 +
 .../java/data/repository/HelpRepository.java  |    2 +
 .../data/repository/LessonRepository.java     |    4 +-
 .../java/data/repository/MainRepository.java  |    6 +
 .../java/data/repository/QuizRepository.java  |    4 +-
 .../data/repository/SettingsRepository.java   |    4 +
 .../data/repository/SupportRepository.java    |    3 +
 .../data/source/HomeRemoteDataSource.java     |    4 +-
 .../java/data/source/QuizLocalDataSource.java |    4 +-
 .../domain/about/GetCurrentYearUseCase.java   |    4 +-
 .../domain/about/GetVersionStringUseCase.java |    4 +-
 .../java/domain/android/GetLessonUseCase.java |    4 +-
 .../domain/help/LaunchReviewFlowUseCase.java  |    4 +-
 .../domain/help/RequestReviewFlowUseCase.java |    4 +-
 .../home/GetAppPlayStoreUrlUseCase.java       |    8 +-
 .../java/domain/home/GetDailyTipUseCase.java  |    4 +-
 .../domain/home/GetPlayStoreUrlUseCase.java   |    8 +-
 .../domain/home/GetPromotedAppsUseCase.java   |   12 +-
 .../main/ApplyLanguageSettingsUseCase.java    |    4 +-
 .../main/ApplyThemeSettingsUseCase.java       |    4 +-
 .../main/GetAppUpdateManagerUseCase.java      |    4 +-
 .../GetBottomNavLabelVisibilityUseCase.java   |    4 +-
 .../main/GetDefaultTabPreferenceUseCase.java  |    4 +-
 .../main/MarkStartupScreenShownUseCase.java   |    4 +-
 .../main/ShouldShowStartupScreenUseCase.java  |    4 +-
 .../domain/quiz/LoadQuizQuestionsUseCase.java |   12 +-
 .../domain/settings/ApplyConsentUseCase.java  |    4 +-
 .../domain/settings/GetDarkModeUseCase.java   |    4 +-
 .../settings/OnPreferenceChangedUseCase.java  |    4 +-
 ...gisterPreferenceChangeListenerUseCase.java |    4 +-
 .../settings/SetConsentAcceptedUseCase.java   |    4 +-
 ...gisterPreferenceChangeListenerUseCase.java |    4 +-
 .../startup/LoadConsentFormUseCase.java       |    4 +-
 .../startup/RequestConsentInfoUseCase.java    |    4 +-
 .../support/InitBillingClientUseCase.java     |    4 +-
 .../domain/support/InitMobileAdsUseCase.java  |    4 +-
 .../support/InitiatePurchaseUseCase.java      |    4 +-
 .../support/QueryProductDetailsUseCase.java   |    4 +-
 .../managers/QuizReminderManager.java         |    4 +-
 .../android/AndroidStudioFragment.java        |   14 +-
 .../alertdialog/AlertDialogActivity.java      |    4 +-
 .../alerts/snackbar/SnackBarActivity.java     |    4 +-
 .../lessons/alerts/toast/ToastActivity.java   |    4 +-
 .../lessons/basics/sdk/AndroidSDK.java        |    2 +-
 .../buttons/buttons/ButtonsActivity.java      |    4 +-
 .../buttons/image/ImageButtonsActivity.java   |    4 +-
 .../buttons/radio/RadioButtonsActivity.java   |    4 +-
 .../buttons/switches/SwitchActivity.java      |    4 +-
 .../chronometer/ChronometerActivity.java      |    4 +-
 .../lessons/clocks/clock/ClockActivity.java   |    4 +-
 .../clocks/datepicker/DatePickerActivity.java |    4 +-
 .../clocks/timepicker/TimePickerActivity.java |    4 +-
 .../lessons/data/room/AppDatabase.java        |    4 +-
 .../lessons/data/room/RoomActivity.java       |   12 +-
 .../layouts/linear/LinearLayoutActivity.java  |    4 +-
 .../relative/RelativeLayoutActivity.java      |    4 +-
 .../layouts/table/TableLayoutActivity.java    |    4 +-
 .../BottomNavigationActivity.java             |    4 +-
 .../drawer/NavigationDrawerActivity.java      |    4 +-
 .../networking/retrofit/RetrofitActivity.java |   20 +-
 .../inbox/InboxNotificationActivity.java      |    4 +-
 .../simple/SimpleNotificationActivity.java    |    4 +-
 .../progressbar/ProgressBarActivity.java      |    4 +-
 .../reviews/ratingbar/RatingBarActivity.java  |    4 +-
 .../passwordbox/PasswordBoxActivity.java      |    4 +-
 .../textboxes/textbox/TextboxActivity.java    |    4 +-
 .../lessons/views/grid/GirdViewActivity.java  |    4 +-
 .../lessons/views/images/ImagesActivity.java  |    4 +-
 .../lessons/views/web/WebViewActivity.java    |    4 +-
 .../java/ui/screens/home/HomeUiState.java     |    3 +-
 .../java/ui/screens/main/MainActivity.java    |   20 +-
 .../onboarding/OnboardingActivity.java        |    3 +-
 .../repository/SettingsRepository.java        |    4 +-
 .../ui/screens/startup/StartupViewModel.java  |    2 +-
 .../dialogs/ConsentDialogFragment.java        |    8 +-
 .../ui/screens/support/SupportViewModel.java  |    2 +-
 .../java/utils/CodeViewUtils.java             |    2 +-
 .../main/res/anim/fragment_spring_enter.xml   |   12 +-
 .../main/res/anim/fragment_spring_exit.xml    |   12 +-
 .../res/anim/fragment_spring_interpolator.xml |    3 +-
 .../res/anim/fragment_spring_pop_enter.xml    |   12 +-
 .../res/anim/fragment_spring_pop_exit.xml     |   12 +-
 .../res/drawable-anydpi/ic_account_circle.xml |    8 +-
 .../main/res/drawable-anydpi/ic_ad_group.xml  |    6 +-
 .../main/res/drawable-anydpi/ic_ad_units.xml  |    6 +-
 .../ic_category_network_tinted.xml            |    6 +-
 .../drawable-anydpi/ic_data_thresholding.xml  |    6 +-
 .../main/res/drawable-anydpi/ic_search.xml    |    2 +-
 .../drawable-anydpi/ic_signal_cellular.xml    |    6 +-
 .../ic_swap_driving_apps_wheel.xml            |    8 +-
 .../main/res/drawable/bg_ad_attribution.xml   |    7 +-
 .../res/drawable/onboarding_dot_selected.xml  |    7 +-
 .../drawable/onboarding_dot_unselected.xml    |    7 +-
 .../layout/activity_android_start_project.xml |   28 +-
 app/src/main/res/layout/activity_clock.xml    |    2 +-
 .../main/res/layout/activity_grid_view.xml    |    2 +-
 app/src/main/res/layout/activity_images.xml   |    2 +-
 app/src/main/res/layout/activity_main.xml     |   12 +-
 .../res/layout/activity_navigation_drawer.xml |    6 +-
 .../main/res/layout/activity_onboarding.xml   |   12 +-
 .../main/res/layout/activity_password_box.xml |    2 +-
 .../res/layout/activity_relative_layout.xml   |    2 +-
 .../main/res/layout/activity_shortcuts.xml    |    6 +-
 .../res/layout/activity_shortcuts_build.xml   |    8 +-
 .../res/layout/activity_shortcuts_code.xml    |    8 +-
 .../layout/activity_shortcuts_debugging.xml   |    8 +-
 .../res/layout/activity_shortcuts_general.xml |    8 +-
 ...ity_shortcuts_navigation_and_searching.xml |    8 +-
 .../activity_shortcuts_refractoring.xml       |    8 +-
 .../activity_shortcuts_version_control.xml    |    8 +-
 app/src/main/res/layout/activity_support.xml  |    2 +-
 app/src/main/res/layout/activity_switch.xml   |    2 +-
 .../main/res/layout/activity_table_layout.xml |    2 +-
 .../layout/activity_view_binding_tutorial.xml |   12 +-
 app/src/main/res/layout/ad_about.xml          |   22 +-
 .../res/layout/ad_android_studio_list.xml     |    4 +-
 app/src/main/res/layout/ad_attribution.xml    |    4 +-
 app/src/main/res/layout/ad_bottom_app_bar.xml |   10 +-
 .../main/res/layout/ad_home_banner_large.xml  |    2 +-
 app/src/main/res/layout/ad_lesson_code.xml    |    4 +-
 app/src/main/res/layout/fragment_about.xml    |    6 +-
 .../res/layout/fragment_buttons_layout.xml    |    8 +-
 .../main/res/layout/fragment_clock_layout.xml |    8 +-
 app/src/main/res/layout/fragment_code.xml     |    8 +-
 app/src/main/res/layout/fragment_home.xml     |   14 +-
 app/src/main/res/layout/fragment_layout.xml   |    8 +-
 .../layout/fragment_linear_layout_layout.xml  |    8 +-
 app/src/main/res/layout/fragment_no_code.xml  |    8 +-
 .../fragment_onboarding_bottom_labels.xml     |   18 +-
 .../res/layout/fragment_onboarding_data.xml   |   10 +-
 .../res/layout/fragment_onboarding_font.xml   |   18 +-
 .../layout/fragment_onboarding_start_page.xml |   18 +-
 .../res/layout/fragment_onboarding_theme.xml  |   18 +-
 .../main/res/layout/fragment_same_code.xml    |    8 +-
 .../res/layout/item_android_studio_lesson.xml |    2 +-
 app/src/main/res/layout/item_promoted_app.xml |    2 +-
 app/src/main/res/menu/bottom_nav_menu.xml     |   12 +-
 app/src/main/res/raw/anim_quiz_success.json   | 5558 ++++++++++++++++-
 app/src/main/res/values-bg-rBG/strings.xml    |    2 +-
 app/src/main/res/values-de-rDE/strings.xml    |    2 +-
 app/src/main/res/values-es-rGQ/strings.xml    |    2 +-
 app/src/main/res/values-es-rMX/strings.xml    |    2 +-
 app/src/main/res/values-fil-rPH/strings.xml   |    2 +-
 app/src/main/res/values-fr-rFR/strings.xml    |    2 +-
 app/src/main/res/values-hu-rHU/strings.xml    |    2 +-
 app/src/main/res/values-in-rID/strings.xml    |    2 +-
 app/src/main/res/values-ko-rKR/strings.xml    |    2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |    2 +-
 app/src/main/res/values-ro-rRO/strings.xml    |    2 +-
 app/src/main/res/values-ru-rRU/strings.xml    |    2 +-
 app/src/main/res/values-sv-rSE/strings.xml    |    2 +-
 app/src/main/res/values-th-rTH/strings.xml    |    2 +-
 app/src/main/res/values-tr-rTR/strings.xml    |    2 +-
 app/src/main/res/values-uk-rUA/strings.xml    |    2 +-
 app/src/main/res/values-vi-rVN/strings.xml    |    2 +-
 app/src/main/res/values-zh-rTW/strings.xml    |    2 +-
 app/src/main/res/values/strings.xml           |   12 +-
 app/src/main/res/xml/locales_config.xml       |   52 +-
 app/src/main/res/xml/preferences_settings.xml |   18 +-
 .../repository/DefaultHomeRepositoryTest.java |   36 +-
 .../repository/DefaultQuizRepositoryTest.java |   31 +-
 .../ui/screens/home/HomeViewModelTest.java    |   56 +-
 168 files changed, 6214 insertions(+), 513 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5fc1b9b8..5c81b0dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto">
 
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
+    <uses-permission
+        android:name="com.google.android.gms.permission.AD_ID"
         tools:ignore="AdvertisingIdPolicy" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -10,7 +11,8 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
         tools:ignore="ForegroundServicesPolicy" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
@@ -121,10 +123,12 @@
             android:exported="false"
             android:label="@string/web_view"
             android:parentActivityName=".ui.screens.main.MainActivity" />
+
         <activity-alias
             android:name="com.d4rk.androidtutorials.java.ui.android.webviews.WebViewActivity"
             android:exported="false"
             android:targetActivity=".ui.screens.android.lessons.views.web.WebViewActivity" />
+
         <activity
             android:name=".ui.screens.android.lessons.progress.progressbar.ProgressBarActivity"
             android:exported="false"
@@ -281,8 +285,8 @@
             android:name=".ui.screens.android.lessons.start.AndroidStartProjectActivity"
             android:exported="false"
             android:label="@string/android_start"
-            android:theme="@style/AppTheme"
-            android:parentActivityName=".ui.screens.main.MainActivity" />
+            android:parentActivityName=".ui.screens.main.MainActivity"
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.screens.android.lessons.basics.sdk.AndroidSDK"
             android:exported="false"
@@ -395,7 +399,8 @@
             android:name="firebase_performance_logcat_enabled"
             android:value="true" />
 
-        <meta-data android:name="google_analytics_automatic_screen_reporting_enabled"
+        <meta-data
+            android:name="google_analytics_automatic_screen_reporting_enabled"
             android:value="true" />
 
         <meta-data
diff --git a/app/src/main/assets/quiz_questions.json b/app/src/main/assets/quiz_questions.json
index 4bea035d..c38b00d8 100644
--- a/app/src/main/assets/quiz_questions.json
+++ b/app/src/main/assets/quiz_questions.json
@@ -1,32 +1,62 @@
 [
   {
     "question": "What language is primarily used for Android app development?",
-    "options": ["Python", "Java", "Swift", "Ruby"],
+    "options": [
+      "Python",
+      "Java",
+      "Swift",
+      "Ruby"
+    ],
     "answer": 1
   },
   {
     "question": "Which file declares your app's activities?",
-    "options": ["build.gradle", "AndroidManifest.xml", "strings.xml", "MainActivity.java"],
+    "options": [
+      "build.gradle",
+      "AndroidManifest.xml",
+      "strings.xml",
+      "MainActivity.java"
+    ],
     "answer": 1
   },
   {
     "question": "Where do you store string resources?",
-    "options": ["AndroidManifest.xml", "build.gradle", "strings.xml", "colors.xml"],
+    "options": [
+      "AndroidManifest.xml",
+      "build.gradle",
+      "strings.xml",
+      "colors.xml"
+    ],
     "answer": 2
   },
   {
     "question": "Which layout allows positioning views relative to others?",
-    "options": ["LinearLayout", "ConstraintLayout", "FrameLayout", "TableLayout"],
+    "options": [
+      "LinearLayout",
+      "ConstraintLayout",
+      "FrameLayout",
+      "TableLayout"
+    ],
     "answer": 1
   },
   {
     "question": "What component shows a scrollable list of items?",
-    "options": ["RecyclerView", "TextView", "ImageView", "Button"],
+    "options": [
+      "RecyclerView",
+      "TextView",
+      "ImageView",
+      "Button"
+    ],
     "answer": 0
   },
   {
     "question": "Which library simplifies HTTP requests by turning APIs into interfaces?",
-    "options": ["Volley", "Retrofit", "Glide", "Room"],
+    "options": [
+      "Volley",
+      "Retrofit",
+      "Glide",
+      "Room"
+    ],
     "answer": 1
   }
 ]
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/AppOpenAd.java b/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/AppOpenAd.java
index 5aad8048..1ba69e2f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/AppOpenAd.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ads/managers/AppOpenAd.java
@@ -90,11 +90,11 @@ public interface OnShowAdCompleteListener {
 
     private static class AppOpenAdManager {
         private static final String AD_UNIT_ID = "ca-app-pub-5294151573817700/9123330876";
+        private final Application application;
         private com.google.android.gms.ads.appopen.AppOpenAd appOpenAd = null;
         private boolean isLoadingAd = false;
         private boolean isShowingAd = false;
         private long loadTime = 0;
-        private final Application application;
 
         public AppOpenAdManager(Application application) {
             this.application = application;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/AndroidVersion.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/AndroidVersion.java
index 863e4ea5..1fede147 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/AndroidVersion.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/AndroidVersion.java
@@ -6,4 +6,5 @@ public record AndroidVersion(
         String codeName,
         String codenameLiteral,
         String year
-) {}
\ No newline at end of file
+) {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/PromotedApp.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/PromotedApp.java
index 84bd9fde..fbdf09f1 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/PromotedApp.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/PromotedApp.java
@@ -3,4 +3,5 @@
 /**
  * Model representing a promoted application fetched from the remote API.
  */
-public record PromotedApp(String name, String packageName, String iconUrl) {}
+public record PromotedApp(String name, String packageName, String iconUrl) {
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/QuizQuestion.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/QuizQuestion.java
index e8600cda..e4a45538 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/model/QuizQuestion.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/model/QuizQuestion.java
@@ -7,4 +7,5 @@ public record QuizQuestion(
         String question,
         String[] options,
         int answerIndex
-) {}
+) {
+}
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/AboutRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/AboutRepository.java
index 2bd9f28d..47570ba7 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/AboutRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/AboutRepository.java
@@ -2,5 +2,6 @@
 
 public interface AboutRepository {
     String getVersionString();
+
     String getCurrentYear();
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
index b4acdd81..f5ba65a3 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/HelpRepository.java
@@ -6,10 +6,12 @@
 
 public interface HelpRepository {
     void requestReviewFlow(OnReviewInfoListener listener);
+
     void launchReviewFlow(Activity activity, ReviewInfo reviewInfo);
 
     interface OnReviewInfoListener {
         void onSuccess(ReviewInfo info);
+
         void onFailure(Exception e);
     }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/LessonRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/LessonRepository.java
index 4ff72a1d..6ec5a905 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/LessonRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/LessonRepository.java
@@ -1,6 +1,8 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
 public interface LessonRepository {
-    record Lesson(int titleResId, int codeResId, int layoutResId) {}
     Lesson getLesson(String lessonName);
+
+    record Lesson(int titleResId, int codeResId, int layoutResId) {
+    }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
index 5e637087..e2935ca2 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/MainRepository.java
@@ -4,10 +4,16 @@
 
 public interface MainRepository {
     boolean applyThemeSettings(String[] darkModeValues);
+
     String getBottomNavLabelVisibility();
+
     String getDefaultTabPreference();
+
     boolean shouldShowStartupScreen();
+
     void markStartupScreenShown();
+
     void applyLanguageSettings();
+
     AppUpdateManager getAppUpdateManager();
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/QuizRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/QuizRepository.java
index 715323bf..f260bf10 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/QuizRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/QuizRepository.java
@@ -9,9 +9,9 @@
  */
 public interface QuizRepository {
 
+    void loadQuestions(QuestionsCallback callback);
+
     interface QuestionsCallback {
         void onResult(List<QuizQuestion> questions);
     }
-
-    void loadQuestions(QuestionsCallback callback);
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SettingsRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SettingsRepository.java
index 5a8a8b5a..c2f0d302 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SettingsRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SettingsRepository.java
@@ -4,12 +4,16 @@
 
 public interface SettingsRepository {
     void handlePreferenceChange(String key);
+
     boolean applyTheme();
+
     void applyConsent();
 
     void registerPreferenceChangeListener(SharedPreferences.OnSharedPreferenceChangeListener listener);
+
     void unregisterPreferenceChangeListener(SharedPreferences.OnSharedPreferenceChangeListener listener);
 
     String getDarkMode();
+
     void setConsentAccepted(boolean accepted);
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
index daadae00..f257bc96 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/SupportRepository.java
@@ -9,8 +9,11 @@
 
 public interface SupportRepository {
     void initBillingClient(Runnable onConnected);
+
     void queryProductDetails(List<String> productIds, OnProductDetailsListener listener);
+
     BillingFlowLauncher initiatePurchase(String productId);
+
     AdRequest initMobileAds();
 
     interface OnProductDetailsListener {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/HomeRemoteDataSource.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/HomeRemoteDataSource.java
index 78e8fe86..827d8daf 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/HomeRemoteDataSource.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/HomeRemoteDataSource.java
@@ -9,9 +9,9 @@
  */
 public interface HomeRemoteDataSource {
 
+    void fetchPromotedApps(PromotedAppsCallback callback);
+
     interface PromotedAppsCallback {
         void onResult(List<PromotedApp> apps);
     }
-
-    void fetchPromotedApps(PromotedAppsCallback callback);
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/QuizLocalDataSource.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/QuizLocalDataSource.java
index f4f1f4da..3a20a989 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/data/source/QuizLocalDataSource.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/source/QuizLocalDataSource.java
@@ -9,9 +9,9 @@
  */
 public interface QuizLocalDataSource {
 
+    void loadQuestions(QuestionsCallback callback);
+
     interface QuestionsCallback {
         void onResult(List<QuizQuestion> questions);
     }
-
-    void loadQuestions(QuestionsCallback callback);
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetCurrentYearUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetCurrentYearUseCase.java
index 5fb16b2b..310b2e15 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetCurrentYearUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetCurrentYearUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.AboutRepository;
 
-/** Provides current year as a string. */
+/**
+ * Provides current year as a string.
+ */
 public class GetCurrentYearUseCase {
     private final AboutRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetVersionStringUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetVersionStringUseCase.java
index 5350ab9a..f033f83a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetVersionStringUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/about/GetVersionStringUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.AboutRepository;
 
-/** Returns the formatted app version string. */
+/**
+ * Returns the formatted app version string.
+ */
 public class GetVersionStringUseCase {
     private final AboutRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/android/GetLessonUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/android/GetLessonUseCase.java
index 80e1e689..cd602c4b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/android/GetLessonUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/android/GetLessonUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.LessonRepository;
 
-/** Retrieves lesson data by name. */
+/**
+ * Retrieves lesson data by name.
+ */
 public class GetLessonUseCase {
     private final LessonRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
index ecf72737..040d7405 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/LaunchReviewFlowUseCase.java
@@ -5,7 +5,9 @@
 import com.d4rk.androidtutorials.java.data.repository.HelpRepository;
 import com.google.android.play.core.review.ReviewInfo;
 
-/** Launches the in-app review flow. */
+/**
+ * Launches the in-app review flow.
+ */
 public class LaunchReviewFlowUseCase {
     private final HelpRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/RequestReviewFlowUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/RequestReviewFlowUseCase.java
index 0ffac953..263b7bd8 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/RequestReviewFlowUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/help/RequestReviewFlowUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.HelpRepository;
 
-/** Requests the Google Play review flow. */
+/**
+ * Requests the Google Play review flow.
+ */
 public class RequestReviewFlowUseCase {
     private final HelpRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetAppPlayStoreUrlUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetAppPlayStoreUrlUseCase.java
index 13d0ae31..0d9f755b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetAppPlayStoreUrlUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetAppPlayStoreUrlUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
 
-/** Use case that builds a Play Store URL for a given package name. */
+/**
+ * Use case that builds a Play Store URL for a given package name.
+ */
 public class GetAppPlayStoreUrlUseCase {
     private final HomeRepository repository;
 
@@ -10,7 +12,9 @@ public GetAppPlayStoreUrlUseCase(HomeRepository repository) {
         this.repository = repository;
     }
 
-    /** Returns the Play Store URL for the specified package name. */
+    /**
+     * Returns the Play Store URL for the specified package name.
+     */
     public String invoke(String packageName) {
         return repository.getAppPlayStoreUrl(packageName);
     }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetDailyTipUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetDailyTipUseCase.java
index 2887344e..7d9e6141 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetDailyTipUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetDailyTipUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
 
-/** Use case that provides the daily tip text. */
+/**
+ * Use case that provides the daily tip text.
+ */
 public class GetDailyTipUseCase {
     private final HomeRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPlayStoreUrlUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPlayStoreUrlUseCase.java
index c108099c..3149bc6b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPlayStoreUrlUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPlayStoreUrlUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
 
-/** Use case that provides the Play Store URL for this app. */
+/**
+ * Use case that provides the Play Store URL for this app.
+ */
 public class GetPlayStoreUrlUseCase {
     private final HomeRepository repository;
 
@@ -10,7 +12,9 @@ public GetPlayStoreUrlUseCase(HomeRepository repository) {
         this.repository = repository;
     }
 
-    /** Returns the Play Store URL for the application. */
+    /**
+     * Returns the Play Store URL for the application.
+     */
     public String invoke() {
         return repository.getPlayStoreUrl();
     }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPromotedAppsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPromotedAppsUseCase.java
index a9ac99ba..6835ae4d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPromotedAppsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/home/GetPromotedAppsUseCase.java
@@ -5,14 +5,12 @@
 
 import java.util.List;
 
-/** Use case that fetches promoted apps from the repository. */
+/**
+ * Use case that fetches promoted apps from the repository.
+ */
 public class GetPromotedAppsUseCase {
     private final HomeRepository repository;
 
-    public interface Callback {
-        void onResult(List<PromotedApp> apps);
-    }
-
     public GetPromotedAppsUseCase(HomeRepository repository) {
         this.repository = repository;
     }
@@ -23,4 +21,8 @@ public GetPromotedAppsUseCase(HomeRepository repository) {
     public void invoke(Callback callback) {
         repository.fetchPromotedApps(callback::onResult);
     }
+
+    public interface Callback {
+        void onResult(List<PromotedApp> apps);
+    }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyLanguageSettingsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyLanguageSettingsUseCase.java
index 3fc8de2d..ee9a3e57 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyLanguageSettingsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyLanguageSettingsUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Applies the saved language preference. */
+/**
+ * Applies the saved language preference.
+ */
 public class ApplyLanguageSettingsUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyThemeSettingsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyThemeSettingsUseCase.java
index cf418d44..87002db7 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyThemeSettingsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ApplyThemeSettingsUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Applies theme preference and returns true if changed. */
+/**
+ * Applies theme preference and returns true if changed.
+ */
 public class ApplyThemeSettingsUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetAppUpdateManagerUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetAppUpdateManagerUseCase.java
index 60c6c9fb..224b6afc 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetAppUpdateManagerUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetAppUpdateManagerUseCase.java
@@ -3,7 +3,9 @@
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 import com.google.android.play.core.appupdate.AppUpdateManager;
 
-/** Provides the AppUpdateManager instance. */
+/**
+ * Provides the AppUpdateManager instance.
+ */
 public class GetAppUpdateManagerUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetBottomNavLabelVisibilityUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetBottomNavLabelVisibilityUseCase.java
index f8a92a82..68681e8c 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetBottomNavLabelVisibilityUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetBottomNavLabelVisibilityUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Returns bottom navigation label visibility preference. */
+/**
+ * Returns bottom navigation label visibility preference.
+ */
 public class GetBottomNavLabelVisibilityUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetDefaultTabPreferenceUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetDefaultTabPreferenceUseCase.java
index a5cbd2ce..595acf10 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetDefaultTabPreferenceUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/GetDefaultTabPreferenceUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Returns the default tab preference string. */
+/**
+ * Returns the default tab preference string.
+ */
 public class GetDefaultTabPreferenceUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/MarkStartupScreenShownUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/MarkStartupScreenShownUseCase.java
index e487410c..7c6d876b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/MarkStartupScreenShownUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/MarkStartupScreenShownUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Marks that the startup screen has been shown. */
+/**
+ * Marks that the startup screen has been shown.
+ */
 public class MarkStartupScreenShownUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ShouldShowStartupScreenUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ShouldShowStartupScreenUseCase.java
index 199b4c45..99484fcd 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ShouldShowStartupScreenUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/main/ShouldShowStartupScreenUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 
-/** Determines if the startup screen should be shown. */
+/**
+ * Determines if the startup screen should be shown.
+ */
 public class ShouldShowStartupScreenUseCase {
     private final MainRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/quiz/LoadQuizQuestionsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/quiz/LoadQuizQuestionsUseCase.java
index 1f8fc011..6cde5672 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/quiz/LoadQuizQuestionsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/quiz/LoadQuizQuestionsUseCase.java
@@ -5,14 +5,12 @@
 
 import java.util.List;
 
-/** Loads quiz questions from assets. */
+/**
+ * Loads quiz questions from assets.
+ */
 public class LoadQuizQuestionsUseCase {
     private final QuizRepository repository;
 
-    public interface Callback {
-        void onResult(List<QuizQuestion> questions);
-    }
-
     public LoadQuizQuestionsUseCase(QuizRepository repository) {
         this.repository = repository;
     }
@@ -20,4 +18,8 @@ public LoadQuizQuestionsUseCase(QuizRepository repository) {
     public void invoke(Callback callback) {
         repository.loadQuestions(callback::onResult);
     }
+
+    public interface Callback {
+        void onResult(List<QuizQuestion> questions);
+    }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/ApplyConsentUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/ApplyConsentUseCase.java
index 9a9c596b..ed5a6e5e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/ApplyConsentUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/ApplyConsentUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Applies the Firebase consent settings. */
+/**
+ * Applies the Firebase consent settings.
+ */
 public class ApplyConsentUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/GetDarkModeUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/GetDarkModeUseCase.java
index 10d5f3e5..09d4fded 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/GetDarkModeUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/GetDarkModeUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Returns the stored dark mode preference value. */
+/**
+ * Returns the stored dark mode preference value.
+ */
 public class GetDarkModeUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/OnPreferenceChangedUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/OnPreferenceChangedUseCase.java
index 240386a0..1cba0313 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/OnPreferenceChangedUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/OnPreferenceChangedUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Handles a preference change and returns true if theme changed. */
+/**
+ * Handles a preference change and returns true if theme changed.
+ */
 public class OnPreferenceChangedUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
index 6852dedc..af0a5366 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/RegisterPreferenceChangeListenerUseCase.java
@@ -4,7 +4,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Registers a listener for preference changes. */
+/**
+ * Registers a listener for preference changes.
+ */
 public class RegisterPreferenceChangeListenerUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/SetConsentAcceptedUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/SetConsentAcceptedUseCase.java
index e0d39597..3f0eddde 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/SetConsentAcceptedUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/SetConsentAcceptedUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Writes whether the user has accepted analytics consent. */
+/**
+ * Writes whether the user has accepted analytics consent.
+ */
 public class SetConsentAcceptedUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
index 07966b4b..784a4f28 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/settings/UnregisterPreferenceChangeListenerUseCase.java
@@ -4,7 +4,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SettingsRepository;
 
-/** Unregisters a listener for preference changes. */
+/**
+ * Unregisters a listener for preference changes.
+ */
 public class UnregisterPreferenceChangeListenerUseCase {
     private final SettingsRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
index 31300a61..e5bcaf71 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/LoadConsentFormUseCase.java
@@ -4,7 +4,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.StartupRepository;
 
-/** Loads and shows the consent form if required. */
+/**
+ * Loads and shows the consent form if required.
+ */
 public class LoadConsentFormUseCase {
     private final StartupRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
index d7fcaaff..2387af2f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/startup/RequestConsentInfoUseCase.java
@@ -5,7 +5,9 @@
 import com.d4rk.androidtutorials.java.data.repository.StartupRepository;
 import com.google.android.ump.ConsentRequestParameters;
 
-/** Requests consent info update via UMP. */
+/**
+ * Requests consent info update via UMP.
+ */
 public class RequestConsentInfoUseCase {
     private final StartupRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitBillingClientUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitBillingClientUseCase.java
index 7f01ee92..8188ae71 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitBillingClientUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitBillingClientUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 
-/** Initializes billing client and invokes callback when connected. */
+/**
+ * Initializes billing client and invokes callback when connected.
+ */
 public class InitBillingClientUseCase {
     private final SupportRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitMobileAdsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitMobileAdsUseCase.java
index 86d91d4a..a50cd04b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitMobileAdsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitMobileAdsUseCase.java
@@ -3,7 +3,9 @@
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 import com.google.android.gms.ads.AdRequest;
 
-/** Initializes Google Mobile Ads. */
+/**
+ * Initializes Google Mobile Ads.
+ */
 public class InitMobileAdsUseCase {
     private final SupportRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitiatePurchaseUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitiatePurchaseUseCase.java
index dd232b1f..2eb8da2f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitiatePurchaseUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/InitiatePurchaseUseCase.java
@@ -2,7 +2,9 @@
 
 import com.d4rk.androidtutorials.java.data.repository.SupportRepository;
 
-/** Launches billing flow for a product. */
+/**
+ * Launches billing flow for a product.
+ */
 public class InitiatePurchaseUseCase {
     private final SupportRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
index c5cc3308..57120b4a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/domain/support/QueryProductDetailsUseCase.java
@@ -4,7 +4,9 @@
 
 import java.util.List;
 
-/** Queries in-app product details. */
+/**
+ * Queries in-app product details.
+ */
 public class QueryProductDetailsUseCase {
     private final SupportRepository repository;
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/notifications/managers/QuizReminderManager.java b/app/src/main/java/com/d4rk/androidtutorials/java/notifications/managers/QuizReminderManager.java
index 16bf024b..ed688205 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/notifications/managers/QuizReminderManager.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/notifications/managers/QuizReminderManager.java
@@ -27,7 +27,9 @@ public QuizReminderManager(Context context) {
         );
     }
 
-    /** Schedule a repeating daily reminder. */
+    /**
+     * Schedule a repeating daily reminder.
+     */
     public void scheduleDailyReminder() {
         long trigger = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);
         alarmManager.setRepeating(
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
index 646174ae..96d60277 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
@@ -94,14 +94,14 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater)
                     searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                         @Override
                         public boolean onQueryTextSubmit(String query) {
-            filterLessons(query);
-            return true;
+                            filterLessons(query);
+                            return true;
                         }
 
                         @Override
                         public boolean onQueryTextChange(String newText) {
-            filterLessons(newText);
-            return true;
+                            filterLessons(newText);
+                            return true;
                         }
                     });
                 }
@@ -221,7 +221,7 @@ private void populateAdapter(List<Object> source, boolean showAds) {
     private void filterLessons(String query) {
         String lower = query == null ? "" : query.toLowerCase();
         if (lower.isEmpty()) {
-        populateAdapter(allItems, showAds);
+            populateAdapter(allItems, showAds);
             return;
         }
         List<Object> filtered = new ArrayList<>();
@@ -244,7 +244,8 @@ private void filterLessons(String query) {
         populateAdapter(filtered, showAds);
     }
 
-    private static class AdItem {}
+    private static class AdItem {
+    }
 
     private static class Lesson {
         String title;
@@ -392,6 +393,7 @@ public int getItemCount() {
 
         static class AdHolder extends RecyclerView.ViewHolder {
             final NativeAdBannerView adView;
+
             AdHolder(@NonNull NativeAdBannerView itemView) {
                 super(itemView);
                 this.adView = itemView;
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
index 822e7a6e..e040f759 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/alertdialog/AlertDialogActivity.java
@@ -45,8 +45,8 @@ private MaterialAlertDialogBuilder createAlertDialog() {
                 .setPositiveButton(android.R.string.ok, null)
                 .setNegativeButton(android.R.string.cancel, null);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
index 16cddc1e..087e8e70 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/snackbar/SnackBarActivity.java
@@ -39,8 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
index abe0f4ee..2a0be19a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/alerts/toast/ToastActivity.java
@@ -37,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
index a4328cf7..1c3f7fd0 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/basics/sdk/AndroidSDK.java
@@ -21,7 +21,6 @@
 import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 
 public class AndroidSDK extends UpNavigationActivity {
-    private ActivityAndroidSdkBinding binding;
     private final List<AndroidVersion> androidVersions = Arrays.asList(
             new AndroidVersion("1.0", "1", "BASE", "None", "2008"),
             new AndroidVersion("1.1", "2", "BASE_1_1", "Petit Four", "2009"),
@@ -60,6 +59,7 @@ public class AndroidSDK extends UpNavigationActivity {
             new AndroidVersion("15", "35", "V", "Vanilla Ice Cake", "2024"),
             new AndroidVersion("16", "36", "Baklava", "Baklava", "2025")
     );
+    private ActivityAndroidSdkBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
index 363b23e8..fb1e635d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/buttons/ButtonsActivity.java
@@ -48,8 +48,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(v -> startActivity(new Intent(ButtonsActivity.this, ButtonsCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
index eb69bdc8..d0942e40 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/image/ImageButtonsActivity.java
@@ -37,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
index 1303f371..296f940d 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/radio/RadioButtonsActivity.java
@@ -38,8 +38,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
index efd6b5bd..b9b7c7ef 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/buttons/switches/SwitchActivity.java
@@ -43,8 +43,8 @@ private void setOnClickListeners() {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
index 14313295..98b1108e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/chronometer/ChronometerActivity.java
@@ -37,8 +37,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         binding.buttonStop.setOnClickListener(v -> binding.chronometer.stop());
         binding.buttonReset.setOnClickListener(v -> binding.chronometer.setBase(SystemClock.elapsedRealtime()));
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
index 01b36624..279da4d1 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/clock/ClockActivity.java
@@ -29,8 +29,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(view -> startActivity(new Intent(this, ClockCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
index f26fdc5c..a3359c8b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/datepicker/DatePickerActivity.java
@@ -54,8 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
     private void updateDateInView() {
         binding.dateTextView.setText(dateFormat.format(calendar.getTime()));
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
index e459413c..4b60e4f7 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/clocks/timepicker/TimePickerActivity.java
@@ -56,8 +56,8 @@ private void updateTimeInView() {
         SimpleDateFormat sdf = new SimpleDateFormat(timeFormat, Locale.getDefault());
         binding.timeTextView.setText(sdf.format(calendar.getTime()));
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/AppDatabase.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/AppDatabase.java
index 36041546..a79ec96a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/AppDatabase.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/AppDatabase.java
@@ -13,8 +13,6 @@
 public abstract class AppDatabase extends RoomDatabase {
     private static volatile AppDatabase INSTANCE;
 
-    public abstract NoteDao noteDao();
-
     public static AppDatabase getInstance(Context context) {
         if (INSTANCE == null) {
             synchronized (AppDatabase.class) {
@@ -26,4 +24,6 @@ public static AppDatabase getInstance(Context context) {
         }
         return INSTANCE;
     }
+
+    public abstract NoteDao noteDao();
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/RoomActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/RoomActivity.java
index 40ae4930..3c962495 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/RoomActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/data/room/RoomActivity.java
@@ -29,10 +29,10 @@
  */
 public class RoomActivity extends UpNavigationActivity {
     private final Handler handler = new Handler(Looper.getMainLooper());
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
     private ActivityRoomBinding binding;
     private NotesAdapter adapter;
     private AppDatabase db;
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -88,10 +88,6 @@ protected void onDestroy() {
     }
 
     private static class NotesAdapter extends ListAdapter<Note, NotesAdapter.NoteViewHolder> {
-        NotesAdapter() {
-            super(DIFF_CALLBACK);
-        }
-
         private static final DiffUtil.ItemCallback<Note> DIFF_CALLBACK =
                 new DiffUtil.ItemCallback<Note>() {
                     @Override
@@ -105,6 +101,10 @@ public boolean areContentsTheSame(@NonNull Note oldItem, @NonNull Note newItem)
                     }
                 };
 
+        NotesAdapter() {
+            super(DIFF_CALLBACK);
+        }
+
         @NonNull
         @Override
         public NoteViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -127,5 +127,5 @@ static class NoteViewHolder extends RecyclerView.ViewHolder {
             }
         }
     }
-    
+
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
index 42d63016..7c6003d4 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/linear/LinearLayoutActivity.java
@@ -28,8 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(v -> startActivity(new Intent(LinearLayoutActivity.this, LinearLayoutCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
index 3ca8d59d..4eb2683a 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/relative/RelativeLayoutActivity.java
@@ -29,8 +29,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(v -> startActivity(new Intent(RelativeLayoutActivity.this, RelativeLayoutCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
index b591a546..7ab319d0 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/layouts/table/TableLayoutActivity.java
@@ -28,8 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(v -> startActivity(new Intent(TableLayoutActivity.this, TableLayoutCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
index 0cd568e9..30072d87 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/bottomnavigation/BottomNavigationActivity.java
@@ -36,8 +36,8 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/drawer/NavigationDrawerActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/drawer/NavigationDrawerActivity.java
index 7323a36d..8a3a9a39 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/drawer/NavigationDrawerActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/navigation/drawer/NavigationDrawerActivity.java
@@ -40,8 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
index 9cee7f69..3ba23381 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/networking/retrofit/RetrofitActivity.java
@@ -23,19 +23,10 @@
  * Demonstrates a simple HTTP request using Retrofit.
  */
 public class RetrofitActivity extends UpNavigationActivity {
-    private ActivityRetrofitBinding binding;
     private final Handler handler = new Handler(Looper.getMainLooper());
+    private ActivityRetrofitBinding binding;
     private JsonPlaceholderApi api;
 
-    interface JsonPlaceholderApi {
-        @GET("todos/1")
-        Call<Todo> getTodo();
-    }
-
-    static class Todo {
-        public String title;
-    }
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,4 +73,13 @@ protected void onDestroy() {
         super.onDestroy();
         handler.removeCallbacksAndMessages(null);
     }
+
+    interface JsonPlaceholderApi {
+        @GET("todos/1")
+        Call<Todo> getTodo();
+    }
+
+    static class Todo {
+        public String title;
+    }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
index 38ee5271..e19610ab 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/inbox/InboxNotificationActivity.java
@@ -56,8 +56,8 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
index 78534cce..03952850 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/notifications/simple/SimpleNotificationActivity.java
@@ -51,8 +51,8 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
index d43e1485..d7242912 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/progress/progressbar/ProgressBarActivity.java
@@ -48,8 +48,8 @@ public void run() {
                 startActivity(new Intent(this, ProgressBarCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
index 9545a3f4..31e597a5 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/reviews/ratingbar/RatingBarActivity.java
@@ -46,8 +46,8 @@ private void showRatingToast() {
         formattedString = String.format(getString(R.string.snack_rating), rating);
         Toast.makeText(this, formattedString, Toast.LENGTH_SHORT).show();
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
index fdc16daa..75844a8f 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/passwordbox/PasswordBoxActivity.java
@@ -64,8 +64,8 @@ private void addKeyListener() {
         binding.buttonShowPassword.setOnClickListener(v ->
                 Snackbar.make(binding.getRoot(), binding.editText.getText(), Snackbar.LENGTH_LONG).show());
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
index c6585bb6..aa852464 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/textboxes/textbox/TextboxActivity.java
@@ -40,8 +40,8 @@ private void addKeyListener() {
             }
         });
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
index 5d1e4290..2717472e 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/grid/GirdViewActivity.java
@@ -41,8 +41,8 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
index fd96d22c..92c881aa 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/images/ImagesActivity.java
@@ -28,8 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding.floatingButtonShowSyntax.setOnClickListener(v -> startActivity(new Intent(ImagesActivity.this, ImagesCodeActivity.class)));
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
index 221d89f9..bce77bbb 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/android/lessons/views/web/WebViewActivity.java
@@ -51,8 +51,8 @@ private void setupFloatingButton() {
         });
         handler.postDelayed(() -> binding.floatingButtonShowSyntax.shrink(), 5000);
     }
-    
-    
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
index 18ee0d2c..c06d44bb 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeUiState.java
@@ -12,5 +12,6 @@ public record HomeUiState(
         String announcementSubtitle,
         String dailyTip,
         List<PromotedApp> promotedApps
-) {}
+) {
+}
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
index 6ebe757e..704f77fd 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java
@@ -56,6 +56,7 @@
 @AndroidEntryPoint
 public class MainActivity extends AppCompatActivity {
 
+    private static final long BACK_PRESS_INTERVAL = 2000;
     private final ActivityResultLauncher<IntentSenderRequest> updateActivityResultLauncher =
             registerForActivityResult(
                     new ActivityResultContracts.StartIntentSenderForResult(),
@@ -65,16 +66,8 @@ public class MainActivity extends AppCompatActivity {
                         }
                     }
             );
-    private ActivityMainBinding mBinding;
-    private MainViewModel mainViewModel;
-    private NavController navController;
     private final SparseIntArray navOrder = new SparseIntArray();
-    private int currentNavIndex;
-    private AppUpdateNotificationsManager appUpdateNotificationsManager;
-    private AppUpdateManager appUpdateManager;
-    private InstallStateUpdatedListener installStateUpdatedListener;
-    private long backPressedTime;
-    private static final long BACK_PRESS_INTERVAL = 2000;
+    private ActivityMainBinding mBinding;
     private final DefaultLifecycleObserver lifecycleObserver = new DefaultLifecycleObserver() {
         @Override
         public void onResume(@NonNull LifecycleOwner owner) {
@@ -94,6 +87,13 @@ public void onResume(@NonNull LifecycleOwner owner) {
             }
         }
     };
+    private MainViewModel mainViewModel;
+    private NavController navController;
+    private int currentNavIndex;
+    private AppUpdateNotificationsManager appUpdateNotificationsManager;
+    private AppUpdateManager appUpdateManager;
+    private InstallStateUpdatedListener installStateUpdatedListener;
+    private long backPressedTime;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -295,7 +295,7 @@ private void checkForImmediateUpdate() {
                                             == UpdateAvailability.UPDATE_AVAILABLE;
                             if (updateAvailable
                                     && appUpdateInfo.isUpdateTypeAllowed(
-                                            AppUpdateType.IMMEDIATE)) {
+                                    AppUpdateType.IMMEDIATE)) {
                                 startImmediateUpdate(appUpdateInfo);
                             }
                         })
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
index b74c7c52..70154219 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java
@@ -86,7 +86,8 @@ public void onTabUnselected(TabLayout.Tab tab) {
             }
 
             @Override
-            public void onTabReselected(TabLayout.Tab tab) { }
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
         });
 
         binding.buttonBack.setOnClickListener(v -> {
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
index 90b8a083..975cb375 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/settings/repository/SettingsRepository.java
@@ -88,7 +88,9 @@ public void handlePreferenceChange(String key) {
         }
     }
 
-    /** Apply Firebase consent settings from preferences */
+    /**
+     * Apply Firebase consent settings from preferences
+     */
     public void applyConsent() {
         boolean analytics = sharedPreferences.getBoolean(
                 context.getString(R.string.key_consent_analytics), true);
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
index 47e88784..72eb7fc6 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/StartupViewModel.java
@@ -26,7 +26,7 @@ public class StartupViewModel extends ViewModel {
 
     @Inject
     public StartupViewModel(RequestConsentInfoUseCase requestConsentInfoUseCase,
-                             LoadConsentFormUseCase loadConsentFormUseCase) {
+                            LoadConsentFormUseCase loadConsentFormUseCase) {
         this.requestConsentInfoUseCase = requestConsentInfoUseCase;
         this.loadConsentFormUseCase = loadConsentFormUseCase;
     }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/dialogs/ConsentDialogFragment.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/dialogs/ConsentDialogFragment.java
index f36a3972..00ab6da6 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/dialogs/ConsentDialogFragment.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/startup/dialogs/ConsentDialogFragment.java
@@ -16,10 +16,6 @@
 
 public class ConsentDialogFragment extends DialogFragment {
 
-    public interface ConsentListener {
-        void onConsentSet(boolean analytics, boolean adStorage, boolean adUserData, boolean adPersonalization);
-    }
-
     private ConsentListener listener;
 
     public void setConsentListener(ConsentListener listener) {
@@ -76,4 +72,8 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
                 })
                 .create();
     }
+
+    public interface ConsentListener {
+        void onConsentSet(boolean analytics, boolean adStorage, boolean adUserData, boolean adPersonalization);
+    }
 }
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
index 0e8aa890..f13829d1 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/support/SupportViewModel.java
@@ -39,7 +39,7 @@ public void initBillingClient(Runnable onConnected) {
     }
 
     public void queryProductDetails(List<String> productIds,
-                                   SupportRepository.OnProductDetailsListener listener) {
+                                    SupportRepository.OnProductDetailsListener listener) {
         queryProductDetailsUseCase.invoke(productIds, listener);
     }
 
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/utils/CodeViewUtils.java b/app/src/main/java/com/d4rk/androidtutorials/java/utils/CodeViewUtils.java
index d294dcf3..33e755d5 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/utils/CodeViewUtils.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/utils/CodeViewUtils.java
@@ -13,7 +13,7 @@ public final class CodeViewUtils {
      * Apply common read–only settings to the provided CodeViews.
      *
      * @param typeface the typeface to set on each CodeView
-     * @param views one or more CodeView instances to configure
+     * @param views    one or more CodeView instances to configure
      */
     public static void applyDefaults(Typeface typeface, CodeView... views) {
         for (CodeView view : views) {
diff --git a/app/src/main/res/anim/fragment_spring_enter.xml b/app/src/main/res/anim/fragment_spring_enter.xml
index 913555ee..d3f014fe 100644
--- a/app/src/main/res/anim/fragment_spring_enter.xml
+++ b/app/src/main/res/anim/fragment_spring_enter.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:fromXDelta="100%"
-        android:toXDelta="0%"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromXDelta="100%"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toXDelta="0%" />
     <alpha
-        android:fromAlpha="0"
-        android:toAlpha="1"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromAlpha="0"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toAlpha="1" />
 </set>
diff --git a/app/src/main/res/anim/fragment_spring_exit.xml b/app/src/main/res/anim/fragment_spring_exit.xml
index f7d43ef7..a73a5655 100644
--- a/app/src/main/res/anim/fragment_spring_exit.xml
+++ b/app/src/main/res/anim/fragment_spring_exit.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:fromXDelta="0%"
-        android:toXDelta="-100%"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromXDelta="0%"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toXDelta="-100%" />
     <alpha
-        android:fromAlpha="1"
-        android:toAlpha="0"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromAlpha="1"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toAlpha="0" />
 </set>
diff --git a/app/src/main/res/anim/fragment_spring_interpolator.xml b/app/src/main/res/anim/fragment_spring_interpolator.xml
index 1f9c37da..e6087fb8 100644
--- a/app/src/main/res/anim/fragment_spring_interpolator.xml
+++ b/app/src/main/res/anim/fragment_spring_interpolator.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <overshootInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tension="1.0">
-</overshootInterpolator>
+    android:tension="1.0"></overshootInterpolator>
 
diff --git a/app/src/main/res/anim/fragment_spring_pop_enter.xml b/app/src/main/res/anim/fragment_spring_pop_enter.xml
index afd6e8ea..511d2073 100644
--- a/app/src/main/res/anim/fragment_spring_pop_enter.xml
+++ b/app/src/main/res/anim/fragment_spring_pop_enter.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:fromXDelta="-100%"
-        android:toXDelta="0%"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromXDelta="-100%"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toXDelta="0%" />
     <alpha
-        android:fromAlpha="0"
-        android:toAlpha="1"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromAlpha="0"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toAlpha="1" />
 </set>
diff --git a/app/src/main/res/anim/fragment_spring_pop_exit.xml b/app/src/main/res/anim/fragment_spring_pop_exit.xml
index 05abc494..91d60747 100644
--- a/app/src/main/res/anim/fragment_spring_pop_exit.xml
+++ b/app/src/main/res/anim/fragment_spring_pop_exit.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
-        android:fromXDelta="0%"
-        android:toXDelta="100%"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromXDelta="0%"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toXDelta="100%" />
     <alpha
-        android:fromAlpha="1"
-        android:toAlpha="0"
         android:duration="250"
-        android:interpolator="@anim/fragment_spring_interpolator" />
+        android:fromAlpha="1"
+        android:interpolator="@anim/fragment_spring_interpolator"
+        android:toAlpha="0" />
 </set>
diff --git a/app/src/main/res/drawable-anydpi/ic_account_circle.xml b/app/src/main/res/drawable-anydpi/ic_account_circle.xml
index de6ed35b..6268e776 100644
--- a/app/src/main/res/drawable-anydpi/ic_account_circle.xml
+++ b/app/src/main/res/drawable-anydpi/ic_account_circle.xml
@@ -4,8 +4,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M5.85,17.1Q7.12,16.12 8.7,15.56Q10.28,15 12,15Q13.72,15 15.3,15.56Q16.88,16.12 18.15,17.1Q19.02,16.07 19.51,14.78Q20,13.47 20,12Q20,8.68 17.66,6.34Q15.32,4 12,4Q8.68,4 6.34,6.34Q4,8.68 4,12Q4,13.47 4.49,14.78Q4.97,16.07 5.85,17.1ZM12,13Q10.53,13 9.51,11.99Q8.5,10.97 8.5,9.5Q8.5,8.03 9.51,7.01Q10.53,6 12,6Q13.47,6 14.49,7.01Q15.5,8.03 15.5,9.5Q15.5,10.97 14.49,11.99Q13.47,13 12,13ZM12,22Q9.93,22 8.1,21.21Q6.28,20.43 4.92,19.07Q3.58,17.73 2.79,15.9Q2,14.07 2,12Q2,9.93 2.79,8.1Q3.58,6.28 4.92,4.92Q6.28,3.58 8.1,2.79Q9.93,2 12,2Q14.07,2 15.9,2.79Q17.73,3.58 19.07,4.92Q20.43,6.28 21.21,8.1Q22,9.93 22,12Q22,14.07 21.21,15.9Q20.43,17.73 19.07,19.07Q17.73,20.43 15.9,21.21Q14.07,22 12,22ZM12,20Q13.32,20 14.5,19.61Q15.68,19.23 16.65,18.5Q15.68,17.77 14.5,17.39Q13.32,17 12,17Q10.68,17 9.5,17.39Q8.32,17.77 7.35,18.5Q8.32,19.23 9.5,19.61Q10.68,20 12,20ZM12,11Q12.65,11 13.07,10.57Q13.5,10.15 13.5,9.5Q13.5,8.85 13.07,8.43Q12.65,8 12,8Q11.35,8 10.93,8.43Q10.5,8.85 10.5,9.5Q10.5,10.15 10.93,10.57Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z"
-      tools:ignore="VectorPath" />
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M5.85,17.1Q7.12,16.12 8.7,15.56Q10.28,15 12,15Q13.72,15 15.3,15.56Q16.88,16.12 18.15,17.1Q19.02,16.07 19.51,14.78Q20,13.47 20,12Q20,8.68 17.66,6.34Q15.32,4 12,4Q8.68,4 6.34,6.34Q4,8.68 4,12Q4,13.47 4.49,14.78Q4.97,16.07 5.85,17.1ZM12,13Q10.53,13 9.51,11.99Q8.5,10.97 8.5,9.5Q8.5,8.03 9.51,7.01Q10.53,6 12,6Q13.47,6 14.49,7.01Q15.5,8.03 15.5,9.5Q15.5,10.97 14.49,11.99Q13.47,13 12,13ZM12,22Q9.93,22 8.1,21.21Q6.28,20.43 4.92,19.07Q3.58,17.73 2.79,15.9Q2,14.07 2,12Q2,9.93 2.79,8.1Q3.58,6.28 4.92,4.92Q6.28,3.58 8.1,2.79Q9.93,2 12,2Q14.07,2 15.9,2.79Q17.73,3.58 19.07,4.92Q20.43,6.28 21.21,8.1Q22,9.93 22,12Q22,14.07 21.21,15.9Q20.43,17.73 19.07,19.07Q17.73,20.43 15.9,21.21Q14.07,22 12,22ZM12,20Q13.32,20 14.5,19.61Q15.68,19.23 16.65,18.5Q15.68,17.77 14.5,17.39Q13.32,17 12,17Q10.68,17 9.5,17.39Q8.32,17.77 7.35,18.5Q8.32,19.23 9.5,19.61Q10.68,20 12,20ZM12,11Q12.65,11 13.07,10.57Q13.5,10.15 13.5,9.5Q13.5,8.85 13.07,8.43Q12.65,8 12,8Q11.35,8 10.93,8.43Q10.5,8.85 10.5,9.5Q10.5,10.15 10.93,10.57Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z"
+        tools:ignore="VectorPath" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_ad_group.xml b/app/src/main/res/drawable-anydpi/ic_ad_group.xml
index 968abc34..21e67e00 100644
--- a/app/src/main/res/drawable-anydpi/ic_ad_group.xml
+++ b/app/src/main/res/drawable-anydpi/ic_ad_group.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M8,16L20,16Q20,16 20,16Q20,16 20,16L20,6L8,6L8,16Q8,16 8,16Q8,16 8,16ZM8,18Q7.17,18 6.59,17.41Q6,16.82 6,16L6,4Q6,3.17 6.59,2.59Q7.17,2 8,2L20,2Q20.82,2 21.41,2.59Q22,3.17 22,4L22,16Q22,16.82 21.41,17.41Q20.82,18 20,18L8,18ZM4,22Q3.17,22 2.59,21.41Q2,20.82 2,20L2,6L4,6L4,20Q4,20 4,20Q4,20 4,20L18,20L18,22L4,22ZM8,4Q8,4 8,4Q8,4 8,4L8,16Q8,16 8,16Q8,16 8,16L8,16Q8,16 8,16Q8,16 8,16L8,4Q8,4 8,4Q8,4 8,4Z"/>
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M8,16L20,16Q20,16 20,16Q20,16 20,16L20,6L8,6L8,16Q8,16 8,16Q8,16 8,16ZM8,18Q7.17,18 6.59,17.41Q6,16.82 6,16L6,4Q6,3.17 6.59,2.59Q7.17,2 8,2L20,2Q20.82,2 21.41,2.59Q22,3.17 22,4L22,16Q22,16.82 21.41,17.41Q20.82,18 20,18L8,18ZM4,22Q3.17,22 2.59,21.41Q2,20.82 2,20L2,6L4,6L4,20Q4,20 4,20Q4,20 4,20L18,20L18,22L4,22ZM8,4Q8,4 8,4Q8,4 8,4L8,16Q8,16 8,16Q8,16 8,16L8,16Q8,16 8,16Q8,16 8,16L8,4Q8,4 8,4Q8,4 8,4Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_ad_units.xml b/app/src/main/res/drawable-anydpi/ic_ad_units.xml
index 7000e04d..3d031e17 100644
--- a/app/src/main/res/drawable-anydpi/ic_ad_units.xml
+++ b/app/src/main/res/drawable-anydpi/ic_ad_units.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M7,23Q6.17,23 5.59,22.41Q5,21.82 5,21L5,3Q5,2.17 5.59,1.59Q6.17,1 7,1L17,1Q17.82,1 18.41,1.59Q19,2.17 19,3L19,6.1Q19.45,6.28 19.73,6.65Q20,7.03 20,7.5L20,9.5Q20,9.97 19.73,10.35Q19.45,10.72 19,10.9L19,21Q19,21.82 18.41,22.41Q17.82,23 17,23L7,23ZM7,21L17,21Q17,21 17,21Q17,21 17,21L17,3Q17,3 17,3Q17,3 17,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM7,21Q7,21 7,21Q7,21 7,21L7,3Q7,3 7,3Q7,3 7,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM8,12L16,12L16,10L8,10L8,12Z"/>
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M7,23Q6.17,23 5.59,22.41Q5,21.82 5,21L5,3Q5,2.17 5.59,1.59Q6.17,1 7,1L17,1Q17.82,1 18.41,1.59Q19,2.17 19,3L19,6.1Q19.45,6.28 19.73,6.65Q20,7.03 20,7.5L20,9.5Q20,9.97 19.73,10.35Q19.45,10.72 19,10.9L19,21Q19,21.82 18.41,22.41Q17.82,23 17,23L7,23ZM7,21L17,21Q17,21 17,21Q17,21 17,21L17,3Q17,3 17,3Q17,3 17,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM7,21Q7,21 7,21Q7,21 7,21L7,3Q7,3 7,3Q7,3 7,3L7,3Q7,3 7,3Q7,3 7,3L7,21Q7,21 7,21Q7,21 7,21ZM8,12L16,12L16,10L8,10L8,12Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_category_network_tinted.xml b/app/src/main/res/drawable-anydpi/ic_category_network_tinted.xml
index 487195ba..12a298da 100644
--- a/app/src/main/res/drawable-anydpi/ic_category_network_tinted.xml
+++ b/app/src/main/res/drawable-anydpi/ic_category_network_tinted.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M6.5,20Q5.88,20 5.44,19.56Q5,19.12 5,18.5L5,15.5Q5,14.88 5.44,14.44Q5.88,14 6.5,14Q7.12,14 7.56,14.44Q8,14.88 8,15.5L8,18.5Q8,19.12 7.56,19.56Q7.12,20 6.5,20ZM12.5,20Q11.88,20 11.44,19.56Q11,19.12 11,18.5L11,10.5Q11,9.88 11.44,9.44Q11.88,9 12.5,9Q13.12,9 13.56,9.44Q14,9.88 14,10.5L14,18.5Q14,19.12 13.56,19.56Q13.12,20 12.5,20ZM18.5,20Q17.88,20 17.44,19.56Q17,19.12 17,18.5L17,5.5Q17,4.88 17.44,4.44Q17.88,4 18.5,4Q19.12,4 19.56,4.44Q20,4.88 20,5.5L20,18.5Q20,19.12 19.56,19.56Q19.12,20 18.5,20Z"/>
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M6.5,20Q5.88,20 5.44,19.56Q5,19.12 5,18.5L5,15.5Q5,14.88 5.44,14.44Q5.88,14 6.5,14Q7.12,14 7.56,14.44Q8,14.88 8,15.5L8,18.5Q8,19.12 7.56,19.56Q7.12,20 6.5,20ZM12.5,20Q11.88,20 11.44,19.56Q11,19.12 11,18.5L11,10.5Q11,9.88 11.44,9.44Q11.88,9 12.5,9Q13.12,9 13.56,9.44Q14,9.88 14,10.5L14,18.5Q14,19.12 13.56,19.56Q13.12,20 12.5,20ZM18.5,20Q17.88,20 17.44,19.56Q17,19.12 17,18.5L17,5.5Q17,4.88 17.44,4.44Q17.88,4 18.5,4Q19.12,4 19.56,4.44Q20,4.88 20,5.5L20,18.5Q20,19.12 19.56,19.56Q19.12,20 18.5,20Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml b/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
index 6a7da86e..562f9836 100644
--- a/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
+++ b/app/src/main/res/drawable-anydpi/ic_data_thresholding.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M5,21Q4.17,21 3.59,20.41Q3,19.82 3,19L3,5Q3,4.17 3.59,3.59Q4.17,3 5,3L19,3Q19.82,3 20.41,3.59Q21,4.17 21,5L21,19Q21,19.82 20.41,20.41Q19.82,21 19,21L5,21ZM17.27,19L19,19Q19,19 19,19Q19,19 19,19L19,17.27L17.27,19ZM5.85,19L7.67,19L10.68,16L12.8,16L9.8,19L11.4,19L14.4,16L16.52,16L13.53,19L15.15,19L18.15,16L19,16L19,5Q19,5 19,5Q19,5 19,5L5,5Q5,5 5,5Q5,5 5,5L5,17.73L6.72,16L8.85,16L5.85,19ZM7.65,14L6.25,12.6L10.68,8.18L12.68,10.18L16.35,6.5L17.75,7.9L12.68,13L10.68,11L7.65,14ZM5,19L5,5Q5,5 5,5Q5,5 5,5L5,5Q5,5 5,5Q5,5 5,5L5,19Q5,19 5,19Q5,19 5,19L5,19Q5,19 5,19Q5,19 5,19Z"/>
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M5,21Q4.17,21 3.59,20.41Q3,19.82 3,19L3,5Q3,4.17 3.59,3.59Q4.17,3 5,3L19,3Q19.82,3 20.41,3.59Q21,4.17 21,5L21,19Q21,19.82 20.41,20.41Q19.82,21 19,21L5,21ZM17.27,19L19,19Q19,19 19,19Q19,19 19,19L19,17.27L17.27,19ZM5.85,19L7.67,19L10.68,16L12.8,16L9.8,19L11.4,19L14.4,16L16.52,16L13.53,19L15.15,19L18.15,16L19,16L19,5Q19,5 19,5Q19,5 19,5L5,5Q5,5 5,5Q5,5 5,5L5,17.73L6.72,16L8.85,16L5.85,19ZM7.65,14L6.25,12.6L10.68,8.18L12.68,10.18L16.35,6.5L17.75,7.9L12.68,13L10.68,11L7.65,14ZM5,19L5,5Q5,5 5,5Q5,5 5,5L5,5Q5,5 5,5Q5,5 5,5L5,19Q5,19 5,19Q5,19 5,19L5,19Q5,19 5,19Q5,19 5,19Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_search.xml b/app/src/main/res/drawable-anydpi/ic_search.xml
index 24324c85..97a2bb80 100644
--- a/app/src/main/res/drawable-anydpi/ic_search.xml
+++ b/app/src/main/res/drawable-anydpi/ic_search.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/colorSecondary"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59,16,11.11,16,9.5 16,5.91,13.09,3,9.5,3 5.91,3,3,5.91,3,9.5 3,13.09,5.91,16,9.5,16c1.61,0,3.09,-0.59,4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14c-2.49,0,-4.5,-2.01,-4.5,-4.5S7.01,5,9.5,5 14,7.01,14,9.5 11.99,14,9.5,14z"/>
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59,16,11.11,16,9.5 16,5.91,13.09,3,9.5,3 5.91,3,3,5.91,3,9.5 3,13.09,5.91,16,9.5,16c1.61,0,3.09,-0.59,4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14c-2.49,0,-4.5,-2.01,-4.5,-4.5S7.01,5,9.5,5 14,7.01,14,9.5 11.99,14,9.5,14z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml b/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
index 487195ba..12a298da 100644
--- a/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
+++ b/app/src/main/res/drawable-anydpi/ic_signal_cellular.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M6.5,20Q5.88,20 5.44,19.56Q5,19.12 5,18.5L5,15.5Q5,14.88 5.44,14.44Q5.88,14 6.5,14Q7.12,14 7.56,14.44Q8,14.88 8,15.5L8,18.5Q8,19.12 7.56,19.56Q7.12,20 6.5,20ZM12.5,20Q11.88,20 11.44,19.56Q11,19.12 11,18.5L11,10.5Q11,9.88 11.44,9.44Q11.88,9 12.5,9Q13.12,9 13.56,9.44Q14,9.88 14,10.5L14,18.5Q14,19.12 13.56,19.56Q13.12,20 12.5,20ZM18.5,20Q17.88,20 17.44,19.56Q17,19.12 17,18.5L17,5.5Q17,4.88 17.44,4.44Q17.88,4 18.5,4Q19.12,4 19.56,4.44Q20,4.88 20,5.5L20,18.5Q20,19.12 19.56,19.56Q19.12,20 18.5,20Z"/>
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M6.5,20Q5.88,20 5.44,19.56Q5,19.12 5,18.5L5,15.5Q5,14.88 5.44,14.44Q5.88,14 6.5,14Q7.12,14 7.56,14.44Q8,14.88 8,15.5L8,18.5Q8,19.12 7.56,19.56Q7.12,20 6.5,20ZM12.5,20Q11.88,20 11.44,19.56Q11,19.12 11,18.5L11,10.5Q11,9.88 11.44,9.44Q11.88,9 12.5,9Q13.12,9 13.56,9.44Q14,9.88 14,10.5L14,18.5Q14,19.12 13.56,19.56Q13.12,20 12.5,20ZM18.5,20Q17.88,20 17.44,19.56Q17,19.12 17,18.5L17,5.5Q17,4.88 17.44,4.44Q17.88,4 18.5,4Q19.12,4 19.56,4.44Q20,4.88 20,5.5L20,18.5Q20,19.12 19.56,19.56Q19.12,20 18.5,20Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml b/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
index 44ad6dad..8c31db96 100644
--- a/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
+++ b/app/src/main/res/drawable-anydpi/ic_swap_driving_apps_wheel.xml
@@ -4,8 +4,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="?attr/colorSecondary"
-      android:pathData="M12,22Q9.95,22 8.12,21.21Q6.3,20.43 4.94,19.06Q3.58,17.7 2.79,15.88Q2,14.05 2,12Q2,9.93 2.79,8.11Q3.58,6.3 4.94,4.94Q6.3,3.58 8.12,2.79Q9.95,2 12,2Q14.07,2 15.89,2.79Q17.7,3.58 19.06,4.94Q20.43,6.3 21.21,8.11Q22,9.93 22,12Q22,14.05 21.21,15.88Q20.43,17.7 19.06,19.06Q17.7,20.43 15.89,21.21Q14.07,22 12,22ZM12,16Q13.5,16 14.93,16.44Q16.35,16.88 17.6,17.7Q18.75,16.55 19.38,15.09Q20,13.62 20,12Q20,8.65 17.68,6.33Q15.35,4 12,4Q8.65,4 6.33,6.33Q4,8.65 4,12Q4,13.62 4.61,15.1Q5.22,16.57 6.4,17.7Q7.65,16.88 9.07,16.44Q10.5,16 12,16ZM12,18Q10.97,18 10,18.25Q9.03,18.5 8.15,19Q9.03,19.5 10,19.75Q10.97,20 12,20Q13.03,20 14,19.75Q14.97,19.5 15.85,19Q14.97,18.5 14,18.25Q13.03,18 12,18ZM7,11Q7.42,11 7.71,10.71Q8,10.43 8,10Q8,9.57 7.71,9.29Q7.42,9 7,9Q6.58,9 6.29,9.29Q6,9.57 6,10Q6,10.43 6.29,10.71Q6.58,11 7,11ZM10,8Q10.43,8 10.71,7.71Q11,7.42 11,7Q11,6.58 10.71,6.29Q10.43,6 10,6Q9.57,6 9.29,6.29Q9,6.58 9,7Q9,7.42 9.29,7.71Q9.57,8 10,8ZM17,11Q17.43,11 17.71,10.71Q18,10.43 18,10Q18,9.57 17.71,9.29Q17.43,9 17,9Q16.57,9 16.29,9.29Q16,9.57 16,10Q16,10.43 16.29,10.71Q16.57,11 17,11ZM12,14Q12.82,14 13.41,13.41Q14,12.82 14,12Q14,11.68 13.9,11.36Q13.8,11.05 13.6,10.8L14.95,7.4Q15.12,7 14.96,6.61Q14.8,6.22 14.4,6.05Q14.03,5.88 13.64,6.04Q13.25,6.2 13.1,6.6L11.75,10Q11,10.12 10.5,10.69Q10,11.25 10,12Q10,12.82 10.59,13.41Q11.18,14 12,14ZM12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16L12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16ZM12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85ZM12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Z"
-      tools:ignore="VectorPath" />
+    <path
+        android:fillColor="?attr/colorSecondary"
+        android:pathData="M12,22Q9.95,22 8.12,21.21Q6.3,20.43 4.94,19.06Q3.58,17.7 2.79,15.88Q2,14.05 2,12Q2,9.93 2.79,8.11Q3.58,6.3 4.94,4.94Q6.3,3.58 8.12,2.79Q9.95,2 12,2Q14.07,2 15.89,2.79Q17.7,3.58 19.06,4.94Q20.43,6.3 21.21,8.11Q22,9.93 22,12Q22,14.05 21.21,15.88Q20.43,17.7 19.06,19.06Q17.7,20.43 15.89,21.21Q14.07,22 12,22ZM12,16Q13.5,16 14.93,16.44Q16.35,16.88 17.6,17.7Q18.75,16.55 19.38,15.09Q20,13.62 20,12Q20,8.65 17.68,6.33Q15.35,4 12,4Q8.65,4 6.33,6.33Q4,8.65 4,12Q4,13.62 4.61,15.1Q5.22,16.57 6.4,17.7Q7.65,16.88 9.07,16.44Q10.5,16 12,16ZM12,18Q10.97,18 10,18.25Q9.03,18.5 8.15,19Q9.03,19.5 10,19.75Q10.97,20 12,20Q13.03,20 14,19.75Q14.97,19.5 15.85,19Q14.97,18.5 14,18.25Q13.03,18 12,18ZM7,11Q7.42,11 7.71,10.71Q8,10.43 8,10Q8,9.57 7.71,9.29Q7.42,9 7,9Q6.58,9 6.29,9.29Q6,9.57 6,10Q6,10.43 6.29,10.71Q6.58,11 7,11ZM10,8Q10.43,8 10.71,7.71Q11,7.42 11,7Q11,6.58 10.71,6.29Q10.43,6 10,6Q9.57,6 9.29,6.29Q9,6.58 9,7Q9,7.42 9.29,7.71Q9.57,8 10,8ZM17,11Q17.43,11 17.71,10.71Q18,10.43 18,10Q18,9.57 17.71,9.29Q17.43,9 17,9Q16.57,9 16.29,9.29Q16,9.57 16,10Q16,10.43 16.29,10.71Q16.57,11 17,11ZM12,14Q12.82,14 13.41,13.41Q14,12.82 14,12Q14,11.68 13.9,11.36Q13.8,11.05 13.6,10.8L14.95,7.4Q15.12,7 14.96,6.61Q14.8,6.22 14.4,6.05Q14.03,5.88 13.64,6.04Q13.25,6.2 13.1,6.6L11.75,10Q11,10.12 10.5,10.69Q10,11.25 10,12Q10,12.82 10.59,13.41Q11.18,14 12,14ZM12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16L12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16ZM12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85Q12,10.85 12,10.85ZM12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Z"
+        tools:ignore="VectorPath" />
 </vector>
diff --git a/app/src/main/res/drawable/bg_ad_attribution.xml b/app/src/main/res/drawable/bg_ad_attribution.xml
index 8857889f..f78dde3c 100644
--- a/app/src/main/res/drawable/bg_ad_attribution.xml
+++ b/app/src/main/res/drawable/bg_ad_attribution.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <solid android:color="@android:color/transparent" />
-    <stroke android:width="1dp" android:color="?attr/colorPrimary" />
+    <stroke
+        android:width="1dp"
+        android:color="?attr/colorPrimary" />
     <corners android:radius="4dp" />
 </shape>
diff --git a/app/src/main/res/drawable/onboarding_dot_selected.xml b/app/src/main/res/drawable/onboarding_dot_selected.xml
index 0dbd4abe..f34b8870 100644
--- a/app/src/main/res/drawable/onboarding_dot_selected.xml
+++ b/app/src/main/res/drawable/onboarding_dot_selected.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:width="8dp" android:height="8dp" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="8dp"
+        android:height="8dp" />
     <solid android:color="?attr/colorPrimary" />
 </shape>
diff --git a/app/src/main/res/drawable/onboarding_dot_unselected.xml b/app/src/main/res/drawable/onboarding_dot_unselected.xml
index 27944915..f90b6881 100644
--- a/app/src/main/res/drawable/onboarding_dot_unselected.xml
+++ b/app/src/main/res/drawable/onboarding_dot_unselected.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:width="8dp" android:height="8dp" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="8dp"
+        android:height="8dp" />
     <solid android:color="@android:color/darker_gray" />
 </shape>
diff --git a/app/src/main/res/layout/activity_android_start_project.xml b/app/src/main/res/layout/activity_android_start_project.xml
index d50b6168..52161914 100644
--- a/app/src/main/res/layout/activity_android_start_project.xml
+++ b/app/src/main/res/layout/activity_android_start_project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/constraint_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,8 +10,8 @@
         android:id="@+id/top_app_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_share"
         app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
@@ -21,10 +21,10 @@
         android:id="@+id/scroll_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/top_app_bar"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/top_app_bar">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -65,9 +65,9 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:contentDescription="@string/im_step1_desc"
                     android:scaleType="fitXY"
-                    android:src="@drawable/im_step1"
-                    android:contentDescription="@string/im_step1_desc" />
+                    android:src="@drawable/im_step1" />
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.gms.ads.AdView
@@ -75,9 +75,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                app:layout_constraintTop_toBottomOf="@id/card_view_first_step"
                 ads:adSize="MEDIUM_RECTANGLE"
-                ads:adUnitId="@string/ad_banner_unit_id" />
+                ads:adUnitId="@string/ad_banner_unit_id"
+                app:layout_constraintTop_toBottomOf="@id/card_view_first_step" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_second_step"
@@ -114,9 +114,9 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:contentDescription="@string/im_step2_desc"
                     android:scaleType="fitXY"
-                    android:src="@drawable/im_step2"
-                    android:contentDescription="@string/im_step2_desc" />
+                    android:src="@drawable/im_step2" />
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.textview.MaterialTextView
@@ -154,9 +154,9 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:contentDescription="@string/im_step3_desc"
                     android:scaleType="fitXY"
-                    android:src="@drawable/im_step3"
-                    android:contentDescription="@string/im_step3_desc" />
+                    android:src="@drawable/im_step3" />
             </com.google.android.material.card.MaterialCardView>
 
             <com.airbnb.lottie.LottieAnimationView
@@ -174,9 +174,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
-                app:layout_constraintTop_toBottomOf="@id/lottie_animation"
                 ads:adSize="LARGE_BANNER"
-                ads:adUnitId="@string/ad_banner_unit_id" />
+                ads:adUnitId="@string/ad_banner_unit_id"
+                app:layout_constraintTop_toBottomOf="@id/lottie_animation" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </me.zhanghai.android.fastscroll.FastScrollScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_clock.xml b/app/src/main/res/layout/activity_clock.xml
index b77d30eb..66d24f13 100644
--- a/app/src/main/res/layout/activity_clock.xml
+++ b/app/src/main/res/layout/activity_clock.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
diff --git a/app/src/main/res/layout/activity_grid_view.xml b/app/src/main/res/layout/activity_grid_view.xml
index f67330bf..5b5f267c 100644
--- a/app/src/main/res/layout/activity_grid_view.xml
+++ b/app/src/main/res/layout/activity_grid_view.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <GridView
diff --git a/app/src/main/res/layout/activity_images.xml b/app/src/main/res/layout/activity_images.xml
index 9f120fe3..106ce33c 100644
--- a/app/src/main/res/layout/activity_images.xml
+++ b/app/src/main/res/layout/activity_images.xml
@@ -58,9 +58,9 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:contentDescription="@string/image_view_preview_desc"
                     android:scaleType="centerCrop"
                     android:src="@drawable/im_image_view"
-                    android:contentDescription="@string/image_view_preview_desc"
                     tools:ignore="ImageContrastCheck" />
             </com.google.android.material.card.MaterialCardView>
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 77c151a4..a911bc1f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,8 +14,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_menu"
             app:navigationContentDescription="@string/menu"
+            app:navigationIcon="@drawable/ic_menu"
             app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
             app:title="@string/app_name" />
     </com.google.android.material.appbar.AppBarLayout>
@@ -24,9 +24,9 @@
         android:id="@+id/nav_rail"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/ad_container"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
-        app:layout_constraintBottom_toTopOf="@+id/ad_container"
         app:menu="@menu/bottom_nav_menu" />
 
     <androidx.fragment.app.FragmentContainerView
@@ -35,9 +35,9 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:defaultNavHost="true"
-        app:layout_constraintStart_toEndOf="@id/nav_rail"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/ad_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/nav_rail"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:navGraph="@navigation/mobile_navigation" />
 
@@ -72,8 +72,8 @@
         android:id="@+id/progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_navigation_drawer.xml b/app/src/main/res/layout/activity_navigation_drawer.xml
index b9278bb9..327e6d80 100644
--- a/app/src/main/res/layout/activity_navigation_drawer.xml
+++ b/app/src/main/res/layout/activity_navigation_drawer.xml
@@ -17,10 +17,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/home"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/floating_button_show_syntax"
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 4d05475c..b7720b68 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -9,21 +9,21 @@
         android:id="@+id/viewPager"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/bottomBar"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:id="@+id/bottomBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:padding="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/buttonBack"
@@ -38,8 +38,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@android:color/transparent"
-            app:tabIndicatorGravity="center"
             app:tabIndicatorFullWidth="false"
+            app:tabIndicatorGravity="center"
             app:tabRippleColor="@android:color/transparent" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/activity_password_box.xml b/app/src/main/res/layout/activity_password_box.xml
index a91d45ca..e837105b 100644
--- a/app/src/main/res/layout/activity_password_box.xml
+++ b/app/src/main/res/layout/activity_password_box.xml
@@ -22,7 +22,7 @@
             android:hint="@string/hint_password"
             android:inputType="textPassword"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/showPasswordButton"
diff --git a/app/src/main/res/layout/activity_relative_layout.xml b/app/src/main/res/layout/activity_relative_layout.xml
index 485ff38d..667d4fb8 100644
--- a/app/src/main/res/layout/activity_relative_layout.xml
+++ b/app/src/main/res/layout/activity_relative_layout.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
diff --git a/app/src/main/res/layout/activity_shortcuts.xml b/app/src/main/res/layout/activity_shortcuts.xml
index 8aab8272..54de0123 100644
--- a/app/src/main/res/layout/activity_shortcuts.xml
+++ b/app/src/main/res/layout/activity_shortcuts.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        ads:adUnitId="@string/ad_banner_unit_id"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_build.xml b/app/src/main/res/layout/activity_shortcuts_build.xml
index 9a663328..a5e1f6e3 100644
--- a/app/src/main/res/layout/activity_shortcuts_build.xml
+++ b/app/src/main/res/layout/activity_shortcuts_build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -120,9 +120,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_code.xml b/app/src/main/res/layout/activity_shortcuts_code.xml
index 879c9ae8..6f23d135 100644
--- a/app/src/main/res/layout/activity_shortcuts_code.xml
+++ b/app/src/main/res/layout/activity_shortcuts_code.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -279,9 +279,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_debugging.xml b/app/src/main/res/layout/activity_shortcuts_debugging.xml
index b16f1841..94f0c2f8 100644
--- a/app/src/main/res/layout/activity_shortcuts_debugging.xml
+++ b/app/src/main/res/layout/activity_shortcuts_debugging.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -279,9 +279,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_general.xml b/app/src/main/res/layout/activity_shortcuts_general.xml
index 24f7ef87..8ff8cd9f 100644
--- a/app/src/main/res/layout/activity_shortcuts_general.xml
+++ b/app/src/main/res/layout/activity_shortcuts_general.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -256,9 +256,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml b/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
index 6775a5eb..f388dc38 100644
--- a/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
+++ b/app/src/main/res/layout/activity_shortcuts_navigation_and_searching.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -601,9 +601,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_refractoring.xml b/app/src/main/res/layout/activity_shortcuts_refractoring.xml
index 6f76811c..9a2b7370 100644
--- a/app/src/main/res/layout/activity_shortcuts_refractoring.xml
+++ b/app/src/main/res/layout/activity_shortcuts_refractoring.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -279,9 +279,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shortcuts_version_control.xml b/app/src/main/res/layout/activity_shortcuts_version_control.xml
index 6b9435ce..f6d64aa6 100644
--- a/app/src/main/res/layout/activity_shortcuts_version_control.xml
+++ b/app/src/main/res/layout/activity_shortcuts_version_control.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:ads="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -141,9 +141,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
+        ads:adSize="FULL_BANNER"
+        ads:adUnitId="@string/ad_banner_unit_id"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        ads:adSize="FULL_BANNER"
-        ads:adUnitId="@string/ad_banner_unit_id" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_support.xml b/app/src/main/res/layout/activity_support.xml
index 844c397c..e82d6a8d 100644
--- a/app/src/main/res/layout/activity_support.xml
+++ b/app/src/main/res/layout/activity_support.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/activity_switch.xml b/app/src/main/res/layout/activity_switch.xml
index 4224d6d9..f9baeb68 100644
--- a/app/src/main/res/layout/activity_switch.xml
+++ b/app/src/main/res/layout/activity_switch.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
diff --git a/app/src/main/res/layout/activity_table_layout.xml b/app/src/main/res/layout/activity_table_layout.xml
index 13336c9f..18fa1ddb 100644
--- a/app/src/main/res/layout/activity_table_layout.xml
+++ b/app/src/main/res/layout/activity_table_layout.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <me.zhanghai.android.fastscroll.FastScrollScrollView
diff --git a/app/src/main/res/layout/activity_view_binding_tutorial.xml b/app/src/main/res/layout/activity_view_binding_tutorial.xml
index 061b0158..341b8f74 100644
--- a/app/src/main/res/layout/activity_view_binding_tutorial.xml
+++ b/app/src/main/res/layout/activity_view_binding_tutorial.xml
@@ -60,12 +60,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ad_view">
 
-        <com.amrdeveloper.codeview.CodeView
-            android:id="@+id/code_view_binding_gradle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:padding="16dp" />
+            <com.amrdeveloper.codeview.CodeView
+                android:id="@+id/code_view_binding_gradle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minWidth="48dp"
+                android:padding="16dp" />
         </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/ad_about.xml b/app/src/main/res/layout/ad_about.xml
index c23d580e..e9c8543b 100644
--- a/app/src/main/res/layout/ad_about.xml
+++ b/app/src/main/res/layout/ad_about.xml
@@ -7,12 +7,12 @@
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/ad_card"
         style="@style/Widget.Material3.CardView.Elevated"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewBottomRounded"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
+        app:cardPreventCornerOverlap="true"
         app:cardUseCompatPadding="false"
-        app:cardPreventCornerOverlap="true">
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewBottomRounded">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,10 +33,10 @@
                     android:layout_width="96dp"
                     android:layout_height="96dp"
                     app:cardCornerRadius="16dp"
-                    app:cardUseCompatPadding="false"
                     app:cardPreventCornerOverlap="true"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
+                    app:cardUseCompatPadding="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
                     <com.google.android.gms.ads.nativead.MediaView
                         android:id="@+id/ad_media"
@@ -52,9 +52,9 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                    app:layout_constraintTop_toTopOf="@id/media_card"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/media_card"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:layout_constraintTop_toTopOf="@id/media_card" />
 
                 <TextView
                     android:id="@+id/ad_body"
@@ -63,8 +63,8 @@
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                    app:layout_constraintStart_toStartOf="@id/ad_headline"
                     app:layout_constraintEnd_toEndOf="@id/ad_headline"
+                    app:layout_constraintStart_toStartOf="@id/ad_headline"
                     app:layout_constraintTop_toBottomOf="@id/ad_headline" />
 
                 <me.zhanghai.android.materialratingbar.MaterialRatingBar
@@ -84,14 +84,14 @@
                     android:id="@+id/ad_call_to_action"
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
-                    android:minWidth="88dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="8dp"
+                    android:minWidth="88dp"
                     android:paddingHorizontal="12dp"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintStart_toEndOf="@id/ad_stars"
-                    app:layout_constraintTop_toBottomOf="@id/ad_body"
-                    app:layout_constraintHorizontal_chainStyle="packed" />
+                    app:layout_constraintTop_toBottomOf="@id/ad_body" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/ad_android_studio_list.xml b/app/src/main/res/layout/ad_android_studio_list.xml
index 6b690487..124f1e85 100644
--- a/app/src/main/res/layout/ad_android_studio_list.xml
+++ b/app/src/main/res/layout/ad_android_studio_list.xml
@@ -23,8 +23,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <FrameLayout
                     android:layout_width="120dp"
diff --git a/app/src/main/res/layout/ad_attribution.xml b/app/src/main/res/layout/ad_attribution.xml
index 25be5f02..32680d1a 100644
--- a/app/src/main/res/layout/ad_attribution.xml
+++ b/app/src/main/res/layout/ad_attribution.xml
@@ -7,5 +7,5 @@
     android:paddingHorizontal="4dp"
     android:paddingVertical="2dp"
     android:text="@string/ad"
-    android:textColor="?attr/colorPrimary"
-    android:textAppearance="@style/TextAppearance.Material3.LabelSmall" />
+    android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+    android:textColor="?attr/colorPrimary" />
diff --git a/app/src/main/res/layout/ad_bottom_app_bar.xml b/app/src/main/res/layout/ad_bottom_app_bar.xml
index 33a44dbb..4f66aaba 100644
--- a/app/src/main/res/layout/ad_bottom_app_bar.xml
+++ b/app/src/main/res/layout/ad_bottom_app_bar.xml
@@ -7,15 +7,15 @@
         android:id="@+id/ad_host"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:background="?attr/colorSurfaceContainer"
+        android:orientation="vertical"
         android:paddingHorizontal="16dp">
 
         <include
+            layout="@layout/ad_attribution"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            layout="@layout/ad_attribution" />
+            android:layout_marginTop="4dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -57,9 +57,9 @@
                 style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
                 android:minWidth="88dp"
-                android:minHeight="40dp"
-                android:layout_marginStart="8dp" />
+                android:minHeight="40dp" />
         </LinearLayout>
     </LinearLayout>
 </com.google.android.gms.ads.nativead.NativeAdView>
diff --git a/app/src/main/res/layout/ad_home_banner_large.xml b/app/src/main/res/layout/ad_home_banner_large.xml
index 1d2117e8..efb4216d 100644
--- a/app/src/main/res/layout/ad_home_banner_large.xml
+++ b/app/src/main/res/layout/ad_home_banner_large.xml
@@ -59,9 +59,9 @@
                         android:id="@+id/ad_body"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:layout_marginTop="4dp"
                         android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/ad_lesson_code.xml b/app/src/main/res/layout/ad_lesson_code.xml
index 9946d104..81883277 100644
--- a/app/src/main/res/layout/ad_lesson_code.xml
+++ b/app/src/main/res/layout/ad_lesson_code.xml
@@ -15,8 +15,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingVertical="4dp"
-            android:paddingHorizontal="16dp">
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="4dp">
 
             <include layout="@layout/ad_attribution" />
 
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 8d9b6d56..ccf08c35 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -13,12 +13,12 @@
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/card_view_about"
             style="@style/Widget.Material3.CardView.Elevated"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="24dp"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -31,10 +31,10 @@
                     android:layout_height="48dp"
                     android:layout_marginTop="8dp"
                     android:clickable="true"
+                    android:contentDescription="@string/app_name"
                     android:focusable="true"
                     android:src="@mipmap/ic_launcher"
                     android:tooltipText="@string/tooltip_open_me"
-                    android:contentDescription="@string/app_name"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_buttons_layout.xml b/app/src/main/res/layout/fragment_buttons_layout.xml
index ae4cff75..84208e1e 100644
--- a/app/src/main/res/layout/fragment_buttons_layout.xml
+++ b/app/src/main/res/layout/fragment_buttons_layout.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -272,8 +272,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_clock_layout.xml b/app/src/main/res/layout/fragment_clock_layout.xml
index ea22bd73..d92bc31f 100644
--- a/app/src/main/res/layout/fragment_clock_layout.xml
+++ b/app/src/main/res/layout/fragment_clock_layout.xml
@@ -12,9 +12,9 @@
 
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -80,8 +80,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_code.xml b/app/src/main/res/layout/fragment_code.xml
index 2576feca..93d11d82 100644
--- a/app/src/main/res/layout/fragment_code.xml
+++ b/app/src/main/res/layout/fragment_code.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -36,8 +36,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d53e5c3f..6589dd24 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -47,9 +47,9 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:layout_marginEnd="16dp"
+                        android:contentDescription="@string/profile_picture_desc"
                         android:scaleType="centerCrop"
-                        android:src="@drawable/dev_logo"
-                        android:contentDescription="@string/profile_picture_desc" />
+                        android:src="@drawable/dev_logo" />
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
@@ -120,8 +120,8 @@
                             android:id="@+id/home_action_button_group"
                             style="@style/Widget.App.ButtonGroup"
                             android:layout_width="wrap_content"
-                            android:spacing="2dp"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:spacing="2dp">
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_google_play"
@@ -156,10 +156,10 @@
                 android:id="@+id/other_apps_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginBottom="16dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/other_apps_title"
diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml
index 2576feca..93d11d82 100644
--- a/app/src/main/res/layout/fragment_layout.xml
+++ b/app/src/main/res/layout/fragment_layout.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -36,8 +36,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_linear_layout_layout.xml b/app/src/main/res/layout/fragment_linear_layout_layout.xml
index 7408925b..0f96a14b 100644
--- a/app/src/main/res/layout/fragment_linear_layout_layout.xml
+++ b/app/src/main/res/layout/fragment_linear_layout_layout.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -62,8 +62,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_no_code.xml b/app/src/main/res/layout/fragment_no_code.xml
index 1ca31f1d..15315f88 100644
--- a/app/src/main/res/layout/fragment_no_code.xml
+++ b/app/src/main/res/layout/fragment_no_code.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text_view_no_code_message"
@@ -33,8 +33,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
index d275a4ac..c88eebcc 100644
--- a/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
+++ b/app/src/main/res/layout/fragment_onboarding_bottom_labels.xml
@@ -5,28 +5,28 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:padding="24dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="0dp"
-            android:padding="16dp">
+            android:padding="16dp"
+            app:cardElevation="0dp">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/bottom_navigation_labels"
                     android:layout_marginBottom="16dp"
-                    style="@style/TextAppearance.Material3.TitleLarge" />
+                    android:text="@string/bottom_navigation_labels" />
 
                 <RadioGroup
                     android:id="@+id/labels_group"
diff --git a/app/src/main/res/layout/fragment_onboarding_data.xml b/app/src/main/res/layout/fragment_onboarding_data.xml
index a718d5d5..798968a1 100644
--- a/app/src/main/res/layout/fragment_onboarding_data.xml
+++ b/app/src/main/res/layout/fragment_onboarding_data.xml
@@ -5,16 +5,16 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:padding="24dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="0dp"
-            android:padding="16dp">
+            android:padding="16dp"
+            app:cardElevation="0dp">
 
             <com.google.android.material.textview.MaterialTextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_onboarding_font.xml b/app/src/main/res/layout/fragment_onboarding_font.xml
index b501af0e..ded84eef 100644
--- a/app/src/main/res/layout/fragment_onboarding_font.xml
+++ b/app/src/main/res/layout/fragment_onboarding_font.xml
@@ -5,28 +5,28 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:padding="24dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="0dp"
-            android:padding="16dp">
+            android:padding="16dp"
+            app:cardElevation="0dp">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/code_font"
                     android:layout_marginBottom="16dp"
-                    style="@style/TextAppearance.Material3.TitleLarge" />
+                    android:text="@string/code_font" />
 
                 <RadioGroup
                     android:id="@+id/font_group"
diff --git a/app/src/main/res/layout/fragment_onboarding_start_page.xml b/app/src/main/res/layout/fragment_onboarding_start_page.xml
index 0b2bb04f..d274ce73 100644
--- a/app/src/main/res/layout/fragment_onboarding_start_page.xml
+++ b/app/src/main/res/layout/fragment_onboarding_start_page.xml
@@ -5,28 +5,28 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:padding="24dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="0dp"
-            android:padding="16dp">
+            android:padding="16dp"
+            app:cardElevation="0dp">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/default_tab"
                     android:layout_marginBottom="16dp"
-                    style="@style/TextAppearance.Material3.TitleLarge" />
+                    android:text="@string/default_tab" />
 
                 <RadioGroup
                     android:id="@+id/start_page_group"
diff --git a/app/src/main/res/layout/fragment_onboarding_theme.xml b/app/src/main/res/layout/fragment_onboarding_theme.xml
index 6c264862..f57137e2 100644
--- a/app/src/main/res/layout/fragment_onboarding_theme.xml
+++ b/app/src/main/res/layout/fragment_onboarding_theme.xml
@@ -5,28 +5,28 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:padding="24dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="0dp"
-            android:padding="16dp">
+            android:padding="16dp"
+            app:cardElevation="0dp">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <com.google.android.material.textview.MaterialTextView
+                    style="@style/TextAppearance.Material3.TitleLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/theme"
                     android:layout_marginBottom="16dp"
-                    style="@style/TextAppearance.Material3.TitleLarge" />
+                    android:text="@string/theme" />
 
                 <RadioGroup
                     android:id="@+id/theme_group"
diff --git a/app/src/main/res/layout/fragment_same_code.xml b/app/src/main/res/layout/fragment_same_code.xml
index d57182a5..3f2d9477 100644
--- a/app/src/main/res/layout/fragment_same_code.xml
+++ b/app/src/main/res/layout/fragment_same_code.xml
@@ -11,9 +11,9 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="2dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded"
         app:layout_constraintBottom_toTopOf="@id/ad_view"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
         <me.zhanghai.android.fastscroll.FastScrollScrollView
             android:id="@+id/scroll_view"
@@ -58,8 +58,8 @@
         android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
-        app:nativeAdLayout="@layout/ad_lesson_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_lesson_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_android_studio_lesson.xml b/app/src/main/res/layout/item_android_studio_lesson.xml
index e970672e..842ee898 100644
--- a/app/src/main/res/layout/item_android_studio_lesson.xml
+++ b/app/src/main/res/layout/item_android_studio_lesson.xml
@@ -19,11 +19,11 @@
             android:id="@+id/lesson_icon"
             android:layout_width="32dp"
             android:layout_height="32dp"
-            app:contentPadding="4dp"
             android:layout_marginEnd="16dp"
             android:background="?attr/colorPrimaryContainer"
             android:contentDescription="@null"
             android:scaleType="centerCrop"
+            app:contentPadding="4dp"
             app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/item_promoted_app.xml b/app/src/main/res/layout/item_promoted_app.xml
index c65a644d..251b054d 100644
--- a/app/src/main/res/layout/item_promoted_app.xml
+++ b/app/src/main/res/layout/item_promoted_app.xml
@@ -37,8 +37,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:maxLines="2"
             android:ellipsize="end"
+            android:maxLines="2"
             android:text="App"
             android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 1125fbb3..7ba3b1e6 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -2,17 +2,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/navigation_home"
+        android:contentDescription="@string/home"
         android:icon="@drawable/nav_news"
-        android:title="@string/home"
-        android:contentDescription="@string/home" />
+        android:title="@string/home" />
     <item
         android:id="@+id/navigation_android_studio"
+        android:contentDescription="@string/android_studio"
         android:icon="@drawable/ic_android"
-        android:title="@string/android_studio"
-        android:contentDescription="@string/android_studio" />
+        android:title="@string/android_studio" />
     <item
         android:id="@+id/navigation_about"
+        android:contentDescription="@string/about"
         android:icon="@drawable/nav_about"
-        android:title="@string/about"
-        android:contentDescription="@string/about" />
+        android:title="@string/about" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/raw/anim_quiz_success.json b/app/src/main/res/raw/anim_quiz_success.json
index ddc271d3..6041ead7 100644
--- a/app/src/main/res/raw/anim_quiz_success.json
+++ b/app/src/main/res/raw/anim_quiz_success.json
@@ -1 +1,5557 @@
-{"v":"5.6.3","fr":29.9700012207031,"ip":0,"op":47.0000019143492,"w":1920,"h":1080,"nm":"Successful","ddd":0,"assets":[],"fonts":{"list":[{"fName":"SFUIDisplay-Bold","fFamily":"SF UI Display","fStyle":"Bold","ascent":73.828125}]},"layers":[{"ddd":0,"ind":1,"ty":5,"nm":"Payment Successful","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":27,"s":[0]},{"t":37.0000015070409,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[664.641,864,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"s":64,"f":"SFUIDisplay-Bold","t":"","j":0,"tr":0,"lh":76.8,"ls":0,"fc":[0,1,0.592]},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[]},"ip":0,"op":47.0000019143492,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"check","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[961.141,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[376.304,376.304,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-23,-3.5],[-7.5,12],[20.5,-16]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":12,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[0]},{"t":27.0000010997325,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":47.0000019143492,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"elipse bold","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[81]},{"t":27.0000010997325,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,535.5,0],"ix":2},"a":{"a":0,"k":[-62,-4.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[41.25,41.25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":14,"s":[532.5,532.5,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[413.25,413.25,100]},{"t":27.0000010997325,"s":[508.75,508.75,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[80,80],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.8117647058823529,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-62,-4.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":47.0000019143492,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"elipse light","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[80]},{"t":27.0000010997325,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,535.5,0],"ix":2},"a":{"a":0,"k":[-60.75,-4.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":14,"s":[530,530,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[431,431,100]},{"t":27.0000010997325,"s":[535,535,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[122.5,122.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.22745098039215686,0.9647058823529412,0.35294117647058826,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-60.75,-4.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":47.0000019143492,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"stars","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[100]},{"t":33.0000013441176,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[89.979,89.979,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[440.397,440.397,100]},{"t":33.0000013441176,"s":[554.944,554.944,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":4.301,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":8.602,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0.011764705882352941,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,81],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 7","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":2.761,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":5.523,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0.011764705882352941,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-3.5,-91.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 6","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":4.301,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":8.602,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0.011764705882352941,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-82,-12],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 4","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":3.64,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":7.28,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.5372549019607843,0.011764705882352941,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[89.5,-14.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 2","np":3,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":47.0000019143492,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"circle","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[100]},{"t":33.0000013441176,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[139.752,139.752,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[535.117,535.117,100]},{"t":33.0000013441176,"s":[785.336,785.336,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[7.5,7.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.25,58.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 8","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[6.5,6.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-4.25,-61.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764705882352941,1,0.596078431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[55,-14],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 6","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[6,6],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-56.5,9.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":3,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[11.5,11.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[54.25,32.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 4","np":3,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[14.5,14.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-50.25,41.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 3","np":3,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[12.5,12.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-46.75,-50.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 2","np":3,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[15.5,15.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011764706817,1,0.596078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[45.25,-60.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":47.0000019143492,"st":0,"bm":0}],"markers":[],"chars":[{"ch":"P","size":64,"style":"Bold","w":62.5,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.453],[14.453,0]],"o":[[0,0],[0,0],[0,0],[0,0],[14.844,0],[0,-14.502],[0,0]],"v":[[5.859,-70.459],[5.859,0],[20.605,0],[20.605,-22.217],[34.521,-22.217],[59.668,-46.338],[35.254,-70.459]],"c":true},"ix":2},"nm":"P","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-8.008],[8.447,0],[0,0]],"o":[[0,0],[8.447,0],[0,8.057],[0,0],[0,0]],"v":[[20.605,-58.789],[31.348,-58.789],[44.678,-46.289],[31.299,-33.74],[20.605,-33.74]],"c":true},"ix":2},"nm":"P","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"P","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"a","size":64,"style":"Bold","w":56.01,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.592,0],[0,3.955],[-5.957,0.391],[0,0],[0,0]],"o":[[-5.176,0],[0,-3.955],[0,0],[0,0],[0,5.859]],"v":[[25.391,-9.766],[16.846,-16.211],[25.977,-22.9],[37.256,-23.682],[37.256,-19.727]],"c":true},"ix":2},"nm":"a","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-10.352,0],[-2.93,5.615],[0,0],[0,0],[0,0],[0,0],[13.818,0],[0.391,-10.254],[0,0],[-5.176,0],[0,-5.176],[0,0],[0,0],[0,-9.766]],"o":[[6.885,0],[0,0],[0,0],[0,0],[0,0],[0,-10.742],[-13.428,0],[0,0],[0.684,-3.906],[5.859,0],[0,0],[0,0],[-13.721,0.83],[0,9.619]],"v":[[20.752,0.635],[37.207,-8.301],[37.5,-8.301],[37.5,0],[51.27,0],[51.27,-36.865],[28.418,-54.688],[5.322,-37.354],[18.359,-37.354],[27.832,-43.994],[37.256,-35.986],[37.256,-32.422],[23.828,-31.592],[2.637,-15.479]],"c":true},"ix":2},"nm":"a","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"a","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"y","size":64,"style":"Bold","w":56.2,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.537,0],[-4.59,13.721],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[5.322,0],[0.488,0.098],[0,0]],"o":[[13.428,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.123,4.297],[-0.586,0],[0,0],[0.537,0.098]],"v":[[11.67,19.629],[36.279,1.074],[54.883,-53.76],[39.844,-53.76],[28.174,-11.572],[27.881,-11.572],[16.26,-53.76],[0.635,-53.76],[19.482,0.342],[18.994,2.393],[9.473,8.545],[6.25,8.398],[6.25,19.434]],"c":true},"ix":2},"nm":"y","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"y","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"m","size":64,"style":"Bold","w":88.43,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-5.615,0],[0,-5.762],[0,0],[0,0],[0,0],[-5.615,0],[0,-6.299],[0,0],[0,0],[0,0],[10.547,0],[2.441,-6.738],[0,0],[7.715,0],[2.295,-6.494],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-6.104],[5.518,0],[0,0],[0,0],[0,0],[0,-6.104],[5.811,0],[0,0],[0,0],[0,0],[0,-10.84],[-7.813,0],[0,0],[-1.807,-7.031],[-7.178,0],[0,0],[0,0],[0,0],[0,0]],"v":[[4.834,0],[19.092,0],[19.092,-32.324],[28.613,-42.725],[37.451,-33.496],[37.451,0],[51.221,0],[51.221,-32.52],[60.596,-42.725],[69.58,-32.959],[69.58,0],[83.838,0],[83.838,-36.523],[66.211,-54.541],[49.512,-43.555],[49.219,-43.555],[34.229,-54.541],[18.896,-43.994],[18.604,-43.994],[18.604,-53.76],[4.834,-53.76]],"c":true},"ix":2},"nm":"m","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"m","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"e","size":64,"style":"Bold","w":56.84,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.494,0],[-0.244,-7.031],[0,0]],"o":[[6.592,0],[0,0],[0.488,-6.885]],"v":[[28.809,-44.043],[40.234,-32.422],[17.041,-32.422]],"c":true},"ix":2},"nm":"e","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[5.371,0],[0,7.764],[0,0],[0,0],[0,0],[15.479,0],[0,-17.09],[-16.357,0],[-1.563,10.4]],"o":[[-1.367,4.15],[-7.52,0],[0,0],[0,0],[0,0],[0,-16.357],[-15.771,0],[0,17.09],[13.086,0],[0,0]],"v":[[40.43,-16.406],[29.443,-9.717],[16.895,-22.705],[16.895,-23.584],[54.004,-23.584],[54.004,-27.979],[28.662,-54.688],[2.832,-26.66],[29.199,0.928],[53.564,-16.406]],"c":true},"ix":2},"nm":"e","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"e","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"n","size":64,"style":"Bold","w":58.94,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-6.836,0],[0,-7.129],[0,0],[0,0],[0,0],[11.914,0],[3.076,-6.787],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-7.129],[6.738,0],[0,0],[0,0],[0,0],[0,-12.549],[-8.252,0],[0,0],[0,0],[0,0],[0,0]],"v":[[4.834,0],[19.092,0],[19.092,-30.664],[30.029,-42.676],[40.088,-31.494],[40.088,0],[54.346,0],[54.346,-34.473],[35.693,-54.541],[18.896,-44.141],[18.604,-44.141],[18.604,-53.76],[4.834,-53.76]],"c":true},"ix":2},"nm":"n","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"n","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"t","size":64,"style":"Bold","w":36.18,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-12.451,0],[-1.465,0.293],[0,0],[1.27,0],[0,4.15],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,10.498],[2.881,0],[0,0],[-0.879,0.146],[-4.346,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[8.643,-65.723],[8.643,-53.76],[1.367,-53.76],[1.367,-42.969],[8.643,-42.969],[8.643,-14.502],[25.977,0.195],[32.861,-0.391],[32.861,-10.938],[29.297,-10.693],[22.9,-16.846],[22.9,-42.969],[32.861,-42.969],[32.861,-53.76],[22.9,-53.76],[22.9,-65.723]],"c":true},"ix":2},"nm":"t","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"t","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":" ","size":64,"style":"Bold","w":21.48,"data":{},"fFamily":"SF UI Display"},{"ch":"S","size":64,"style":"Bold","w":63.13,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-16.943,0],[0,13.672],[14.111,3.027],[0,0],[0,4.346],[-7.275,0],[-0.488,-5.957],[0,0],[16.406,0],[0,-12.988],[-12.988,-2.783],[0,0],[0,-4.59],[7.861,0],[0.684,5.811]],"o":[[0.439,13.232],[17.48,0],[0,-10.742],[0,0],[-8.105,-1.855],[0,-5.225],[7.373,0],[0,0],[-0.244,-12.744],[-15.723,0],[0,10.303],[0,0],[8.496,1.904],[0,5.176],[-7.813,0],[0,0]],"v":[[3.223,-20.068],[31.396,1.221],[59.961,-21.094],[39.697,-40.918],[31.152,-42.725],[19.629,-51.367],[31.787,-60.059],[44.873,-50.488],[58.691,-50.488],[31.738,-71.68],[4.785,-50.098],[24.17,-30.42],[33.35,-28.418],[45.215,-19.385],[31.982,-10.449],[17.432,-20.068]],"c":true},"ix":2},"nm":"S","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"S","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"u","size":64,"style":"Bold","w":58.94,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[6.641,0],[0,7.275],[0,0],[0,0],[0,0],[-11.621,0],[-2.734,6.738],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,7.275],[-6.592,0],[0,0],[0,0],[0,0],[0,12.5],[8.154,0],[0,0],[0,0],[0,0],[0,0]],"v":[[54.102,-53.76],[39.844,-53.76],[39.844,-23.145],[29.053,-11.084],[18.848,-22.266],[18.848,-53.76],[4.59,-53.76],[4.59,-19.287],[23.877,0.781],[40.039,-9.717],[40.332,-9.717],[40.332,0],[54.102,0]],"c":true},"ix":2},"nm":"u","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"u","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"c","size":64,"style":"Bold","w":55.76,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[14.453,0],[0,-17.041],[-16.064,0],[-0.83,12.5],[0,0],[6.006,0],[0,10.498],[-7.324,0],[-0.781,-5.566]],"o":[[-0.684,-11.963],[-15.967,0],[0,17.285],[14.111,0],[0,0],[-0.928,5.908],[-7.373,0],[0,-10.303],[6.201,0],[0,0]],"v":[[53.418,-33.936],[29.053,-54.688],[2.832,-26.904],[29.15,0.928],[53.467,-19.531],[40.186,-19.531],[29.297,-10.352],[17.285,-26.904],[29.248,-43.457],[40.137,-33.936]],"c":true},"ix":2},"nm":"c","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"c","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"s","size":64,"style":"Bold","w":52.64,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-10.107],[-10.107,-2.295],[0,0],[0,-2.783],[5.664,0],[0.684,4.541],[0,0],[-14.16,0],[0,10.449],[10.791,2.441],[0,0],[0,2.686],[-5.127,0],[-0.293,-4.248],[0,0],[13.281,0]],"o":[[0,7.861],[0,0],[4.883,1.172],[0,3.516],[-5.908,0],[0,0],[0.732,10.352],[14.063,0],[0,-8.008],[0,0],[-4.834,-1.123],[0,-3.467],[5.469,0],[0,0],[-0.195,-10.254],[-13.623,0]],"v":[[3.906,-37.939],[19.238,-22.559],[29.15,-20.313],[35.889,-14.893],[26.758,-9.18],[16.504,-16.26],[2.588,-16.26],[26.367,0.928],[50.049,-16.406],[34.961,-31.006],[24.854,-33.203],[17.676,-38.818],[26.221,-44.58],[35.547,-37.646],[48.73,-37.646],[26.416,-54.688]],"c":true},"ix":2},"nm":"s","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"s","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"f","size":64,"style":"Bold","w":35.84,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-4.297,0],[-1.025,-0.195],[0,0],[2.441,0],[0,-10.352],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.049,-3.76],[1.563,0],[0,0],[-1.953,-0.293],[-12.451,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[8.643,0],[22.9,0],[22.9,-42.969],[32.666,-42.969],[32.666,-53.76],[22.607,-53.76],[22.607,-57.715],[28.711,-63.086],[32.617,-62.744],[32.617,-72.656],[26.025,-73.145],[8.643,-58.545],[8.643,-53.76],[1.367,-53.76],[1.367,-42.969],[8.643,-42.969]],"c":true},"ix":2},"nm":"f","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"f","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"},{"ch":"l","size":64,"style":"Bold","w":24.66,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[5.225,0],[19.482,0],[19.482,-73.828],[5.225,-73.828]],"c":true},"ix":2},"nm":"l","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"l","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"SF UI Display"}]}
\ No newline at end of file
+{
+  "v": "5.6.3",
+  "fr": 29.9700012207031,
+  "ip": 0,
+  "op": 47.0000019143492,
+  "w": 1920,
+  "h": 1080,
+  "nm": "Successful",
+  "ddd": 0,
+  "assets": [],
+  "fonts": {
+    "list": [
+      {
+        "fName": "SFUIDisplay-Bold",
+        "fFamily": "SF UI Display",
+        "fStyle": "Bold",
+        "ascent": 73.828125
+      }
+    ]
+  },
+  "layers": [
+    {
+      "ddd": 0,
+      "ind": 1,
+      "ty": 5,
+      "nm": "Payment Successful",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.833
+                ],
+                "y": [
+                  0.833
+                ]
+              },
+              "o": {
+                "x": [
+                  0.167
+                ],
+                "y": [
+                  0.167
+                ]
+              },
+              "t": 27,
+              "s": [
+                0
+              ]
+            },
+            {
+              "t": 37.0000015070409,
+              "s": [
+                100
+              ]
+            }
+          ],
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            664.641,
+            864,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            0,
+            0,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 0,
+          "k": [
+            100,
+            100,
+            100
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "t": {
+        "d": {
+          "k": [
+            {
+              "s": {
+                "s": 64,
+                "f": "SFUIDisplay-Bold",
+                "t": "",
+                "j": 0,
+                "tr": 0,
+                "lh": 76.8,
+                "ls": 0,
+                "fc": [
+                  0,
+                  1,
+                  0.592
+                ]
+              },
+              "t": 0
+            }
+          ]
+        },
+        "p": {},
+        "m": {
+          "g": 1,
+          "a": {
+            "a": 0,
+            "k": [
+              0,
+              0
+            ],
+            "ix": 2
+          }
+        },
+        "a": []
+      },
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 2,
+      "ty": 4,
+      "nm": "check",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 0,
+          "k": 100,
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            961.141,
+            540,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            0,
+            0,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 0,
+          "k": [
+            376.304,
+            376.304,
+            100
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [
+                      0,
+                      0
+                    ],
+                    [
+                      0,
+                      0
+                    ],
+                    [
+                      0,
+                      0
+                    ]
+                  ],
+                  "o": [
+                    [
+                      0,
+                      0
+                    ],
+                    [
+                      0,
+                      0
+                    ],
+                    [
+                      0,
+                      0
+                    ]
+                  ],
+                  "v": [
+                    [
+                      -23,
+                      -3.5
+                    ],
+                    [
+                      -7.5,
+                      12
+                    ],
+                    [
+                      20.5,
+                      -16
+                    ]
+                  ],
+                  "c": false
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": {
+                "a": 0,
+                "k": [
+                  1,
+                  1,
+                  1,
+                  1
+                ],
+                "ix": 3
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 4
+              },
+              "w": {
+                "a": 0,
+                "k": 12,
+                "ix": 5
+              },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Stroke 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Shape 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 0,
+            "k": 0,
+            "ix": 1
+          },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": {
+                  "x": [
+                    0.667
+                  ],
+                  "y": [
+                    1
+                  ]
+                },
+                "o": {
+                  "x": [
+                    0.333
+                  ],
+                  "y": [
+                    0
+                  ]
+                },
+                "t": 14,
+                "s": [
+                  0
+                ]
+              },
+              {
+                "t": 27.0000010997325,
+                "s": [
+                  100
+                ]
+              }
+            ],
+            "ix": 2
+          },
+          "o": {
+            "a": 0,
+            "k": 0,
+            "ix": 3
+          },
+          "m": 1,
+          "ix": 2,
+          "nm": "Trim Paths 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 3,
+      "ty": 4,
+      "nm": "elipse bold",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 0,
+              "s": [
+                0
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 14,
+              "s": [
+                81
+              ]
+            },
+            {
+              "t": 27.0000010997325,
+              "s": [
+                100
+              ]
+            }
+          ],
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            960,
+            535.5,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            -62,
+            -4.5,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 0,
+              "s": [
+                41.25,
+                41.25,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 14,
+              "s": [
+                532.5,
+                532.5,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                413.25,
+                413.25,
+                100
+              ]
+            },
+            {
+              "t": 27.0000010997325,
+              "s": [
+                508.75,
+                508.75,
+                100
+              ]
+            }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  80,
+                  80
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0,
+                  0.8117647058823529,
+                  0.2,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -62,
+                  -4.5
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 4,
+      "ty": 4,
+      "nm": "elipse light",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 0,
+              "s": [
+                0
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 14,
+              "s": [
+                80
+              ]
+            },
+            {
+              "t": 27.0000010997325,
+              "s": [
+                0
+              ]
+            }
+          ],
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            960,
+            535.5,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            -60.75,
+            -4.5,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 0,
+              "s": [
+                100,
+                100,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 14,
+              "s": [
+                530,
+                530,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                431,
+                431,
+                100
+              ]
+            },
+            {
+              "t": 27.0000010997325,
+              "s": [
+                535,
+                535,
+                100
+              ]
+            }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  122.5,
+                  122.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.22745098039215686,
+                  0.9647058823529412,
+                  0.35294117647058826,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -60.75,
+                  -4.25
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 5,
+      "ty": 4,
+      "nm": "stars",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 9,
+              "s": [
+                0
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                100
+              ]
+            },
+            {
+              "t": 33.0000013441176,
+              "s": [
+                0
+              ]
+            }
+          ],
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            960,
+            540,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            0,
+            0,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 9,
+              "s": [
+                89.979,
+                89.979,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                440.397,
+                440.397,
+                100
+              ]
+            },
+            {
+              "t": 33.0000013441176,
+              "s": [
+                554.944,
+                554.944,
+                100
+              ]
+            }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ty": "sr",
+              "sy": 1,
+              "d": 1,
+              "pt": {
+                "a": 0,
+                "k": 5,
+                "ix": 3
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 4
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "ir": {
+                "a": 0,
+                "k": 4.301,
+                "ix": 6
+              },
+              "is": {
+                "a": 0,
+                "k": 0,
+                "ix": 8
+              },
+              "or": {
+                "a": 0,
+                "k": 8.602,
+                "ix": 7
+              },
+              "os": {
+                "a": 0,
+                "k": 0,
+                "ix": 9
+              },
+              "ix": 1,
+              "nm": "Polystar Path 1",
+              "mn": "ADBE Vector Shape - Star",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  1,
+                  0.5372549019607843,
+                  0.011764705882352941,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  2.5,
+                  81
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Polystar 7",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ty": "sr",
+              "sy": 1,
+              "d": 1,
+              "pt": {
+                "a": 0,
+                "k": 5,
+                "ix": 3
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 4
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "ir": {
+                "a": 0,
+                "k": 2.761,
+                "ix": 6
+              },
+              "is": {
+                "a": 0,
+                "k": 0,
+                "ix": 8
+              },
+              "or": {
+                "a": 0,
+                "k": 5.523,
+                "ix": 7
+              },
+              "os": {
+                "a": 0,
+                "k": 0,
+                "ix": 9
+              },
+              "ix": 1,
+              "nm": "Polystar Path 1",
+              "mn": "ADBE Vector Shape - Star",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  1,
+                  0.5372549019607843,
+                  0.011764705882352941,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -3.5,
+                  -91.75
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Polystar 6",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 2,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ty": "sr",
+              "sy": 1,
+              "d": 1,
+              "pt": {
+                "a": 0,
+                "k": 5,
+                "ix": 3
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 4
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "ir": {
+                "a": 0,
+                "k": 4.301,
+                "ix": 6
+              },
+              "is": {
+                "a": 0,
+                "k": 0,
+                "ix": 8
+              },
+              "or": {
+                "a": 0,
+                "k": 8.602,
+                "ix": 7
+              },
+              "os": {
+                "a": 0,
+                "k": 0,
+                "ix": 9
+              },
+              "ix": 1,
+              "nm": "Polystar Path 1",
+              "mn": "ADBE Vector Shape - Star",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  1,
+                  0.5372549019607843,
+                  0.011764705882352941,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -82,
+                  -12
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Polystar 4",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 3,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ty": "sr",
+              "sy": 1,
+              "d": 1,
+              "pt": {
+                "a": 0,
+                "k": 5,
+                "ix": 3
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 4
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "ir": {
+                "a": 0,
+                "k": 3.64,
+                "ix": 6
+              },
+              "is": {
+                "a": 0,
+                "k": 0,
+                "ix": 8
+              },
+              "or": {
+                "a": 0,
+                "k": 7.28,
+                "ix": 7
+              },
+              "os": {
+                "a": 0,
+                "k": 0,
+                "ix": 9
+              },
+              "ix": 1,
+              "nm": "Polystar Path 1",
+              "mn": "ADBE Vector Shape - Star",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  1,
+                  0.5372549019607843,
+                  0.011764705882352941,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  89.5,
+                  -14.5
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Polystar 2",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 4,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 6,
+      "ty": 4,
+      "nm": "circle",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 9,
+              "s": [
+                0
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667
+                ],
+                "y": [
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333
+                ],
+                "y": [
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                100
+              ]
+            },
+            {
+              "t": 33.0000013441176,
+              "s": [
+                0
+              ]
+            }
+          ],
+          "ix": 11
+        },
+        "r": {
+          "a": 0,
+          "k": 0,
+          "ix": 10
+        },
+        "p": {
+          "a": 0,
+          "k": [
+            960,
+            540,
+            0
+          ],
+          "ix": 2
+        },
+        "a": {
+          "a": 0,
+          "k": [
+            0,
+            0,
+            0
+          ],
+          "ix": 1
+        },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 9,
+              "s": [
+                139.752,
+                139.752,
+                100
+              ]
+            },
+            {
+              "i": {
+                "x": [
+                  0.667,
+                  0.667,
+                  0.667
+                ],
+                "y": [
+                  1,
+                  1,
+                  1
+                ]
+              },
+              "o": {
+                "x": [
+                  0.333,
+                  0.333,
+                  0.333
+                ],
+                "y": [
+                  0,
+                  0,
+                  0
+                ]
+              },
+              "t": 21,
+              "s": [
+                535.117,
+                535.117,
+                100
+              ]
+            },
+            {
+              "t": 33.0000013441176,
+              "s": [
+                785.336,
+                785.336,
+                100
+              ]
+            }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  7.5,
+                  7.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -0.25,
+                  58.75
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 8",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  6.5,
+                  6.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -4.25,
+                  -61.75
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 7",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 2,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  7,
+                  7
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764705882352941,
+                  1,
+                  0.596078431372549,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  55,
+                  -14
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 6",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 3,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  6,
+                  6
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -56.5,
+                  9.5
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 5",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 4,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  11.5,
+                  11.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  54.25,
+                  32.75
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 4",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 5,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  14.5,
+                  14.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -50.25,
+                  41.25
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 3",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 6,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  12.5,
+                  12.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  -46.75,
+                  -50.25
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 2",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 7,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": {
+                "a": 0,
+                "k": [
+                  15.5,
+                  15.5
+                ],
+                "ix": 2
+              },
+              "p": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 3
+              },
+              "nm": "Ellipse Path 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764706817,
+                  1,
+                  0.596078431373,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 5
+              },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": {
+                "a": 0,
+                "k": [
+                  45.25,
+                  -60.75
+                ],
+                "ix": 2
+              },
+              "a": {
+                "a": 0,
+                "k": [
+                  0,
+                  0
+                ],
+                "ix": 1
+              },
+              "s": {
+                "a": 0,
+                "k": [
+                  100,
+                  100
+                ],
+                "ix": 3
+              },
+              "r": {
+                "a": 0,
+                "k": 0,
+                "ix": 6
+              },
+              "o": {
+                "a": 0,
+                "k": 100,
+                "ix": 7
+              },
+              "sk": {
+                "a": 0,
+                "k": 0,
+                "ix": 4
+              },
+              "sa": {
+                "a": 0,
+                "k": 0,
+                "ix": 5
+              },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Ellipse 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 8,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 47.0000019143492,
+      "st": 0,
+      "bm": 0
+    }
+  ],
+  "markers": [],
+  "chars": [
+    {
+      "ch": "P",
+      "size": 64,
+      "style": "Bold",
+      "w": 62.5,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        14.453
+                      ],
+                      [
+                        14.453,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        14.844,
+                        0
+                      ],
+                      [
+                        0,
+                        -14.502
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        5.859,
+                        -70.459
+                      ],
+                      [
+                        5.859,
+                        0
+                      ],
+                      [
+                        20.605,
+                        0
+                      ],
+                      [
+                        20.605,
+                        -22.217
+                      ],
+                      [
+                        34.521,
+                        -22.217
+                      ],
+                      [
+                        59.668,
+                        -46.338
+                      ],
+                      [
+                        35.254,
+                        -70.459
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "P",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              },
+              {
+                "ind": 1,
+                "ty": "sh",
+                "ix": 2,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -8.008
+                      ],
+                      [
+                        8.447,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        8.447,
+                        0
+                      ],
+                      [
+                        0,
+                        8.057
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        20.605,
+                        -58.789
+                      ],
+                      [
+                        31.348,
+                        -58.789
+                      ],
+                      [
+                        44.678,
+                        -46.289
+                      ],
+                      [
+                        31.299,
+                        -33.74
+                      ],
+                      [
+                        20.605,
+                        -33.74
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "P",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "P",
+            "np": 5,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "a",
+      "size": 64,
+      "style": "Bold",
+      "w": 56.01,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        6.592,
+                        0
+                      ],
+                      [
+                        0,
+                        3.955
+                      ],
+                      [
+                        -5.957,
+                        0.391
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        -5.176,
+                        0
+                      ],
+                      [
+                        0,
+                        -3.955
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        5.859
+                      ]
+                    ],
+                    "v": [
+                      [
+                        25.391,
+                        -9.766
+                      ],
+                      [
+                        16.846,
+                        -16.211
+                      ],
+                      [
+                        25.977,
+                        -22.9
+                      ],
+                      [
+                        37.256,
+                        -23.682
+                      ],
+                      [
+                        37.256,
+                        -19.727
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "a",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              },
+              {
+                "ind": 1,
+                "ty": "sh",
+                "ix": 2,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        -10.352,
+                        0
+                      ],
+                      [
+                        -2.93,
+                        5.615
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        13.818,
+                        0
+                      ],
+                      [
+                        0.391,
+                        -10.254
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -5.176,
+                        0
+                      ],
+                      [
+                        0,
+                        -5.176
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -9.766
+                      ]
+                    ],
+                    "o": [
+                      [
+                        6.885,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -10.742
+                      ],
+                      [
+                        -13.428,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0.684,
+                        -3.906
+                      ],
+                      [
+                        5.859,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -13.721,
+                        0.83
+                      ],
+                      [
+                        0,
+                        9.619
+                      ]
+                    ],
+                    "v": [
+                      [
+                        20.752,
+                        0.635
+                      ],
+                      [
+                        37.207,
+                        -8.301
+                      ],
+                      [
+                        37.5,
+                        -8.301
+                      ],
+                      [
+                        37.5,
+                        0
+                      ],
+                      [
+                        51.27,
+                        0
+                      ],
+                      [
+                        51.27,
+                        -36.865
+                      ],
+                      [
+                        28.418,
+                        -54.688
+                      ],
+                      [
+                        5.322,
+                        -37.354
+                      ],
+                      [
+                        18.359,
+                        -37.354
+                      ],
+                      [
+                        27.832,
+                        -43.994
+                      ],
+                      [
+                        37.256,
+                        -35.986
+                      ],
+                      [
+                        37.256,
+                        -32.422
+                      ],
+                      [
+                        23.828,
+                        -31.592
+                      ],
+                      [
+                        2.637,
+                        -15.479
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "a",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "a",
+            "np": 5,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "y",
+      "size": 64,
+      "style": "Bold",
+      "w": 56.2,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        -0.537,
+                        0
+                      ],
+                      [
+                        -4.59,
+                        13.721
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        5.322,
+                        0
+                      ],
+                      [
+                        0.488,
+                        0.098
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        13.428,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -1.123,
+                        4.297
+                      ],
+                      [
+                        -0.586,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0.537,
+                        0.098
+                      ]
+                    ],
+                    "v": [
+                      [
+                        11.67,
+                        19.629
+                      ],
+                      [
+                        36.279,
+                        1.074
+                      ],
+                      [
+                        54.883,
+                        -53.76
+                      ],
+                      [
+                        39.844,
+                        -53.76
+                      ],
+                      [
+                        28.174,
+                        -11.572
+                      ],
+                      [
+                        27.881,
+                        -11.572
+                      ],
+                      [
+                        16.26,
+                        -53.76
+                      ],
+                      [
+                        0.635,
+                        -53.76
+                      ],
+                      [
+                        19.482,
+                        0.342
+                      ],
+                      [
+                        18.994,
+                        2.393
+                      ],
+                      [
+                        9.473,
+                        8.545
+                      ],
+                      [
+                        6.25,
+                        8.398
+                      ],
+                      [
+                        6.25,
+                        19.434
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "y",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "y",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "m",
+      "size": 64,
+      "style": "Bold",
+      "w": 88.43,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -5.615,
+                        0
+                      ],
+                      [
+                        0,
+                        -5.762
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -5.615,
+                        0
+                      ],
+                      [
+                        0,
+                        -6.299
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        10.547,
+                        0
+                      ],
+                      [
+                        2.441,
+                        -6.738
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        7.715,
+                        0
+                      ],
+                      [
+                        2.295,
+                        -6.494
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -6.104
+                      ],
+                      [
+                        5.518,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -6.104
+                      ],
+                      [
+                        5.811,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -10.84
+                      ],
+                      [
+                        -7.813,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -1.807,
+                        -7.031
+                      ],
+                      [
+                        -7.178,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        4.834,
+                        0
+                      ],
+                      [
+                        19.092,
+                        0
+                      ],
+                      [
+                        19.092,
+                        -32.324
+                      ],
+                      [
+                        28.613,
+                        -42.725
+                      ],
+                      [
+                        37.451,
+                        -33.496
+                      ],
+                      [
+                        37.451,
+                        0
+                      ],
+                      [
+                        51.221,
+                        0
+                      ],
+                      [
+                        51.221,
+                        -32.52
+                      ],
+                      [
+                        60.596,
+                        -42.725
+                      ],
+                      [
+                        69.58,
+                        -32.959
+                      ],
+                      [
+                        69.58,
+                        0
+                      ],
+                      [
+                        83.838,
+                        0
+                      ],
+                      [
+                        83.838,
+                        -36.523
+                      ],
+                      [
+                        66.211,
+                        -54.541
+                      ],
+                      [
+                        49.512,
+                        -43.555
+                      ],
+                      [
+                        49.219,
+                        -43.555
+                      ],
+                      [
+                        34.229,
+                        -54.541
+                      ],
+                      [
+                        18.896,
+                        -43.994
+                      ],
+                      [
+                        18.604,
+                        -43.994
+                      ],
+                      [
+                        18.604,
+                        -53.76
+                      ],
+                      [
+                        4.834,
+                        -53.76
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "m",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "m",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "e",
+      "size": 64,
+      "style": "Bold",
+      "w": 56.84,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        -6.494,
+                        0
+                      ],
+                      [
+                        -0.244,
+                        -7.031
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        6.592,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0.488,
+                        -6.885
+                      ]
+                    ],
+                    "v": [
+                      [
+                        28.809,
+                        -44.043
+                      ],
+                      [
+                        40.234,
+                        -32.422
+                      ],
+                      [
+                        17.041,
+                        -32.422
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "e",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              },
+              {
+                "ind": 1,
+                "ty": "sh",
+                "ix": 2,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        5.371,
+                        0
+                      ],
+                      [
+                        0,
+                        7.764
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        15.479,
+                        0
+                      ],
+                      [
+                        0,
+                        -17.09
+                      ],
+                      [
+                        -16.357,
+                        0
+                      ],
+                      [
+                        -1.563,
+                        10.4
+                      ]
+                    ],
+                    "o": [
+                      [
+                        -1.367,
+                        4.15
+                      ],
+                      [
+                        -7.52,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -16.357
+                      ],
+                      [
+                        -15.771,
+                        0
+                      ],
+                      [
+                        0,
+                        17.09
+                      ],
+                      [
+                        13.086,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        40.43,
+                        -16.406
+                      ],
+                      [
+                        29.443,
+                        -9.717
+                      ],
+                      [
+                        16.895,
+                        -22.705
+                      ],
+                      [
+                        16.895,
+                        -23.584
+                      ],
+                      [
+                        54.004,
+                        -23.584
+                      ],
+                      [
+                        54.004,
+                        -27.979
+                      ],
+                      [
+                        28.662,
+                        -54.688
+                      ],
+                      [
+                        2.832,
+                        -26.66
+                      ],
+                      [
+                        29.199,
+                        0.928
+                      ],
+                      [
+                        53.564,
+                        -16.406
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "e",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "e",
+            "np": 5,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "n",
+      "size": 64,
+      "style": "Bold",
+      "w": 58.94,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -6.836,
+                        0
+                      ],
+                      [
+                        0,
+                        -7.129
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        11.914,
+                        0
+                      ],
+                      [
+                        3.076,
+                        -6.787
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -7.129
+                      ],
+                      [
+                        6.738,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -12.549
+                      ],
+                      [
+                        -8.252,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        4.834,
+                        0
+                      ],
+                      [
+                        19.092,
+                        0
+                      ],
+                      [
+                        19.092,
+                        -30.664
+                      ],
+                      [
+                        30.029,
+                        -42.676
+                      ],
+                      [
+                        40.088,
+                        -31.494
+                      ],
+                      [
+                        40.088,
+                        0
+                      ],
+                      [
+                        54.346,
+                        0
+                      ],
+                      [
+                        54.346,
+                        -34.473
+                      ],
+                      [
+                        35.693,
+                        -54.541
+                      ],
+                      [
+                        18.896,
+                        -44.141
+                      ],
+                      [
+                        18.604,
+                        -44.141
+                      ],
+                      [
+                        18.604,
+                        -53.76
+                      ],
+                      [
+                        4.834,
+                        -53.76
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "n",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "n",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "t",
+      "size": 64,
+      "style": "Bold",
+      "w": 36.18,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -12.451,
+                        0
+                      ],
+                      [
+                        -1.465,
+                        0.293
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        1.27,
+                        0
+                      ],
+                      [
+                        0,
+                        4.15
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        10.498
+                      ],
+                      [
+                        2.881,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -0.879,
+                        0.146
+                      ],
+                      [
+                        -4.346,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        8.643,
+                        -65.723
+                      ],
+                      [
+                        8.643,
+                        -53.76
+                      ],
+                      [
+                        1.367,
+                        -53.76
+                      ],
+                      [
+                        1.367,
+                        -42.969
+                      ],
+                      [
+                        8.643,
+                        -42.969
+                      ],
+                      [
+                        8.643,
+                        -14.502
+                      ],
+                      [
+                        25.977,
+                        0.195
+                      ],
+                      [
+                        32.861,
+                        -0.391
+                      ],
+                      [
+                        32.861,
+                        -10.938
+                      ],
+                      [
+                        29.297,
+                        -10.693
+                      ],
+                      [
+                        22.9,
+                        -16.846
+                      ],
+                      [
+                        22.9,
+                        -42.969
+                      ],
+                      [
+                        32.861,
+                        -42.969
+                      ],
+                      [
+                        32.861,
+                        -53.76
+                      ],
+                      [
+                        22.9,
+                        -53.76
+                      ],
+                      [
+                        22.9,
+                        -65.723
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "t",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "t",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": " ",
+      "size": 64,
+      "style": "Bold",
+      "w": 21.48,
+      "data": {},
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "S",
+      "size": 64,
+      "style": "Bold",
+      "w": 63.13,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -16.943,
+                        0
+                      ],
+                      [
+                        0,
+                        13.672
+                      ],
+                      [
+                        14.111,
+                        3.027
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        4.346
+                      ],
+                      [
+                        -7.275,
+                        0
+                      ],
+                      [
+                        -0.488,
+                        -5.957
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        16.406,
+                        0
+                      ],
+                      [
+                        0,
+                        -12.988
+                      ],
+                      [
+                        -12.988,
+                        -2.783
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -4.59
+                      ],
+                      [
+                        7.861,
+                        0
+                      ],
+                      [
+                        0.684,
+                        5.811
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0.439,
+                        13.232
+                      ],
+                      [
+                        17.48,
+                        0
+                      ],
+                      [
+                        0,
+                        -10.742
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -8.105,
+                        -1.855
+                      ],
+                      [
+                        0,
+                        -5.225
+                      ],
+                      [
+                        7.373,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -0.244,
+                        -12.744
+                      ],
+                      [
+                        -15.723,
+                        0
+                      ],
+                      [
+                        0,
+                        10.303
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        8.496,
+                        1.904
+                      ],
+                      [
+                        0,
+                        5.176
+                      ],
+                      [
+                        -7.813,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        3.223,
+                        -20.068
+                      ],
+                      [
+                        31.396,
+                        1.221
+                      ],
+                      [
+                        59.961,
+                        -21.094
+                      ],
+                      [
+                        39.697,
+                        -40.918
+                      ],
+                      [
+                        31.152,
+                        -42.725
+                      ],
+                      [
+                        19.629,
+                        -51.367
+                      ],
+                      [
+                        31.787,
+                        -60.059
+                      ],
+                      [
+                        44.873,
+                        -50.488
+                      ],
+                      [
+                        58.691,
+                        -50.488
+                      ],
+                      [
+                        31.738,
+                        -71.68
+                      ],
+                      [
+                        4.785,
+                        -50.098
+                      ],
+                      [
+                        24.17,
+                        -30.42
+                      ],
+                      [
+                        33.35,
+                        -28.418
+                      ],
+                      [
+                        45.215,
+                        -19.385
+                      ],
+                      [
+                        31.982,
+                        -10.449
+                      ],
+                      [
+                        17.432,
+                        -20.068
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "S",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "S",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "u",
+      "size": 64,
+      "style": "Bold",
+      "w": 58.94,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        6.641,
+                        0
+                      ],
+                      [
+                        0,
+                        7.275
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -11.621,
+                        0
+                      ],
+                      [
+                        -2.734,
+                        6.738
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        7.275
+                      ],
+                      [
+                        -6.592,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        12.5
+                      ],
+                      [
+                        8.154,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        54.102,
+                        -53.76
+                      ],
+                      [
+                        39.844,
+                        -53.76
+                      ],
+                      [
+                        39.844,
+                        -23.145
+                      ],
+                      [
+                        29.053,
+                        -11.084
+                      ],
+                      [
+                        18.848,
+                        -22.266
+                      ],
+                      [
+                        18.848,
+                        -53.76
+                      ],
+                      [
+                        4.59,
+                        -53.76
+                      ],
+                      [
+                        4.59,
+                        -19.287
+                      ],
+                      [
+                        23.877,
+                        0.781
+                      ],
+                      [
+                        40.039,
+                        -9.717
+                      ],
+                      [
+                        40.332,
+                        -9.717
+                      ],
+                      [
+                        40.332,
+                        0
+                      ],
+                      [
+                        54.102,
+                        0
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "u",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "u",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "c",
+      "size": 64,
+      "style": "Bold",
+      "w": 55.76,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        14.453,
+                        0
+                      ],
+                      [
+                        0,
+                        -17.041
+                      ],
+                      [
+                        -16.064,
+                        0
+                      ],
+                      [
+                        -0.83,
+                        12.5
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        6.006,
+                        0
+                      ],
+                      [
+                        0,
+                        10.498
+                      ],
+                      [
+                        -7.324,
+                        0
+                      ],
+                      [
+                        -0.781,
+                        -5.566
+                      ]
+                    ],
+                    "o": [
+                      [
+                        -0.684,
+                        -11.963
+                      ],
+                      [
+                        -15.967,
+                        0
+                      ],
+                      [
+                        0,
+                        17.285
+                      ],
+                      [
+                        14.111,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -0.928,
+                        5.908
+                      ],
+                      [
+                        -7.373,
+                        0
+                      ],
+                      [
+                        0,
+                        -10.303
+                      ],
+                      [
+                        6.201,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        53.418,
+                        -33.936
+                      ],
+                      [
+                        29.053,
+                        -54.688
+                      ],
+                      [
+                        2.832,
+                        -26.904
+                      ],
+                      [
+                        29.15,
+                        0.928
+                      ],
+                      [
+                        53.467,
+                        -19.531
+                      ],
+                      [
+                        40.186,
+                        -19.531
+                      ],
+                      [
+                        29.297,
+                        -10.352
+                      ],
+                      [
+                        17.285,
+                        -26.904
+                      ],
+                      [
+                        29.248,
+                        -43.457
+                      ],
+                      [
+                        40.137,
+                        -33.936
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "c",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "c",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "s",
+      "size": 64,
+      "style": "Bold",
+      "w": 52.64,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        -10.107
+                      ],
+                      [
+                        -10.107,
+                        -2.295
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        -2.783
+                      ],
+                      [
+                        5.664,
+                        0
+                      ],
+                      [
+                        0.684,
+                        4.541
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -14.16,
+                        0
+                      ],
+                      [
+                        0,
+                        10.449
+                      ],
+                      [
+                        10.791,
+                        2.441
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        2.686
+                      ],
+                      [
+                        -5.127,
+                        0
+                      ],
+                      [
+                        -0.293,
+                        -4.248
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        13.281,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        7.861
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        4.883,
+                        1.172
+                      ],
+                      [
+                        0,
+                        3.516
+                      ],
+                      [
+                        -5.908,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0.732,
+                        10.352
+                      ],
+                      [
+                        14.063,
+                        0
+                      ],
+                      [
+                        0,
+                        -8.008
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -4.834,
+                        -1.123
+                      ],
+                      [
+                        0,
+                        -3.467
+                      ],
+                      [
+                        5.469,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -0.195,
+                        -10.254
+                      ],
+                      [
+                        -13.623,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        3.906,
+                        -37.939
+                      ],
+                      [
+                        19.238,
+                        -22.559
+                      ],
+                      [
+                        29.15,
+                        -20.313
+                      ],
+                      [
+                        35.889,
+                        -14.893
+                      ],
+                      [
+                        26.758,
+                        -9.18
+                      ],
+                      [
+                        16.504,
+                        -16.26
+                      ],
+                      [
+                        2.588,
+                        -16.26
+                      ],
+                      [
+                        26.367,
+                        0.928
+                      ],
+                      [
+                        50.049,
+                        -16.406
+                      ],
+                      [
+                        34.961,
+                        -31.006
+                      ],
+                      [
+                        24.854,
+                        -33.203
+                      ],
+                      [
+                        17.676,
+                        -38.818
+                      ],
+                      [
+                        26.221,
+                        -44.58
+                      ],
+                      [
+                        35.547,
+                        -37.646
+                      ],
+                      [
+                        48.73,
+                        -37.646
+                      ],
+                      [
+                        26.416,
+                        -54.688
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "s",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "s",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "f",
+      "size": 64,
+      "style": "Bold",
+      "w": 35.84,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -4.297,
+                        0
+                      ],
+                      [
+                        -1.025,
+                        -0.195
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        2.441,
+                        0
+                      ],
+                      [
+                        0,
+                        -10.352
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0.049,
+                        -3.76
+                      ],
+                      [
+                        1.563,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        -1.953,
+                        -0.293
+                      ],
+                      [
+                        -12.451,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        8.643,
+                        0
+                      ],
+                      [
+                        22.9,
+                        0
+                      ],
+                      [
+                        22.9,
+                        -42.969
+                      ],
+                      [
+                        32.666,
+                        -42.969
+                      ],
+                      [
+                        32.666,
+                        -53.76
+                      ],
+                      [
+                        22.607,
+                        -53.76
+                      ],
+                      [
+                        22.607,
+                        -57.715
+                      ],
+                      [
+                        28.711,
+                        -63.086
+                      ],
+                      [
+                        32.617,
+                        -62.744
+                      ],
+                      [
+                        32.617,
+                        -72.656
+                      ],
+                      [
+                        26.025,
+                        -73.145
+                      ],
+                      [
+                        8.643,
+                        -58.545
+                      ],
+                      [
+                        8.643,
+                        -53.76
+                      ],
+                      [
+                        1.367,
+                        -53.76
+                      ],
+                      [
+                        1.367,
+                        -42.969
+                      ],
+                      [
+                        8.643,
+                        -42.969
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "f",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "f",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    },
+    {
+      "ch": "l",
+      "size": 64,
+      "style": "Bold",
+      "w": 24.66,
+      "data": {
+        "shapes": [
+          {
+            "ty": "gr",
+            "it": [
+              {
+                "ind": 0,
+                "ty": "sh",
+                "ix": 1,
+                "ks": {
+                  "a": 0,
+                  "k": {
+                    "i": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "o": [
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ],
+                      [
+                        0,
+                        0
+                      ]
+                    ],
+                    "v": [
+                      [
+                        5.225,
+                        0
+                      ],
+                      [
+                        19.482,
+                        0
+                      ],
+                      [
+                        19.482,
+                        -73.828
+                      ],
+                      [
+                        5.225,
+                        -73.828
+                      ]
+                    ],
+                    "c": true
+                  },
+                  "ix": 2
+                },
+                "nm": "l",
+                "mn": "ADBE Vector Shape - Group",
+                "hd": false
+              }
+            ],
+            "nm": "l",
+            "np": 3,
+            "cix": 2,
+            "bm": 0,
+            "ix": 1,
+            "mn": "ADBE Vector Group",
+            "hd": false
+          }
+        ]
+      },
+      "fFamily": "SF UI Display"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index bf3ffebb..cfa9f51a 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Преглед на изображението</string>
     <string name="app_short_description">Научете как да създавате прости Java приложения в Android Studio. 📱</string>
     <string name="notification_update_title">Налична е нова актуализация.</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c4b21ace..a4890da4 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Vorschau der Bildansicht</string>
     <string name="app_short_description">Lerne, wie man einfache Java-Apps in Android Studio erstellt. 📱</string>
     <string name="notification_update_title">Ein neues Update ist verfügbar.</string>
diff --git a/app/src/main/res/values-es-rGQ/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
index dca32af1..b64f458e 100644
--- a/app/src/main/res/values-es-rGQ/strings.xml
+++ b/app/src/main/res/values-es-rGQ/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Vista previa de la imagen</string>
     <string name="app_short_description">Aprende a crear aplicaciones Java sencillas en Android Studio. 📱</string>
     <string name="notification_update_title">Nueva actualización disponible.</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index f68f7512..bc281d90 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Vista previa de la imagen</string>
     <string name="app_short_description">Aprende a crear apps sencillas de Java en Android Studio. 📱</string>
     <string name="notification_update_title">Hay una nueva actualización disponible.</string>
diff --git a/app/src/main/res/values-fil-rPH/strings.xml b/app/src/main/res/values-fil-rPH/strings.xml
index 5928526c..f0423f30 100644
--- a/app/src/main/res/values-fil-rPH/strings.xml
+++ b/app/src/main/res/values-fil-rPH/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Paunang tingin sa image view</string>
     <string name="app_short_description">Alamin kung paano gumawa ng mga simpleng Java app sa Android Studio. 📱</string>
     <string name="notification_update_title">May bagong update na available.</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 07246062..4fb321de 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Aperçu de l\'image</string>
     <string name="app_short_description">Apprenez à créer des applications Java simples dans Android Studio. 📱</string>
     <string name="notification_update_title">Nouvelle mise à jour disponible .</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 4c6f57b9..cf8604cd 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Képnézet előnézete</string>
     <string name="app_short_description">Tanuld meg, hogyan készíts egyszerű Java alkalmazásokat az Android Studioban. 📱</string>
     <string name="notification_update_title">Új frissítés érhető el.</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 1cee47b2..b32a2a0a 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Pratinjau tampilan gambar</string>
     <string name="app_short_description">Pelajari cara membuat aplikasi sederhana di Android Studio. 📱</string>
     <string name="notification_update_title">Pembaruan baru tersedia.</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 6f4c7eec..cebd6233 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">이미지 뷰 미리보기</string>
     <string name="app_short_description">Android Studio에서 간단한 Java 앱을 만드는 방법을 배워보세요. 📱</string>
     <string name="notification_update_title">새로운 업데이트가 있습니다.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 26c7311f..f58e7bec 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Prévia da visualização de imagem</string>
     <string name="app_short_description">Aprenda a criar aplicativos Java simples no Android Studio. 📱</string>
     <string name="notification_update_title">Nova atualização disponível.</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 6f8f205a..2384a609 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Previzualizare imagine</string>
     <string name="app_short_description">Învață cum să faci aplicații simple în Android Studio. 📱</string>
     <string name="notification_update_title">O nouă actualizare disponibilă.</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9dd26e44..18367da4 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Предпросмотр изображения</string>
     <string name="app_short_description">Узнайте, как создавать простые приложения в Android Studio. 📱</string>
     <string name="notification_update_title">Доступно новое обновление.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 152ccf01..e618177e 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Förhandsgranskning av bildvy</string>
     <string name="app_short_description">Lär dig hur man skapar enkla Java-appar i Android Studio. 📱</string>
     <string name="notification_update_title">En ny uppdatering finns tillgänglig.</string>
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
index 373b6fcd..d852b45d 100644
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ b/app/src/main/res/values-th-rTH/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">ดูตัวอย่างมุมมองภาพ</string>
     <string name="app_short_description">เรียนรู้วิธีสร้างแอป Java ง่ายๆ ใน Android Studio 📱</string>
     <string name="notification_update_title">มีการอัปเดตใหม่.</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index a1420a11..7dbe60da 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Görüntü görünümü önizlemesi</string>
     <string name="app_short_description">Android Studio\'da basit Java uygulamaları yapmayı öğrenin. 📱</string>
     <string name="notification_update_title">Yeni bir güncelleme mevcut.</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 6641b642..b3e37ada 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Попередній перегляд зображення</string>
     <string name="app_short_description">Дізнайтеся, як створювати прості програми на Java в Android Studio. 📱</string>
     <string name="notification_update_title">Доступне нове оновлення.</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 8fbc73ae..180db692 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">Xem trước khung nhìn hình ảnh</string>
     <string name="app_short_description">Học cách tạo các ứng dụng Java đơn giản trong Android Studio. 📱</string>
     <string name="notification_update_title">Có bản cập nhật mới.</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6d58b209..a682f7b3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="image_view_preview_desc">圖片檢視預覽</string>
     <string name="app_short_description">學習如何在 Android Studio 中製作簡單的 Java 應用程式。 📱</string>
     <string name="notification_update_title">有可用的新更新！</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1fe2eb11..8a6ea224 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,14 +21,14 @@
     <string name="main_card_title">Discover Android Studio tutorials</string>
     <string name="main_card_subtitle">Featuring Kotlin and Java editions</string>
     <string name="main_card_description">The Kotlin Edition has been updated with dynamic lessons, AI assistant, and more. Experience the future of Android development.</string>
-      <string name="get_on_google_play">Get it on Google Play</string>
-      <string name="learn_more">Learn more</string>
+    <string name="get_on_google_play">Get it on Google Play</string>
+    <string name="learn_more">Learn more</string>
     <string name="play_store">Play Store</string>
     <string name="ad">Ad</string>
     <string name="search_tutorials_hint">Search tutorials</string>
-      <string name="search_tutorials_content_description">Search tutorials</string>
-      <string name="search_lessons_hint">Search lessons</string>
-      <string name="search_lessons_content_description">Search lessons</string>
+    <string name="search_tutorials_content_description">Search tutorials</string>
+    <string name="search_lessons_hint">Search lessons</string>
+    <string name="search_lessons_content_description">Search lessons</string>
 
     <string name="android_studio">Android Studio</string>
 
@@ -391,7 +391,7 @@
     <string name="summary_alert_dialog_require_restart">To take effect, please restart the app.</string>
     <string name="summary_sdk">The Android Software Development Kit (SDK) is a collection of tools that allow developers to create Android apps. It includes a set of libraries, a debugger, a handset emulator, and documentation. The SDK also includes an API library and a set of API documentation. The packages you download have libraries, which helps you in creating your app.\n\nThis is an overview of all Android versions and their corresponding identifiers for Android developers. Anyone is welcome to open an issue or pull request. Happy developing.</string>
     <string name="summary_view_binding">View binding is a feature that allows you to more easily write code that interacts with views. Once view binding is enabled in a module, it generates a binding class for each XML layout file present in that module. An instance of a binding class contains direct references to all views that have an ID in the corresponding layout.</string>
-   <string name="summary_enable_binding">View binding is enabled on a module by module basis. To enable view binding in a module, set the viewBinding build option to true in the module-level build.gradle file, as shown in the following example:</string>
+    <string name="summary_enable_binding">View binding is enabled on a module by module basis. To enable view binding in a module, set the viewBinding build option to true in the module-level build.gradle file, as shown in the following example:</string>
     <string name="summary_toggle">You can add a basic toggle button to your layout with the ToggleButton object. Android 4.0 (API level 14) introduces another kind of toggle button called a switch that provides a slider control, which you can add with a Switch object. SwitchCompat is a version of the Switch widget which runs on devices back to API 7.</string>
     <string name="summary_clocks">Important Note: Digital clock is deprecated in version API 17. From API level 17 you can use TextClock instead of digital clock. Below is the description of Text clock in android.</string>
     <string name="summary_buttons">Buttons are an essential element of any Android app. They allow users to interact with the app and perform actions such as submitting a form, starting a new activity, or making a purchase.\n\nIn Android Studio, buttons are created using the Button class and can be customized in a variety of ways, including setting their text, color, and size. They can also be configured to trigger different actions when clicked, such as starting a new activity or displaying a pop-up message.\n\nButtons can be placed anywhere in an app\'s layout and can be used in conjunction with other UI elements such as text fields and lists to create a fully functional and user-friendly app.\n\nOverall, buttons are a simple but powerful tool for building engaging and interactive Android apps.</string>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index b13a36cd..96bdda92 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="ar"/>
-    <locale android:name="bg"/>
-    <locale android:name="bn"/>
-    <locale android:name="de"/>
-    <locale android:name="en"/>
-    <locale android:name="es"/>
-    <locale android:name="es-MX"/>
-    <locale android:name="fil"/>
-    <locale android:name="fr"/>
-    <locale android:name="hi"/>
-    <locale android:name="hu"/>
-    <locale android:name="in"/>
-    <locale android:name="it"/>
-    <locale android:name="ja"/>
-    <locale android:name="ko"/>
-    <locale android:name="pl"/>
-    <locale android:name="pt-BR"/>
-    <locale android:name="ro"/>
-    <locale android:name="ru"/>
-    <locale android:name="sv"/>
-    <locale android:name="th"/>
-    <locale android:name="tr"/>
-    <locale android:name="uk"/>
-    <locale android:name="ur"/>
-    <locale android:name="vi"/>
-    <locale android:name="zh-Hant"/>
+    <locale android:name="ar" />
+    <locale android:name="bg" />
+    <locale android:name="bn" />
+    <locale android:name="de" />
+    <locale android:name="en" />
+    <locale android:name="es" />
+    <locale android:name="es-MX" />
+    <locale android:name="fil" />
+    <locale android:name="fr" />
+    <locale android:name="hi" />
+    <locale android:name="hu" />
+    <locale android:name="in" />
+    <locale android:name="it" />
+    <locale android:name="ja" />
+    <locale android:name="ko" />
+    <locale android:name="pl" />
+    <locale android:name="pt-BR" />
+    <locale android:name="ro" />
+    <locale android:name="ru" />
+    <locale android:name="sv" />
+    <locale android:name="th" />
+    <locale android:name="tr" />
+    <locale android:name="uk" />
+    <locale android:name="ur" />
+    <locale android:name="vi" />
+    <locale android:name="zh-Hant" />
 </locale-config>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_settings.xml b/app/src/main/res/xml/preferences_settings.xml
index af8cb2a8..0a02bec5 100644
--- a/app/src/main/res/xml/preferences_settings.xml
+++ b/app/src/main/res/xml/preferences_settings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.PreferenceCategory
-        app:title="@string/appearance">
+    <androidx.preference.PreferenceCategory app:title="@string/appearance">
         <androidx.preference.ListPreference
             app:defaultValue="@string/default_value_theme"
             app:entries="@array/preference_theme_entries"
@@ -44,15 +43,13 @@
             app:summary="@string/summary_preference_settings_language"
             app:title="@string/language" />
     </androidx.preference.PreferenceCategory>
-    <androidx.preference.PreferenceCategory
-        app:title="@string/notifications">
+    <androidx.preference.PreferenceCategory app:title="@string/notifications">
         <androidx.preference.Preference
             app:icon="@drawable/ic_edit_notifications"
             app:key="@string/key_notifications_settings"
             app:title="@string/notification_settings" />
     </androidx.preference.PreferenceCategory>
-    <androidx.preference.PreferenceCategory
-        app:title="@string/firebase">
+    <androidx.preference.PreferenceCategory app:title="@string/firebase">
         <androidx.preference.SwitchPreferenceCompat
             app:defaultValue="true"
             app:icon="@drawable/ic_firebase"
@@ -72,8 +69,7 @@
             app:summary="@string/summary_preference_settings_firebase_performance"
             app:title="@string/firebase_performance" />
     </androidx.preference.PreferenceCategory>
-    <androidx.preference.PreferenceCategory
-        app:title="@string/privacy_and_security">
+    <androidx.preference.PreferenceCategory app:title="@string/privacy_and_security">
         <androidx.preference.Preference
             app:icon="@drawable/ic_privacy_policy"
             app:title="@string/privacy_policy">
@@ -114,8 +110,7 @@
                 android:action="android.intent.action.VIEW"
                 android:data="https://www.gnu.org/licenses/gpl-3.0" />
         </androidx.preference.Preference>
-        <androidx.preference.PreferenceCategory
-            app:title="@string/consent_settings">
+        <androidx.preference.PreferenceCategory app:title="@string/consent_settings">
             <androidx.preference.SwitchPreferenceCompat
                 app:defaultValue="true"
                 app:icon="@drawable/ic_data_thresholding"
@@ -142,8 +137,7 @@
                 app:title="@string/ad_personalization" />
         </androidx.preference.PreferenceCategory>
     </androidx.preference.PreferenceCategory>
-    <androidx.preference.PreferenceCategory
-        app:title="@string/info">
+    <androidx.preference.PreferenceCategory app:title="@string/info">
         <androidx.preference.Preference
             app:icon="@drawable/ic_perm_device_information"
             app:key="@string/key_device_info"
diff --git a/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepositoryTest.java b/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepositoryTest.java
index ae53a26e..e9c0fde4 100644
--- a/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepositoryTest.java
+++ b/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultHomeRepositoryTest.java
@@ -14,6 +14,24 @@
 
 public class DefaultHomeRepositoryTest {
 
+    @Test
+    public void repositoryDelegatesToDataSources() {
+        List<PromotedApp> promoted = List.of(new PromotedApp("Name", "pkg", "icon"));
+        FakeHomeRemoteDataSource remote = new FakeHomeRemoteDataSource(promoted);
+        FakeHomeLocalDataSource local = new FakeHomeLocalDataSource();
+
+        DefaultHomeRepository repository = new DefaultHomeRepository(remote, local);
+
+        assertEquals("play", repository.getPlayStoreUrl());
+        assertEquals("play/pkg", repository.getAppPlayStoreUrl("pkg"));
+        assertEquals("tip", repository.getDailyTip());
+
+        AtomicReference<List<PromotedApp>> result = new AtomicReference<>();
+        repository.fetchPromotedApps(result::set);
+        assertTrue(remote.called);
+        assertEquals(promoted, result.get());
+    }
+
     private static class FakeHomeLocalDataSource implements HomeLocalDataSource {
         @Override
         public String getPlayStoreUrl() {
@@ -45,22 +63,4 @@ public void fetchPromotedApps(PromotedAppsCallback callback) {
             callback.onResult(apps);
         }
     }
-
-    @Test
-    public void repositoryDelegatesToDataSources() {
-        List<PromotedApp> promoted = List.of(new PromotedApp("Name", "pkg", "icon"));
-        FakeHomeRemoteDataSource remote = new FakeHomeRemoteDataSource(promoted);
-        FakeHomeLocalDataSource local = new FakeHomeLocalDataSource();
-
-        DefaultHomeRepository repository = new DefaultHomeRepository(remote, local);
-
-        assertEquals("play", repository.getPlayStoreUrl());
-        assertEquals("play/pkg", repository.getAppPlayStoreUrl("pkg"));
-        assertEquals("tip", repository.getDailyTip());
-
-        AtomicReference<List<PromotedApp>> result = new AtomicReference<>();
-        repository.fetchPromotedApps(result::set);
-        assertTrue(remote.called);
-        assertEquals(promoted, result.get());
-    }
 }
diff --git a/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultQuizRepositoryTest.java b/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultQuizRepositoryTest.java
index b0538501..f8923820 100644
--- a/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultQuizRepositoryTest.java
+++ b/app/src/test/java/com/d4rk/androidtutorials/java/data/repository/DefaultQuizRepositoryTest.java
@@ -1,5 +1,8 @@
 package com.d4rk.androidtutorials.java.data.repository;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.d4rk.androidtutorials.java.data.model.QuizQuestion;
 import com.d4rk.androidtutorials.java.data.source.QuizLocalDataSource;
 
@@ -9,23 +12,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.*;
-
 public class DefaultQuizRepositoryTest {
 
-    private static class FakeQuizLocalDataSource implements QuizLocalDataSource {
-        private final List<QuizQuestion> questions;
-
-        FakeQuizLocalDataSource(List<QuizQuestion> questions) {
-            this.questions = questions;
-        }
-
-        @Override
-        public void loadQuestions(QuestionsCallback callback) {
-            callback.onResult(questions);
-        }
-    }
-
     @Test
     public void loadQuestionsReturnsLocalData() throws InterruptedException {
         List<QuizQuestion> expected = List.of(
@@ -40,4 +28,17 @@ public void loadQuestionsReturnsLocalData() throws InterruptedException {
         });
         assertTrue(latch.await(1, TimeUnit.SECONDS));
     }
+
+    private static class FakeQuizLocalDataSource implements QuizLocalDataSource {
+        private final List<QuizQuestion> questions;
+
+        FakeQuizLocalDataSource(List<QuizQuestion> questions) {
+            this.questions = questions;
+        }
+
+        @Override
+        public void loadQuestions(QuestionsCallback callback) {
+            callback.onResult(questions);
+        }
+    }
 }
diff --git a/app/src/test/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModelTest.java b/app/src/test/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModelTest.java
index 2da8534c..50f3026b 100644
--- a/app/src/test/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModelTest.java
+++ b/app/src/test/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModelTest.java
@@ -1,43 +1,29 @@
 package com.d4rk.androidtutorials.java.ui.screens.home;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
 
 import com.d4rk.androidtutorials.java.data.model.PromotedApp;
 import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
+import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetDailyTipUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 import com.d4rk.androidtutorials.java.domain.home.GetPlayStoreUrlUseCase;
-import com.d4rk.androidtutorials.java.domain.home.GetAppPlayStoreUrlUseCase;
+import com.d4rk.androidtutorials.java.domain.home.GetPromotedAppsUseCase;
 
 import org.junit.Rule;
 import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 
 public class HomeViewModelTest {
 
     @Rule
     public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule();
 
-
-    static class FakeHomeRepository implements HomeRepository {
-        final String dailyTip;
-        final List<PromotedApp> apps;
-
-        FakeHomeRepository(String dailyTip, List<PromotedApp> apps) {
-            this.dailyTip = dailyTip;
-            this.apps = apps;
-        }
-
-        @Override public String getPlayStoreUrl() { return ""; }
-        @Override public String getAppPlayStoreUrl(String packageName) { return ""; }
-        @Override public String getDailyTip() { return dailyTip; }
-        @Override public void fetchPromotedApps(PromotedAppsCallback callback) { callback.onResult(apps); }
-    }
-
     @Test
     public void uiStateUpdatesWithData() {
         List<PromotedApp> promoted = List.of(new PromotedApp("App", "pkg", "icon"));
@@ -73,4 +59,34 @@ public void uiStateHandlesEmptyPromotedApps() {
         assertNotNull(state);
         assertTrue(state.promotedApps().isEmpty());
     }
+
+    static class FakeHomeRepository implements HomeRepository {
+        final String dailyTip;
+        final List<PromotedApp> apps;
+
+        FakeHomeRepository(String dailyTip, List<PromotedApp> apps) {
+            this.dailyTip = dailyTip;
+            this.apps = apps;
+        }
+
+        @Override
+        public String getPlayStoreUrl() {
+            return "";
+        }
+
+        @Override
+        public String getAppPlayStoreUrl(String packageName) {
+            return "";
+        }
+
+        @Override
+        public String getDailyTip() {
+            return dailyTip;
+        }
+
+        @Override
+        public void fetchPromotedApps(PromotedAppsCallback callback) {
+            callback.onResult(apps);
+        }
+    }
 }