refactor: Updated UI for settings and removed ads

- Updated App Core to use BaseCoreManager.
- Updated UI of settings to be more tablet friendly.
- Updated the settings composables to use a shared list and detail view.
- Added animations for settings detail view.
- Removed unused SuppressLint annotations.

Author: Mihai-Cristian Condrea

CHANGELOG.md

@@ -1,5 +1,7 @@
-# Version 1.1.4:
+# Version 1.2.0:
 
+- **New**: Added navigation rail for tablets and landscape mode for better usability on larger screens.
+- **New**: Settings reorganized for clarity and better user experience on larger screens.
 - **Minor**: Improved app performance and stability.
 - **Minor**: Enhanced data management for a smoother user experience.
 

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         applicationId = "com.d4rk.androidtutorials"
         minSdk = 23
         targetSdk = 35
-        versionCode = 107
-        versionName = "1.1.4"
+        versionCode = 108
+        versionName = "1.2.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         @Suppress("UnstableApiUsage")
         androidResources.localeFilters += listOf(
@@ -106,8 +106,9 @@ android {
 }
 
 dependencies {
+
     // App Core
-    implementation(dependencyNotation = "com.github.D4rK7355608:AppToolkit:0.0.24") {
+    implementation(dependencyNotation = "com.github.D4rK7355608:AppToolkit:0.0.40") {
         isTransitive = true
     }
 
@@ -121,13 +122,10 @@ dependencies {
     implementation(dependencyNotation = libs.firebase.perf)
 
     // Google
-    implementation(dependencyNotation = libs.play.services.ads)
     implementation(dependencyNotation = libs.billing)
     implementation(dependencyNotation = libs.app.update.ktx)
     implementation(dependencyNotation = libs.review.ktx)
     implementation(dependencyNotation = libs.generativeai)
-    // TODO For lib:
-    implementation("androidx.compose.material3:material3-adaptive-navigation-suite")
 
     // KSP
     ksp(dependencyNotation = libs.androidx.room.compiler)

app/src/main/AndroidManifest.xml

@@ -84,30 +84,14 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.screens.settings.display.DisplaySettingsActivity"
-            android:parentActivityName=".ui.screens.settings.SettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity
-            android:name=".ui.screens.settings.display.theme.ThemeSettingsActivity"
-            android:parentActivityName=".ui.screens.settings.display.DisplaySettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity
-            android:name=".ui.screens.settings.advanced.AdvancedSettingsActivity"
-            android:parentActivityName=".ui.screens.settings.SettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
 
-        <activity
-            android:name=".ui.screens.settings.privacy.PrivacySettingsActivity"
+        <activity android:name=".ui.screens.settings.general.GeneralSettingsActivity"
             android:parentActivityName=".ui.screens.settings.SettingsActivity"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".ui.screens.settings.privacy.permissions.PermissionsSettingsActivity"
             android:exported="true"
-            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity"
             android:permission="android.permission.START_VIEW_PERMISSION_USAGE"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
@@ -118,19 +102,8 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.screens.settings.privacy.usage.UsageAndDiagnosticsActivity"
-            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.screens.settings.privacy.ads.AdsSettingsActivity"
-            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity"
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity
-            android:name=".ui.screens.settings.about.AboutSettingsActivity"
-            android:parentActivityName=".ui.screens.settings.SettingsActivity"
             android:windowSoftInputMode="adjustResize" />
 
         <activity

app/src/main/kotlin/com/d4rk/androidtutorials/data/core/AppCoreManager.kt

@@ -4,155 +4,98 @@ package com.d4rk.androidtutorials.data.core
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.Application
 import android.database.sqlite.SQLiteException
 import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.multidex.MultiDexApplication
 import androidx.room.Room
 import androidx.room.migration.Migration
-import com.d4rk.android.libs.apptoolkit.data.client.KtorClient
+import com.d4rk.android.libs.apptoolkit.data.core.BaseCoreManager
+import com.d4rk.android.libs.apptoolkit.data.core.ads.AdsCoreManager
 import com.d4rk.android.libs.apptoolkit.utils.error.ErrorHandler
 import com.d4rk.android.libs.apptoolkit.utils.error.ErrorHandler.handleInitializationFailure
-import com.d4rk.androidtutorials.data.core.ads.AdsCoreManager
-import com.d4rk.androidtutorials.data.core.datastore.DataStoreCoreManager
 import com.d4rk.androidtutorials.data.database.AppDatabase
 import com.d4rk.androidtutorials.data.database.migrations.MIGRATION_1_2
 import com.d4rk.androidtutorials.data.database.migrations.MIGRATION_2_3
 import com.d4rk.androidtutorials.data.datastore.DataStore
+import com.d4rk.androidtutorials.utils.constants.ads.AdsConstants
 import com.d4rk.androidtutorials.utils.error.CrashlyticsErrorReporter
 import io.ktor.client.HttpClient
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 
-class AppCoreManager : MultiDexApplication() , Application.ActivityLifecycleCallbacks , LifecycleObserver {
+class AppCoreManager : BaseCoreManager() {
 
-    private val dataStoreCoreManager : DataStoreCoreManager by lazy {
-        DataStoreCoreManager(context = this)
-    }
+    private var currentActivity : Activity? = null
 
-    private val adsCoreManager : AdsCoreManager by lazy {
-        AdsCoreManager(context = this)
-    }
+    companion object {
+        @SuppressLint("StaticFieldLeak")
+        lateinit var instance : AppCoreManager
+            private set
 
-    private var currentActivity : Activity? = null
+        lateinit var dataStore : DataStore
+            private set
+
+        lateinit var database : AppDatabase
+            private set
+
+        val adsCoreManager : AdsCoreManager by lazy {
+            AdsCoreManager(context = instance)
+        }
+
+        val ktorClient : HttpClient
+            get() = BaseCoreManager.ktorClient
+
+        val isAppLoaded : Boolean
+            get() = BaseCoreManager.isAppLoaded
+    }
 
     override fun onCreate() {
         super.onCreate()
         instance = this
-        registerActivityLifecycleCallbacks(this)
 
         val crashlyticsReporter = CrashlyticsErrorReporter()
         ErrorHandler.init(reporter = crashlyticsReporter)
 
+        registerActivityLifecycleCallbacks(this)
         ProcessLifecycleOwner.get().lifecycle.addObserver(observer = this)
-        CoroutineScope(context = Dispatchers.IO).launch {
-            initializeApp()
-        }
     }
 
-    private suspend fun initializeApp() = supervisorScope  {
-        val ktor : Deferred<Unit> = async { initializeKtorClient() }
-        val dataBase : Deferred<Unit> = async { initializeDatabase() }
-        val dataStore : Deferred<Unit> = async { initializeDataStore() }
-
-        ktor.await()
-        dataBase.await()
-        dataStore.await()
-
-        adsCoreManager.initializeAds()
+    override suspend fun onInitializeApp() = supervisorScope {
+        val dataStoreInitialization : Deferred<Unit> = async { initializeDataStore() }
+        val databaseInitialization : Deferred<Unit> = async { initializeDatabase() }
+        val adsInitialization : Deferred<Unit> = async { initializeAds() }
 
-        initializeAds()
-        finalizeInitialization()
+        dataStoreInitialization.await()
+        databaseInitialization.await()
+        adsInitialization.await()
     }
 
-    private suspend fun initializeKtorClient() {
+    private fun initializeDataStore() {
         runCatching {
-            coroutineScope {
-                val tasks : List<Deferred<Unit>> =
-                        listOf(element = async(context = Dispatchers.IO) {
-                            ktorClient = KtorClient().createClient()
-                        })
-                tasks.awaitAll()
-            }
+            dataStore = DataStore.getInstance(context = this@AppCoreManager)
         }.onFailure {
             handleInitializationFailure(
-                message = "Ktor client initialization failed" ,
-                exception = it as Exception ,
-                applicationContext = applicationContext
+                message = "DataStore initialization failed" , exception = it as Exception , applicationContext = applicationContext
             )
         }
     }
 
     private suspend fun initializeDatabase() {
         runCatching {
             database = Room.databaseBuilder(
-                context = this@AppCoreManager,
-                klass = AppDatabase::class.java,
-                name = "Android Studio Tutorials"
-            )
-                    .addMigrations(migrations = getMigrations())
-                    .fallbackToDestructiveMigration()
-                    .fallbackToDestructiveMigrationOnDowngrade()
-                    .build()
+                context = this@AppCoreManager , klass = AppDatabase::class.java , name = "Android Studio Tutorials"
+            ).addMigrations(migrations = getMigrations()).fallbackToDestructiveMigration().fallbackToDestructiveMigrationOnDowngrade().build()
 
             database.openHelper.writableDatabase
         }.onFailure {
             handleDatabaseError(exception = it as Exception)
         }
     }
 
-    private fun getMigrations() : Array<Migration> {
-        return arrayOf(
-            MIGRATION_1_2 ,
-            MIGRATION_2_3 ,
-        )
-    }
-
-    private suspend fun initializeDataStore() {
-        runCatching {
-            dataStore = DataStore.getInstance(context = this@AppCoreManager)
-            dataStoreCoreManager.initializeDataStore()
-        }.onFailure {
-            handleInitializationFailure(
-                message = "DataStore initialization failed" ,
-                exception = it as Exception ,
-                applicationContext = applicationContext
-            )
-        }
-    }
-
-    private fun initializeAds() {
-        runCatching {
-            adsCoreManager.initializeAds()
-        }.onFailure {
-            handleInitializationFailure(
-                message = "Ads initialization failed" ,
-                exception = it as Exception ,
-                applicationContext = applicationContext
-            )
-        }
-    }
-
-    private fun finalizeInitialization() {
-        markAppAsLoaded()
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    fun onMoveToForeground() {
-        currentActivity?.let { adsCoreManager.showAdIfAvailable(activity = it) }
-    }
-
     private suspend fun handleDatabaseError(exception : Exception) {
         if (exception is SQLiteException || (exception is IllegalStateException && exception.message?.contains(other = "Migration failed") == true)) {
             eraseDatabase()
@@ -173,44 +116,34 @@ class AppCoreManager : MultiDexApplication() , Application.ActivityLifecycleCall
         Log.e("AppCoreManager" , "Database error: ${exception.message}" , exception)
     }
 
-    private fun markAppAsLoaded() {
-        isAppLoaded = true
+    private fun initializeAds() {
+        adsCoreManager.initializeAds(AdsConstants.APP_OPEN_UNIT_ID)
+    }
+
+    private fun getMigrations() : Array<Migration> {
+        return arrayOf(
+            MIGRATION_1_2 , MIGRATION_2_3
+        )
     }
 
     fun isAppLoaded() : Boolean {
         return isAppLoaded
     }
 
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    fun onMoveToForeground() {
+        currentActivity?.let { adsCoreManager.showAdIfAvailable(it) }
+    }
+
     override fun onActivityCreated(activity : Activity , savedInstanceState : Bundle?) {}
 
     override fun onActivityStarted(activity : Activity) {
-        if (! adsCoreManager.isShowingAd) {
-            currentActivity = activity
-        }
+        currentActivity = activity
     }
 
     override fun onActivityResumed(activity : Activity) {}
     override fun onActivityPaused(activity : Activity) {}
     override fun onActivityStopped(activity : Activity) {}
     override fun onActivitySaveInstanceState(activity : Activity , outState : Bundle) {}
     override fun onActivityDestroyed(activity : Activity) {}
-
-    companion object {
-
-        lateinit var dataStore : DataStore
-            private set
-
-        lateinit var database : AppDatabase
-            private set
-
-        @SuppressLint("StaticFieldLeak")
-        lateinit var instance : AppCoreManager
-            private set
-
-        lateinit var ktorClient : HttpClient
-            private set
-
-        var isAppLoaded : Boolean = false
-            private set
-    }
 }