diff --git a/app/build.gradle b/app/build.gradle
index c2df5047..6d4559a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-kapt'
 
 repositories {
@@ -10,24 +9,27 @@ repositories {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion = rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        applicationId "org.bookdash.android"
+        applicationId = "org.bookdash.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName "$rootProject.ext.versionName"
+        versionCode = rootProject.ext.versionCode
+        versionName = "$rootProject.ext.versionName"
         testInstrumentationRunner "org.bookdash.android.presentation.CustomTestRunner"
         resConfigs "en"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-
     }
     dataBinding {
         enabled = true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 
     File signFile = rootProject.file('release-keystore.properties')
     if (signFile.exists()) {
@@ -44,7 +46,6 @@ android {
             }
         }
         buildTypes.release.signingConfig signingConfigs.release
-
     }
 
     packagingOptions {
@@ -60,27 +61,42 @@ android {
         exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
         exclude 'LICENSE.txt'
     }
-    flavorDimensions "env"
-    productFlavors {
-        mock {
-            dimension "env"
-            applicationIdSuffix ".qa"
-        }
-        qa {
-            dimension "env"
-            applicationIdSuffix ".qa"
-        }
-        prod {
-            dimension "env"
-        }
-    }
+
+    flavorDimensions.add("env")
+
+//    productFlavors {
+//        mock {
+//            dimension "env"
+//            versionNameSuffix ".qa"
+//            applicationIdSuffix ".qa"
+//        }
+//        prod {
+//            dimension "env"
+//        }
+//    }
+
+//    productFlavors {
+//        mock {
+//            dimension "env"
+//            applicationIdSuffix = ".qa"
+//        }
+//        qa {
+//            dimension "env"
+//            applicationIdSuffix = ".qa"
+//        }
+//        prod {
+//            dimension "env"
+//        }
+//    }
     // Remove mockRelease as it's not needed.
-    android.variantFilter { variant ->
-        if (variant.buildType.name.equals('release')
-                && variant.getFlavors().get(0).name.equals('mock')) {
-            variant.setIgnore(true)
-        }
-    }
+//    androidComponents {
+//        onVariants { variant ->
+//            // Remove 'mock' flavor variants in 'release' build type
+//            if (variant.buildType.name == 'release' && variant.productFlavors.any { it.name == 'mock' }) {
+//                variant.ignore = true
+//            }
+//        }
+//    }
     // Always show the result of every unit test, even if it passes.
     testOptions.unitTests.all {
         testLogging {
@@ -108,6 +124,7 @@ android {
         jsonFile = rootProject.file('google-play-keys.json')
         track = "${track}"
     }
+    namespace 'org.bookdash.android'
 }
 dependencies {
 
@@ -118,42 +135,42 @@ dependencies {
     testImplementation("org.powermock:powermock-api-mockito:$rootProject.ext.powerMockito")
 
     // Android Testing Library's runner and rules
-    androidTestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 
     // Espresso UI Testing
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0') {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1') {
         exclude group: "javax.inject"
     }
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
-    androidTestImplementation 'androidx.appcompat:appcompat:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
+    androidTestImplementation 'androidx.appcompat:appcompat:1.7.0'
     androidTestImplementation "com.google.android.material:material:$rootProject.ext.materialVersion"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
     kapt "com.github.bumptech.glide:compiler:$rootProject.ext.glideVersion"
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.3.0'
 
     // Import the Firebase Bill of Materials (BoM)
-    implementation platform('com.google.firebase:firebase-bom:26.0.0')
+    implementation platform('com.google.firebase:firebase-bom:33.1.2')
 
     // Firebase Dependencies
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-auth'
     implementation 'com.google.firebase:firebase-config'
-    implementation 'com.google.firebase:firebase-crashlytics'   
+    implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-database'
     implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.google.firebase:firebase-perf'
@@ -164,14 +181,16 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.3.0'
     implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.multidex:multidex:2.0.1'
+    implementation "androidx.drawerlayout:drawerlayout:1.2.0"
+    implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
 
     implementation project(path: ':materialhelptutorial')
-    implementation project(':fabbutton')
+    implementation project(path: ':fabbutton')
 }
 
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3b068bc..3355cca3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.bookdash.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/app/src/main/java/org/bookdash/android/BookDashApplication.java b/app/src/main/java/org/bookdash/android/BookDashApplication.java
index aa41d909..3fc874f3 100644
--- a/app/src/main/java/org/bookdash/android/BookDashApplication.java
+++ b/app/src/main/java/org/bookdash/android/BookDashApplication.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import androidx.multidex.BuildConfig;
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
@@ -11,6 +12,7 @@
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
 import org.bookdash.android.config.CrashlyticsTree;
+import org.bookdash.android.di.Injection;
 
 import rx.Subscriber;
 import timber.log.Timber;
@@ -82,5 +84,4 @@ synchronized public FirebaseAnalytics getDefaultTracker() {
         }
         return firebaseAnalytics;
     }
-
 }
diff --git a/app/src/main/java/org/bookdash/android/di/Injection.java b/app/src/main/java/org/bookdash/android/di/Injection.java
new file mode 100644
index 00000000..4facd363
--- /dev/null
+++ b/app/src/main/java/org/bookdash/android/di/Injection.java
@@ -0,0 +1,90 @@
+package org.bookdash.android.di;
+
+import android.content.Context;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.analytics.FirebaseAnalytics;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.messaging.FirebaseMessaging;
+import com.google.firebase.storage.FirebaseStorage;
+
+import org.bookdash.android.config.FirebaseConfig;
+import org.bookdash.android.config.RemoteConfigSettingsApi;
+import org.bookdash.android.data.book.BookService;
+import org.bookdash.android.data.book.BookServiceImpl;
+import org.bookdash.android.data.book.DownloadService;
+import org.bookdash.android.data.book.DownloadServiceImpl;
+import org.bookdash.android.data.database.firebase.FirebaseBookDatabase;
+import org.bookdash.android.data.settings.SettingsApiImpl;
+import org.bookdash.android.data.settings.SettingsRepositories;
+import org.bookdash.android.data.settings.SettingsRepository;
+import org.bookdash.android.data.tracking.Analytics;
+import org.bookdash.android.data.tracking.BookDashFirebaseAnalytics;
+import org.bookdash.android.data.tutorial.TutorialsRepositories;
+import org.bookdash.android.data.tutorial.TutorialsRepository;
+import org.bookdash.android.data.utils.firebase.FirebaseObservableListeners;
+
+/**
+ * @author rebeccafranks
+ * @since 15/11/03.
+ */
+public class Injection {
+    public static final String STORAGE_PREFIX = "gs://book-dash.appspot.com/";
+
+    private static BookService bookService = null;
+    private static RemoteConfigSettingsApi config;
+    private static DownloadService downloadService = null;
+    private static Analytics firebaseAnalytics = null;
+
+    private Injection() {
+
+    }
+
+    public static void init(Context context) {
+        if (!isInitialized()) {
+            FirebaseApp firebaseApp = FirebaseApp
+                    .initializeApp(context, FirebaseOptions.fromResource(context), "Book Dash");
+            FirebaseDatabase firebaseDatabase = FirebaseDatabase.getInstance(firebaseApp);
+            firebaseDatabase.setPersistenceEnabled(true);
+            FirebaseObservableListeners firebaseObservableListeners = new FirebaseObservableListeners();
+            FirebaseBookDatabase bookDatabase = new FirebaseBookDatabase(firebaseDatabase, firebaseObservableListeners);
+            bookService = new BookServiceImpl(bookDatabase);
+
+            config = FirebaseConfig.newInstance().init();
+
+            downloadService = new DownloadServiceImpl(FirebaseStorage.getInstance(firebaseApp));
+            firebaseAnalytics = new BookDashFirebaseAnalytics(FirebaseAnalytics.getInstance(context));
+
+        }
+    }
+
+    private static boolean isInitialized() {
+        return bookService != null && config != null;
+    }
+
+    public static TutorialsRepository provideTutorialRepo(Context context) {
+        return TutorialsRepositories.getInstance(context);
+    }
+
+    public static SettingsRepository provideSettingsRepo(Context context) {
+        return SettingsRepositories
+                .getInstance(new SettingsApiImpl(context, provideRemoteConfig()), FirebaseMessaging.getInstance());
+    }
+
+    private static RemoteConfigSettingsApi provideRemoteConfig() {
+        return config;
+    }
+
+    public static BookService provideBookService() {
+        return bookService;
+    }
+
+    public static DownloadService provideDownloadService() {
+        return downloadService;
+    }
+
+    public static Analytics provideAnalytics() {
+        return firebaseAnalytics;
+    }
+}
diff --git a/app/src/main/java/org/bookdash/android/domain/model/firebase/FireBookDetails.java b/app/src/main/java/org/bookdash/android/domain/model/firebase/FireBookDetails.java
index 990a1dcf..c11c4e26 100644
--- a/app/src/main/java/org/bookdash/android/domain/model/firebase/FireBookDetails.java
+++ b/app/src/main/java/org/bookdash/android/domain/model/firebase/FireBookDetails.java
@@ -8,7 +8,7 @@
 import com.google.firebase.storage.StorageReference;
 
 import org.bookdash.android.BookDashApplication;
-import org.bookdash.android.Injection;
+import org.bookdash.android.di.Injection;
 import org.threeten.bp.Instant;
 import org.threeten.bp.ZoneId;
 import org.threeten.bp.ZonedDateTime;
diff --git a/app/src/main/java/org/bookdash/android/domain/model/firebase/FireContributor.java b/app/src/main/java/org/bookdash/android/domain/model/firebase/FireContributor.java
index b74019cf..cbcff165 100644
--- a/app/src/main/java/org/bookdash/android/domain/model/firebase/FireContributor.java
+++ b/app/src/main/java/org/bookdash/android/domain/model/firebase/FireContributor.java
@@ -6,8 +6,7 @@
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
 
-import org.bookdash.android.Injection;
-import org.bookdash.android.config.FirebaseConfig;
+import org.bookdash.android.di.Injection;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoActivity.java b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoActivity.java
index af29a5b5..f2154c5e 100644
--- a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoActivity.java
+++ b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoActivity.java
@@ -49,10 +49,10 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.google.firebase.storage.StorageReference;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
 import org.bookdash.android.config.GlideApp;
 import org.bookdash.android.databinding.ActivityBookInformationBinding;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.domain.model.firebase.FireBookDetails;
 import org.bookdash.android.domain.model.firebase.FireContributor;
 import org.bookdash.android.domain.model.gson.BookPages;
diff --git a/app/src/main/java/org/bookdash/android/presentation/downloads/DownloadsFragment.java b/app/src/main/java/org/bookdash/android/presentation/downloads/DownloadsFragment.java
index 297d9485..1efe8485 100644
--- a/app/src/main/java/org/bookdash/android/presentation/downloads/DownloadsFragment.java
+++ b/app/src/main/java/org/bookdash/android/presentation/downloads/DownloadsFragment.java
@@ -25,8 +25,8 @@
 
 import com.google.android.material.snackbar.Snackbar;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.domain.model.firebase.FireBookDetails;
 import org.bookdash.android.presentation.bookinfo.BookInfoActivity;
 import org.bookdash.android.presentation.main.NavDrawerInterface;
diff --git a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksFragment.java b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksFragment.java
index 35d8f603..7b42d22c 100644
--- a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksFragment.java
+++ b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksFragment.java
@@ -27,8 +27,8 @@
 
 import com.google.android.material.snackbar.Snackbar;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.domain.model.firebase.FireBookDetails;
 import org.bookdash.android.presentation.bookinfo.BookInfoActivity;
 import org.bookdash.android.presentation.main.NavDrawerInterface;
diff --git a/app/src/main/java/org/bookdash/android/presentation/main/MainActivity.java b/app/src/main/java/org/bookdash/android/presentation/main/MainActivity.java
index 300b98bf..2e10d938 100644
--- a/app/src/main/java/org/bookdash/android/presentation/main/MainActivity.java
+++ b/app/src/main/java/org/bookdash/android/presentation/main/MainActivity.java
@@ -23,8 +23,8 @@
 import com.google.android.material.snackbar.Snackbar;
 
 import org.bookdash.android.BuildConfig;
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.presentation.about.AboutFragment;
 import org.bookdash.android.presentation.activity.BaseAppCompatActivity;
 import org.bookdash.android.presentation.downloads.DownloadsFragment;
diff --git a/app/src/main/java/org/bookdash/android/presentation/search/SearchActivity.java b/app/src/main/java/org/bookdash/android/presentation/search/SearchActivity.java
index 2e78e38a..ba51f401 100644
--- a/app/src/main/java/org/bookdash/android/presentation/search/SearchActivity.java
+++ b/app/src/main/java/org/bookdash/android/presentation/search/SearchActivity.java
@@ -19,8 +19,8 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.domain.model.firebase.FireBookDetails;
 import org.bookdash.android.presentation.activity.BaseAppCompatActivity;
 import org.bookdash.android.presentation.bookinfo.BookInfoActivity;
diff --git a/app/src/main/java/org/bookdash/android/presentation/settings/SettingsFragment.java b/app/src/main/java/org/bookdash/android/presentation/settings/SettingsFragment.java
index 5bfe0402..cdfb8a7d 100644
--- a/app/src/main/java/org/bookdash/android/presentation/settings/SettingsFragment.java
+++ b/app/src/main/java/org/bookdash/android/presentation/settings/SettingsFragment.java
@@ -13,9 +13,9 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
 import org.bookdash.android.data.settings.SettingsApiImpl;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.presentation.main.NavDrawerInterface;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/bookdash/android/presentation/splash/SplashActivity.java b/app/src/main/java/org/bookdash/android/presentation/splash/SplashActivity.java
index c3fb50cb..5a91068d 100644
--- a/app/src/main/java/org/bookdash/android/presentation/splash/SplashActivity.java
+++ b/app/src/main/java/org/bookdash/android/presentation/splash/SplashActivity.java
@@ -5,8 +5,8 @@
 import android.os.Handler;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.bookdash.android.Injection;
 import org.bookdash.android.R;
+import org.bookdash.android.di.Injection;
 import org.bookdash.android.presentation.main.MainActivity;
 
 import za.co.riggaroo.materialhelptutorial.tutorial.MaterialTutorialActivity;
diff --git a/app/src/mock/AndroidManifest.xml b/app/src/mock/AndroidManifest.xml
index 4bf60910..5709f5f6 100644
--- a/app/src/mock/AndroidManifest.xml
+++ b/app/src/mock/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Put this file in the "debug" folder so it only gets merged into debug builds -->
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.bookdash.android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
diff --git a/app/src/qa/java/org/bookdash/android/Injection.java b/app/src/qa/java/org/bookdash/android/Injection.java
index 91310df6..bf30884a 100644
--- a/app/src/qa/java/org/bookdash/android/Injection.java
+++ b/app/src/qa/java/org/bookdash/android/Injection.java
@@ -54,7 +54,6 @@ public static void init(Context context) {
             config = FirebaseConfig.newInstance().init();
             downloadService = new DownloadServiceImpl(FirebaseStorage.getInstance(firebaseApp));
             firebaseAnalytics = new BookDashFirebaseAnalytics(FirebaseAnalytics.getInstance(context));
-
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 878fb5a8..24eb145d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.9.20'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath('com.android.tools.build:gradle:8.4.2')
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
-        classpath 'com.google.firebase:perf-plugin:1.3.3'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
+        classpath 'com.google.firebase:perf-plugin:1.4.2'
     }
 }
 
@@ -26,12 +26,12 @@ allprojects {
 ext {
     versionCode = 37
     versionName = "2.9.2"
-    minSdkVersion = 16
-    compileSdkVersion = 33
-    junitVersion = '4.13.1'
+    minSdkVersion = 23
+    compileSdkVersion = 34
+    junitVersion = '4.13.2'
     mockitoVersion = '1.10.19'
     powerMockito = '1.7.4'
     hamcrestVersion = '1.3'
     glideVersion = '4.11.0'
-    materialVersion = '1.2.1'
+    materialVersion = '1.13.0-alpha04'
 }
\ No newline at end of file
diff --git a/fabbutton/build.gradle b/fabbutton/build.gradle
index 316c217d..e10b65c5 100644
--- a/fabbutton/build.gradle
+++ b/fabbutton/build.gradle
@@ -31,8 +31,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode 10
-        versionName version
     }
     buildTypes {
         release {
@@ -40,8 +38,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'mbanje.kurt.fabbutton'
 }
 
 dependencies {
+    implementation "com.google.android.material:material:1.13.0-alpha04"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.interpolator:interpolator:1.0.0"
     implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
 }
diff --git a/fabbutton/src/main/AndroidManifest.xml b/fabbutton/src/main/AndroidManifest.xml
index bcacb0ec..baaf666a 100644
--- a/fabbutton/src/main/AndroidManifest.xml
+++ b/fabbutton/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
   ~ THE SOFTWARE.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="mbanje.kurt.fabbutton">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <application />
 </manifest>
diff --git a/gradle.properties b/gradle.properties
index 6de4ed85..6231c1c0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,13 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Mon Dec 28 18:11:46 SAST 2015
-org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX\:MaxMetaspaceSize\=2048m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a..7454180f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d45217c1..17655d0e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Oct 30 13:42:53 CAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e269..1b6c7873 100755
--- a/gradlew
+++ b/gradlew
@@ -1,79 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec99730..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle
index 4dd25d75..fd24bb12 100644
--- a/materialhelptutorial/build.gradle
+++ b/materialhelptutorial/build.gradle
@@ -29,8 +29,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode 11
-        versionName version
     }
     buildTypes {
         release {
@@ -38,9 +36,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'za.co.riggaroo.materialhelptutorial'
 }
 
 dependencies {
-    implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "com.google.android.material:material:1.13.0-alpha04"
     implementation "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
 }
diff --git a/materialhelptutorial/src/main/AndroidManifest.xml b/materialhelptutorial/src/main/AndroidManifest.xml
index d6d5400d..d48cd6d7 100644
--- a/materialhelptutorial/src/main/AndroidManifest.xml
+++ b/materialhelptutorial/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="za.co.riggaroo.materialhelptutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application />
 </manifest>
diff --git a/settings.gradle b/settings.gradle
index 5c264ec5..98db88be 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':fabbutton', ':materialhelptutorial'
+include ':app' , ':fabbutton', ':materialhelptutorial'