From 7abab1ba261e1fa1381d93417dc0957133b69559 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Fri, 30 Oct 2020 09:42:29 +0200
Subject: [PATCH 01/18] CHANGE Remove language action icon from toolbar and add
 a language change bar to the App Bar.

---
 .../listbooks/ListBooksContract.java          |  2 +
 .../listbooks/ListBooksFragment.java          | 24 +++++++--
 .../listbooks/ListBooksPresenter.java         |  9 ++--
 .../res/drawable-v21/language_selector.xml    | 12 +++++
 .../main/res/drawable/ic_arrow_down_24.xml    |  9 ++++
 .../res/drawable/ic_public_black_24dp.xml     |  9 ----
 .../main/res/drawable/language_selector.xml   |  6 +++
 .../main/res/layout/fragment_list_books.xml   | 51 ++++++++++++-------
 app/src/main/res/layout/list_item_book.xml    |  2 +-
 app/src/main/res/menu/menu_main.xml           | 16 ++----
 app/src/main/res/values/strings.xml           |  1 +
 11 files changed, 95 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/res/drawable-v21/language_selector.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_down_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_public_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/language_selector.xml

diff --git a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksContract.java b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksContract.java
index e1738f9f..063eb093 100644
--- a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksContract.java
+++ b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksContract.java
@@ -24,6 +24,8 @@ interface View extends MvpView {
         void showLanguagePopover(String[] languages, int selected);
 
         void startSearchActivity();
+
+        void onSelectedLanguageChanged(String selectedLanguage);
     }
 
     interface Presenter extends MvpPresenter<View>{
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 4d4ed375..35d8f603 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
@@ -51,6 +51,8 @@ public class ListBooksFragment extends Fragment implements ListBooksContract.Vie
     private CircularProgressBar circularProgressBar;
     private LinearLayout linearLayoutErrorScreen;
     private TextView textViewErrorMessage;
+    private LinearLayout linearLayoutContainerLanguage;
+    private TextView textViewCurrentLanguage;
     private NavDrawerInterface navDrawerInterface;
     private BookAdapter bookAdapter;
     private View.OnClickListener bookClickListener = new View.OnClickListener() {
@@ -117,6 +119,8 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         linearLayoutErrorScreen = view.findViewById(R.id.linear_layout_error);
         buttonRetry = view.findViewById(R.id.button_retry);
         textViewErrorMessage = view.findViewById(R.id.text_view_error_screen);
+        linearLayoutContainerLanguage = view.findViewById(R.id.container_language);
+        textViewCurrentLanguage = view.findViewById(R.id.text_current_language);
         recyclerViewBooks = view.findViewById(R.id.recycler_view_books);
         recyclerViewBooks.setLayoutManager(
                 new GridLayoutManager(getActivity(), getContext().getResources().getInteger(R.integer.book_span)));
@@ -127,6 +131,12 @@ public void onClick(View v) {
                 listBooksPresenter.loadBooksForLanguagePreference();
             }
         });
+        linearLayoutContainerLanguage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                listBooksPresenter.clickOpenLanguagePopover();
+            }
+        });
         Toolbar toolbar = view.findViewById(R.id.toolbar);
         if (navDrawerInterface != null) {
             navDrawerInterface.setToolbar(toolbar);
@@ -164,10 +174,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.action_language_choice) {
-            listBooksPresenter.clickOpenLanguagePopover();
-            return true;
-        }
         if (item.getItemId() == R.id.action_search_books) {
             listBooksPresenter.openSearchScreen();
             return true;
@@ -275,5 +281,13 @@ public void startSearchActivity() {
         SearchActivity.start(getActivity());
     }
 
-
+    @Override
+    public void onSelectedLanguageChanged(final String selectedLanguage) {
+        runUiThread(new Runnable() {
+            @Override
+            public void run() {
+                textViewCurrentLanguage.setText(selectedLanguage);
+            }
+        });
+    }
 }
diff --git a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
index 028ab358..ac52bf95 100644
--- a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
+++ b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
@@ -78,11 +78,12 @@ public void onError(final Throwable e) {
 
                     @Override
                     public void onNext(final Boolean aBoolean) {
-                        analytics.trackLanguageChange(languages.get(indexOfLanguage).getLanguageName());
-                        loadBooksForLanguage(languages.get(indexOfLanguage));
+                        FireLanguage selectedLanguage = languages.get(indexOfLanguage);
+                        analytics.trackLanguageChange(selectedLanguage.getLanguageName());
+                        getView().onSelectedLanguageChanged(selectedLanguage.getLanguageName());
+                        loadBooksForLanguage(selectedLanguage);
                     }
                 }));
-
     }
 
     @Override
@@ -104,6 +105,7 @@ public void onError(final Throwable e) {
                     @Override
                     public void onNext(final FireLanguage fireLanguage) {
                         analytics.setUserLanguage(fireLanguage.getLanguageName());
+                        getView().onSelectedLanguageChanged(fireLanguage.getLanguageName());
                         loadBooksForLanguage(fireLanguage);
                     }
                 }));
@@ -113,6 +115,7 @@ public void onNext(final FireLanguage fireLanguage) {
     @Override
     public void clickOpenLanguagePopover() {
         if (languages == null) {
+            getView().showSnackBarError(R.string.error_loading_languages_try_again);
             return;
         }
         addSubscription(settingsRepository.getLanguagePreference().observeOn(ioScheduler).subscribeOn(mainScheduler)
diff --git a/app/src/main/res/drawable-v21/language_selector.xml b/app/src/main/res/drawable-v21/language_selector.xml
new file mode 100644
index 00000000..e798f1e6
--- /dev/null
+++ b/app/src/main/res/drawable-v21/language_selector.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/colorAccent">
+    <item>
+        <color android:color="@color/white" />
+    </item>
+    <!-- The Mask can be a shape drawable if you want -->
+    <!-- Also removing the mask makes the ripple "borderless" -->
+    <!-- here we're using just any color to have a rectangular limit for the ripple -->
+    <item android:id="@android:id/mask"
+        android:drawable="@color/colorAccent" />
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down_24.xml b/app/src/main/res/drawable/ic_arrow_down_24.xml
new file mode 100644
index 00000000..fba0a470
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_down_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#1976D2"
+      android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_public_black_24dp.xml b/app/src/main/res/drawable/ic_public_black_24dp.xml
deleted file mode 100644
index 60e024f5..00000000
--- a/app/src/main/res/drawable/ic_public_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#ffffffff"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm-1,17.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zm6.9,-2.54c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1H8v-2h2c0.55,0 1,-0.45 1,-1V7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
-</vector>
diff --git a/app/src/main/res/drawable/language_selector.xml b/app/src/main/res/drawable/language_selector.xml
new file mode 100644
index 00000000..c127c330
--- /dev/null
+++ b/app/src/main/res/drawable/language_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/colorAccentPressed" android:state_focused="true"/>
+    <item android:drawable="@color/colorAccentFocused" android:state_pressed="true"/>
+    <item android:drawable="@android:color/white"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_list_books.xml b/app/src/main/res/layout/fragment_list_books.xml
index 3b029089..c6e21037 100644
--- a/app/src/main/res/layout/fragment_list_books.xml
+++ b/app/src/main/res/layout/fragment_list_books.xml
@@ -1,5 +1,4 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@@ -11,11 +10,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/appbackground"/>
+        android:src="@drawable/appbackground" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <androidx.appcompat.widget.Toolbar
@@ -25,9 +25,30 @@
             android:background="?attr/colorPrimary"
             android:title="@string/book_dash"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
+        <LinearLayout
+            android:id="@+id/container_language"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/language_selector"
+            android:gravity="center"
+            android:padding="4dp"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/text_current_language"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="4dp"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif"
+                android:maxLines="1"
+                android:text="@string/language_selection_heading"
+                android:textColor="@color/text_color_primary_dark"
+                android:textSize="16sp"
+                app:drawableRightCompat="@drawable/ic_arrow_down_24" />
+        </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
@@ -35,16 +56,14 @@
         android:layout_height="match_parent">
 
         <fr.castorflex.android.circularprogressbar.CircularProgressBar
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/activity_loading_books"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentBottom="false"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginBottom="8dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
             android:foregroundGravity="center|center_vertical|center_horizontal"
             android:indeterminate="true"
             app:cpb_color="@color/colorAccent"
@@ -52,7 +71,7 @@
             app:cpb_min_sweep_angle="10"
             app:cpb_rotation_speed="1.0"
             app:cpb_stroke_width="4dp"
-            app:cpb_sweep_speed="1.0"/>
+            app:cpb_sweep_speed="1.0" />
     </RelativeLayout>
 
 
@@ -69,7 +88,7 @@
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/lb_ic_sad_cloud"/>
+            android:src="@drawable/lb_ic_sad_cloud" />
 
         <TextView
             android:id="@+id/text_view_error_screen"
@@ -77,14 +96,14 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="8dp"
-            android:text="@string/error_loading_books"/>
+            android:text="@string/error_loading_books" />
 
         <Button
             android:id="@+id/button_retry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="@string/button_retry_text"/>
+            android:text="@string/button_retry_text" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -95,13 +114,11 @@
         android:fitsSystemWindows="true"
         android:gravity="center_horizontal"
         android:paddingLeft="@dimen/book_list_padding"
-        android:paddingRight="@dimen/book_list_padding"
         android:paddingTop="@dimen/book_list_padding"
+        android:paddingRight="@dimen/book_list_padding"
         android:scrollbars="vertical"
-
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:listitem="@layout/list_item_book"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        tools:listitem="@layout/list_item_book" />
 
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_book.xml b/app/src/main/res/layout/list_item_book.xml
index 1f441b1f..5bede166 100644
--- a/app/src/main/res/layout/list_item_book.xml
+++ b/app/src/main/res/layout/list_item_book.xml
@@ -39,7 +39,7 @@
                     android:maxLines="2"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
-                    android:textColor="#212121"
+                    android:textColor="@color/text_color_primary_dark"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 9fdd3ee0..f9313aa3 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,20 +1,14 @@
 <menu 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"
-      tools:context=".MainActivity">
-    <item
-        android:id="@+id/action_language_choice"
-        android:contentDescription="@string/action_language_choice"
-        android:icon="@drawable/ic_public_black_24dp"
-        android:orderInCategory="2"
-        android:title="@string/action_language_choice"
-        app:showAsAction="ifRoom"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity">
+
     <item
         android:id="@+id/action_search_books"
         android:contentDescription="@string/action_search"
         android:icon="@drawable/ic_search"
         android:orderInCategory="1"
         android:title="@string/action_search"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 092c2719..8d752cd9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="language_selection_heading">Select a language</string>
     <string name="failed_to_download_book">Failed to download book.[%s]</string>
     <string name="error_loading_languages">Error loading available languages</string>
+    <string name="error_loading_languages_try_again">Failed to load available languages. Please try again later.</string>
     <string name="book_not_available">Book not available</string>
     <string name="title_activity_about">About Book Dash</string>
     <string name="action_about">About</string>

From f9e435200f4c356e7b1b3623a0c44fab438bad8c Mon Sep 17 00:00:00 2001
From: Richard <richardbarnard101@gmail.com>
Date: Fri, 30 Oct 2020 11:14:57 +0200
Subject: [PATCH 02/18] MIGRATE Migrate from Fabric Crashlytics to Firebase
 Crashlytics.

---
 README.md                                     |  8 +++---
 app/.gitignore                                |  1 -
 app/build.gradle                              | 26 +++----------------
 app/fabric-sample.properties                  |  2 --
 app/proguard-rules.pro                        |  2 --
 app/src/main/AndroidManifest.xml              |  3 ---
 .../bookdash/android/BookDashApplication.java | 13 ++++------
 .../android/config/CrashlyticsTree.java       |  8 +++---
 .../listbooks/ListBooksPresenter.java         |  8 +++---
 build.gradle                                  |  1 +
 10 files changed, 20 insertions(+), 52 deletions(-)
 delete mode 100644 app/fabric-sample.properties

diff --git a/README.md b/README.md
index 04c5b00a..748beba9 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,8 @@ http://bookdash.org/
 
 1. MaterialHelpTutorial - https://github.com/spongebobrf/MaterialIntroTutorial
 2. FabButton - https://github.com/ckurtm/FabButton
-3. Firebase - https://firebase.google.com/ 
-4. Fabric - https://fabric.io/dashboard
-5. Glide Image Loading - https://github.com/bumptech/glide
+3. Firebase - https://firebase.google.com/
+4. Glide Image Loading - https://github.com/bumptech/glide
 
 # Setup
 
@@ -53,8 +52,7 @@ google-services.json file. This must then be placed into the app folder of this
 
 # [OPTIONAL setup] 
 1. If you wish to build a release version you will need to create your own keystore file and edit the password values in the following file - (create a version of the file without the .sample extension): release-keystore.properties.sample
-2. Setup a Fabric Account. https://fabric.io/dashboard
-3. Get your Fabric API Key and Client key, change it in the file: /app/fabric-sample.properties and rename the file to fabric.properties
+2. If you want to add Firebase Crashlytics to your app: Setup a Firebase Account. https://firebase.google.com/docs/crashlytics
 
 # Contributions
 Contributions are welcome. Please read the [contributions guide](CONTRIBUTING.md) for more information. 
diff --git a/app/.gitignore b/app/.gitignore
index e7afaf48..2abde4aa 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,3 +1,2 @@
 /build
 /google-services.json
-/fabric.properties
diff --git a/app/build.gradle b/app/build.gradle
index 74b172b4..2ca8fc5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,26 +1,14 @@
-buildscript {
-    repositories {
-        maven { url 'https://maven.fabric.io/public' }
-    }
-
-    dependencies {
-        classpath 'io.fabric.tools:gradle:1.31.2'
-    }
-}
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.google.firebase.firebase-perf'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-kapt'
 
 repositories {
-    maven { url 'https://maven.fabric.io/public' }
     mavenCentral()
 }
 
-
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
@@ -104,10 +92,8 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            ext.enableCrashlytics = true
         }
         debug {
-            ext.enableCrashlytics = false
             // Run code coverage reports by default on debug builds.
             testCoverageEnabled = true
         }
@@ -155,11 +141,10 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.2.0'
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true
-    }
+    // Firebase Crashlytics
+    implementation 'com.google.firebase:firebase-analytics:17.6.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
-    implementation 'com.google.firebase:firebase-analytics:17.2.1'
     implementation 'com.google.firebase:firebase-auth:19.2.0'
     implementation 'com.google.firebase:firebase-database:19.2.0'
     implementation 'com.google.firebase:firebase-messaging:20.0.1'
@@ -181,8 +166,5 @@ dependencies {
     implementation project(':fabbutton')
 }
 
-
-
-
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/fabric-sample.properties b/app/fabric-sample.properties
deleted file mode 100644
index 48938ae8..00000000
--- a/app/fabric-sample.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-apiSecret=fabricApiSecret
-apiKey=fabricApiKey
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index b88bccbd..70d72ad8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -29,8 +29,6 @@
     public *;
 }
 
--keep class com.crashlytics.** { *; }
--keep class com.crashlytics.android.**
 -keepattributes SourceFile,LineNumberTable
 
 -keepattributes Signature
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b981bfa6..de877084 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -85,9 +85,6 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="b2579d751611dc3b58788bad80a51ad37e140ecb"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/bookdash/android/BookDashApplication.java b/app/src/main/java/org/bookdash/android/BookDashApplication.java
index d501b478..aa41d909 100644
--- a/app/src/main/java/org/bookdash/android/BookDashApplication.java
+++ b/app/src/main/java/org/bookdash/android/BookDashApplication.java
@@ -5,15 +5,13 @@
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
-import com.crashlytics.android.Crashlytics;
-import com.crashlytics.android.core.CrashlyticsCore;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
+import com.google.firebase.installations.FirebaseInstallations;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
 import org.bookdash.android.config.CrashlyticsTree;
 
-import io.fabric.sdk.android.Fabric;
 import rx.Subscriber;
 import timber.log.Timber;
 
@@ -42,13 +40,12 @@ public void onCreate() {
         super.onCreate();
 
         AndroidThreeTen.init(this);
-        Crashlytics crashlyticsKit = new Crashlytics.Builder()
-                .core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()).build();
-        Fabric.with(this, crashlyticsKit);
+
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG);
 
         if (BuildConfig.DEBUG) {
             Timber.plant(new Timber.DebugTree());
-            Timber.d("Firebase Debug Info:" + FirebaseInstanceId.getInstance().getToken());
+            Timber.d("Firebase Debug Info:%s", FirebaseInstallations.getInstance().getId());
         } else {
             Timber.plant(new CrashlyticsTree());
         }
diff --git a/app/src/main/java/org/bookdash/android/config/CrashlyticsTree.java b/app/src/main/java/org/bookdash/android/config/CrashlyticsTree.java
index 8229bfb9..25901cf5 100644
--- a/app/src/main/java/org/bookdash/android/config/CrashlyticsTree.java
+++ b/app/src/main/java/org/bookdash/android/config/CrashlyticsTree.java
@@ -1,9 +1,7 @@
 package org.bookdash.android.config;
 
 import android.util.Log;
-
-import com.crashlytics.android.Crashlytics;
-
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import timber.log.Timber;
 
 /**
@@ -17,10 +15,10 @@ protected void log(final int priority, final String tag, final String message, f
             return;
         }
 
-        Crashlytics.log(priority, tag, message);
+        FirebaseCrashlytics.getInstance().log("Priority: " + priority + ", TAG: " + tag + ", Message: " + message);
 
         if (t != null) {
-            Crashlytics.logException(t);
+            FirebaseCrashlytics.getInstance().recordException(t);
         }
     }
 }
diff --git a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
index ac52bf95..0e51b2d6 100644
--- a/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
+++ b/app/src/main/java/org/bookdash/android/presentation/listbooks/ListBooksPresenter.java
@@ -1,6 +1,6 @@
 package org.bookdash.android.presentation.listbooks;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.bookdash.android.R;
 import org.bookdash.android.data.book.BookService;
@@ -51,7 +51,7 @@ public void onCompleted() {
                     @Override
                     public void onError(final Throwable e) {
                         getView().showSnackBarError(R.string.error_loading_languages);
-                        Crashlytics.logException(e);
+                        FirebaseCrashlytics.getInstance().recordException(e);
                     }
 
                     @Override
@@ -73,7 +73,7 @@ public void onCompleted() {
                     @Override
                     public void onError(final Throwable e) {
                         getView().showSnackBarError(R.string.error_saving_selected_language);
-                        Crashlytics.logException(e);
+                        FirebaseCrashlytics.getInstance().recordException(e);
                     }
 
                     @Override
@@ -127,7 +127,7 @@ public void onCompleted() {
                     @Override
                     public void onError(final Throwable e) {
                         getView().showSnackBarError(R.string.error_opening_languagepopover);
-                        Crashlytics.logException(e);
+                        FirebaseCrashlytics.getInstance().recordException(e);
                     }
 
                     @Override
diff --git a/build.gradle b/build.gradle
index 4248fc00..a27d8439 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.3'
         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.1'
     }
 }

From 2be768ae74b46e7052958e5446c02f29978acf7e Mon Sep 17 00:00:00 2001
From: Richard <richardbarnard101@gmail.com>
Date: Fri, 30 Oct 2020 13:39:25 +0200
Subject: [PATCH 03/18] UPDATE Firebase dependencies to rely on Firebase Bill
 of Materials for versioning

---
 app/build.gradle                              | 22 ++++++++++---------
 .../android/config/FirebaseConfig.java        | 14 ++++++------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2ca8fc5b..cba75353 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -141,17 +141,19 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.2.0'
 
-    // Firebase Crashlytics
-    implementation 'com.google.firebase:firebase-analytics:17.6.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
-
-    implementation 'com.google.firebase:firebase-auth:19.2.0'
-    implementation 'com.google.firebase:firebase-database:19.2.0'
-    implementation 'com.google.firebase:firebase-messaging:20.0.1'
-    implementation 'com.google.firebase:firebase-config:19.0.3'
-    implementation 'com.google.firebase:firebase-storage:19.1.0'
+    // Import the Firebase Bill of Materials (BoM)
+    implementation platform('com.google.firebase:firebase-bom:26.0.0')
+
+    // 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-database'
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-perf'
+    implementation 'com.google.firebase:firebase-storage'
     implementation 'com.firebaseui:firebase-ui-storage:6.1.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.2'
 
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'io.reactivex:rxjava:1.2.5'
diff --git a/app/src/main/java/org/bookdash/android/config/FirebaseConfig.java b/app/src/main/java/org/bookdash/android/config/FirebaseConfig.java
index 59005323..9ef440a2 100644
--- a/app/src/main/java/org/bookdash/android/config/FirebaseConfig.java
+++ b/app/src/main/java/org/bookdash/android/config/FirebaseConfig.java
@@ -6,15 +6,15 @@
 
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.BuildConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
 
-import org.bookdash.android.BuildConfig;
 import org.bookdash.android.R;
 
 public class FirebaseConfig implements RemoteConfigSettingsApi {
 
-    private static final int CACHE_EXPIRATION_IN_SECONDS = 3600;
+    private static final long CACHE_EXPIRATION_IN_SECONDS = 3600;
     private static final String DEFAULT_LANGUAGE_ID = "default_language_id";
     private static final String DEFAULT_LANGUAGE_NAME = "default_language_name";
     private static final String DEFAULT_LANGUAGE_ABBREVIATION = "default_language_abbreviation";
@@ -29,10 +29,10 @@ private FirebaseConfig(FirebaseRemoteConfig firebaseRemoteConfig) {
 
     public static FirebaseConfig newInstance() {
         final FirebaseRemoteConfig firebaseRemoteConfig = FirebaseRemoteConfig.getInstance();
-        FirebaseRemoteConfigSettings configSettings = new FirebaseRemoteConfigSettings.Builder()
-                .setDeveloperModeEnabled(BuildConfig.DEBUG).build();
-        firebaseRemoteConfig.setConfigSettings(configSettings);
-        firebaseRemoteConfig.setDefaults(R.xml.firebase_remote_config_defaults);
+        FirebaseRemoteConfigSettings configSettings = new FirebaseRemoteConfigSettings.Builder().
+                setMinimumFetchIntervalInSeconds(BuildConfig.DEBUG ? 0 : CACHE_EXPIRATION_IN_SECONDS).build();
+        firebaseRemoteConfig.setConfigSettingsAsync(configSettings);
+        firebaseRemoteConfig.setDefaultsAsync(R.xml.firebase_remote_config_defaults);
         return new FirebaseConfig(firebaseRemoteConfig);
     }
 
@@ -40,7 +40,7 @@ public FirebaseConfig init() {
         firebaseRemoteConfig.fetch(CACHE_EXPIRATION_IN_SECONDS).addOnSuccessListener(new OnSuccessListener<Void>() {
             @Override
             public void onSuccess(Void aVoid) {
-                firebaseRemoteConfig.activateFetched();
+                firebaseRemoteConfig.activate();
             }
         }).addOnFailureListener(new OnFailureListener() {
             @Override

From 4f17b0feaaa1dc43640cb9c05de8ee99e6ee633d Mon Sep 17 00:00:00 2001
From: Richard <richardbarnard101@gmail.com>
Date: Fri, 30 Oct 2020 16:12:26 +0200
Subject: [PATCH 04/18] UPDATE All dependencies

---
 app/build.gradle                         | 32 ++++++++++++------------
 build.gradle                             | 14 +++++------
 gradle/wrapper/gradle-wrapper.properties |  4 +--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cba75353..3c187d6f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,37 +109,37 @@ dependencies {
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
     testImplementation "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
-    testImplementation("org.powermock:powermock-module-junit4:$rootProject.ext.powerMockito")
+    testImplementation("org.powermock:powermock-module-junit4:2.0.7")
     testImplementation("org.powermock:powermock-api-mockito:$rootProject.ext.powerMockito")
 
     // Android Testing Library's runner and rules
-    androidTestImplementation 'androidx.test.espresso:espresso-web:3.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
 
     // Espresso UI Testing
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0') {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0') {
         exclude group: "javax.inject"
     }
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    androidTestImplementation 'androidx.appcompat:appcompat:1.1.0'
+    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 "com.google.android.material:material:$rootProject.ext.materialVersion"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.palette:palette:1.0.0'
     implementation "com.google.android.material:material:$rootProject.ext.materialVersion"
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.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.5'
-    implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.2.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    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')
@@ -157,10 +157,10 @@ dependencies {
 
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'io.reactivex:rxjava:1.2.5'
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.0.5'
-    implementation 'com.jakewharton.timber:timber:4.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    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.lifecycle:lifecycle-extensions:2.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.multidex:multidex:2.0.1'
 
diff --git a/build.gradle b/build.gradle
index a27d8439..de01c13e 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.3.61'
+    ext.kotlin_version = '1.4.10'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.google.gms:google-services:4.3.4'
         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.1'
+        classpath 'com.google.firebase:perf-plugin:1.3.3'
     }
 }
 
@@ -28,10 +28,10 @@ ext {
     versionName = "2.8.0"
     minSdkVersion = 16
     compileSdkVersion = 28
-    junitVersion = '4.12'
+    junitVersion = '4.13.1'
     mockitoVersion = '1.10.19'
     powerMockito = '1.7.4'
     hamcrestVersion = '1.3'
-    glideVersion = '4.10.0'
-    materialVersion = '1.0.0'
+    glideVersion = '4.11.0'
+    materialVersion = '1.2.1'
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6fbf5f28..d45217c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 07 11:36:50 CAT 2019
+#Fri Oct 30 13:42:53 CAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

From b69a55fb5b2c81e928175f3ede018d950dc3c086 Mon Sep 17 00:00:00 2001
From: Richard <richardbarnard101@gmail.com>
Date: Fri, 30 Oct 2020 16:29:44 +0200
Subject: [PATCH 05/18] CHANGE the share-with-a-friend default text to be more
 appealing

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d752cd9..5af8497d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <string name="invite_error_no_apps_found">Unfortunately no apps were found to invite your friends with.</string>
     <string name="invite_using">Choose an app to invite with</string>
     <string name="invitation_subject">Install the Book Dash app for free books</string>
-    <string name="invitation_message">You should install Book Dash for access to some great free books!\n\nBook Dash install link:\nhttps://play.google.com/store/apps/details?id=org.bookdash.android</string>
+    <string name="invitation_message">I think you\'ll love the Book Dash app for free children\'s books.\n\nYou can get it here:\nhttps://play.google.com/store/apps/details?id=org.bookdash.android</string>
     <string name="sent_invitations_fmt">Sent invites to %d</string>
     <string name="invite_friends">Invite Friends</string>
     <string name="action_all_books">All Books</string>

From 23bd9bd84352b61325f616fb4c642248df6bdd80 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sat, 31 Oct 2020 13:43:21 +0200
Subject: [PATCH 06/18] ADD Crashlytics logs for when BookPages is null when
 the user is trying to view/download a book. Cannot reproduce issue so we'll
 have to monitor it first to see where the problem is.

---
 .../android/data/book/DownloadServiceImpl.java |  5 +++++
 .../bookinfo/BookInfoPresenter.java            |  5 ++++-
 .../readbook/BookDetailActivity.kt             | 18 +++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java b/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
index 49df0e05..b6b80c38 100644
--- a/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
+++ b/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
@@ -6,6 +6,7 @@
 
 import androidx.annotation.WorkerThread;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.firebase.storage.FileDownloadTask;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.gson.Gson;
@@ -99,8 +100,12 @@ private BookPages getBookPages(String fileName) {
                 Log.e(TAG, "EX: ", e);
             }
 
+            FirebaseCrashlytics.getInstance().log("File path: " + fileName);
+            FirebaseCrashlytics.getInstance().recordException(e);
             Log.e(TAG, "Ex:" + e.getMessage(), e);
         } catch (Exception e) {
+            FirebaseCrashlytics.getInstance().log("File path: " + fileName);
+            FirebaseCrashlytics.getInstance().recordException(e);
             Log.e(TAG, "error parsing book: " + fileName, e);
         }
         return bookPages;
diff --git a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
index e418f6ce..e09b766e 100644
--- a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
+++ b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
@@ -2,6 +2,8 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
+
 import org.bookdash.android.R;
 import org.bookdash.android.data.book.BookService;
 import org.bookdash.android.data.book.DownloadService;
@@ -96,15 +98,16 @@ public void onError(Throwable e) {
                     public void onNext(DownloadProgressItem downloadProgressItem) {
                         getView().showDownloadProgress(downloadProgressItem.getDownloadProgress());
                         if (downloadProgressItem.isComplete()) {
+                            bookInfo.setIsDownloading(false);
                             analytics.trackViewBook(bookInfo);
                             BookPages bookPages = downloadProgressItem.getBookPages();
                             if (bookPages == null) {
                                 getView().showSnackBarMessage(R.string.failed_to_open_book);
+                                FirebaseCrashlytics.getInstance().recordException(new Exception("Book pages null after completed download."));
                                 analytics.trackDownloadBookFailed(bookInfo, "failed_to_open_book");
                                 return;
                             }
                             getView().showDownloadFinished();
-                            bookInfo.setIsDownloading(false);
                             getView().openBook(bookInfo, bookPages,
                                     bookInfo.getFolderLocation());
                         }
diff --git a/app/src/main/java/org/bookdash/android/presentation/readbook/BookDetailActivity.kt b/app/src/main/java/org/bookdash/android/presentation/readbook/BookDetailActivity.kt
index eeae7bc3..45db3570 100644
--- a/app/src/main/java/org/bookdash/android/presentation/readbook/BookDetailActivity.kt
+++ b/app/src/main/java/org/bookdash/android/presentation/readbook/BookDetailActivity.kt
@@ -3,9 +3,11 @@ package org.bookdash.android.presentation.readbook
 import android.os.Bundle
 import android.view.ViewTreeObserver
 import android.view.WindowManager
+import android.widget.Toast
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.viewpager.widget.ViewPager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import org.bookdash.android.R
 import org.bookdash.android.domain.model.gson.BookPages
 import org.bookdash.android.presentation.activity.BaseAppCompatActivity
@@ -32,6 +34,10 @@ class BookDetailActivity : BaseAppCompatActivity() {
         })
         //val book = intent.getStringExtra(BOOK_ARG)
         val bookPages = intent.getParcelableExtra<BookPages>(BOOK_PAGES)
+        if (bookPages == null) {
+            onBookPagesNull()
+            return
+        }
         bookPages.pages.add(0, null)
         val bookLocation = intent.getStringExtra(LOCATION_BOOK)
         pageAdapter = PageAdapter(supportFragmentManager, bookPages.pages,
@@ -51,12 +57,22 @@ class BookDetailActivity : BaseAppCompatActivity() {
             }
         })
         readBookViewModel.pageForwardEventTrigger.observe(this, Observer {
-            if (viewPager.currentItem != viewPager.childCount -1) {
+            if (viewPager.currentItem != viewPager.childCount - 1) {
                 viewPager.setCurrentItem(viewPager.currentItem + 1, true)
             }
         })
     }
 
+    /**
+     * Called when this Activity was launched with no book pages.
+     * TODO Remove this method once bookPages == null bug is fixed.
+     */
+    private fun onBookPagesNull() {
+        FirebaseCrashlytics.getInstance().recordException(Exception("Book pages null when opening book detail."))
+        Toast.makeText(applicationContext, R.string.failed_to_open_book, Toast.LENGTH_LONG).show()
+        finish()
+    }
+
     override fun getScreenName(): String {
         return "BookDetailScreen"
     }

From 58f0e08a7ff0f00d72fd93536d4b5bbfa38d3507 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sat, 31 Oct 2020 14:56:59 +0200
Subject: [PATCH 07/18] FIX Tests.

---
 app/build.gradle                                             | 5 +++++
 .../presentation/listbooks/OverflowMenuOptionsTest.java      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3c187d6f..c2df5047 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,6 +88,11 @@ android {
         }
     }
 
+    // Avoid crash on platform method calls that's not mocked. E.g. FirebaseCrashlytics.
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
diff --git a/app/src/androidTest/java/org/bookdash/android/presentation/listbooks/OverflowMenuOptionsTest.java b/app/src/androidTest/java/org/bookdash/android/presentation/listbooks/OverflowMenuOptionsTest.java
index 8742446c..3f8604da 100644
--- a/app/src/androidTest/java/org/bookdash/android/presentation/listbooks/OverflowMenuOptionsTest.java
+++ b/app/src/androidTest/java/org/bookdash/android/presentation/listbooks/OverflowMenuOptionsTest.java
@@ -43,7 +43,7 @@ public void tearDown() {
 
     @Test
     public void languageItemClick_ShowLanguageChooser() {
-        onView(withId(R.id.action_language_choice)).perform(click());
+        onView(withId(R.id.container_language)).perform(click());
         //Then
         onView(withText(R.string.language_selection_heading)).inRoot(isDialog()).check(matches(isDisplayed()));
     }

From 687446bd4e2b81b58ca6dc6753b89f7a5d3127fc Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sat, 31 Oct 2020 15:12:22 +0200
Subject: [PATCH 08/18] CHANGE Right align text on language change bar.

---
 app/src/main/res/layout/fragment_list_books.xml | 7 +++++--
 app/src/main/res/values-sw600dp/dimens.xml      | 1 +
 app/src/main/res/values/dimens.xml              | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_list_books.xml b/app/src/main/res/layout/fragment_list_books.xml
index c6e21037..a7b0d41c 100644
--- a/app/src/main/res/layout/fragment_list_books.xml
+++ b/app/src/main/res/layout/fragment_list_books.xml
@@ -32,8 +32,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/language_selector"
-            android:gravity="center"
-            android:padding="4dp"
+            android:gravity="right"
+            android:paddingLeft="4dp"
+            android:paddingTop="4dp"
+            android:paddingRight="@dimen/book_list_language_bar_right_padding"
+            android:paddingBottom="4dp"
             app:layout_scrollFlags="scroll|enterAlways">
 
             <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 6258b4d3..07c05e49 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="text_size_page">28sp</dimen>
     <dimen name="fab_button_size">62dp</dimen>
     <bool name="is_tablet">true</bool>
+    <dimen name="book_list_language_bar_right_padding">17dp</dimen>
 
     <dimen name="book_size_landscape">384dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5c3b759b..7488ec55 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
     <dimen name="book_column_width">144dp</dimen>
     <dimen name="book_column_width_padding">160dp</dimen>
     <dimen name="book_list_padding">4dp</dimen>
+    <dimen name="book_list_language_bar_right_padding">9dp</dimen>
     <dimen name="text_size_page">14sp</dimen>
     <dimen name="size_text">24sp</dimen>
     <dimen name="padding_book">16dp</dimen>

From 0af66a8f188573fef45dea4fa3793e3854c69f0c Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sat, 31 Oct 2020 15:53:01 +0200
Subject: [PATCH 09/18] FIX Deprecation warnings

---
 .../presentation/bookinfo/BookInfoActivity.java    | 12 +++++++++---
 .../android/presentation/readbook/PageAdapter.java |  2 +-
 .../main/java/mbanje/kurt/fabbutton/FabButton.java | 14 ++++++++++----
 .../adapter/MaterialTutorialAdapter.java           |  2 +-
 .../view/CirclePageIndicator.java                  |  6 +++---
 5 files changed, 24 insertions(+), 12 deletions(-)

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 37866740..ba73ac70 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
@@ -42,7 +42,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.target.CustomTarget;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.snackbar.Snackbar;
@@ -269,7 +269,7 @@ protected void onNewIntent(Intent intent) {
     private void loadImage(StorageReference url) {
         GlideApp.with(this).load(url)
                 .transition(DrawableTransitionOptions.withCrossFade())
-                .into(new SimpleTarget<Drawable>() {
+                .into(new CustomTarget<Drawable>() {
                     @Override
                     public void onResourceReady(@NonNull Drawable resource, @Nullable com.bumptech.glide.request.transition.Transition<? super Drawable> transition) {
 
@@ -277,6 +277,12 @@ public void onResourceReady(@NonNull Drawable resource, @Nullable com.bumptech.g
                         onImageLoaded(bitmap);
                         extractPaletteColors(bitmap);
                     }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+                        // Clear the view.
+                        onImageLoaded(null);
+                    }
                 });
     }
     public static Bitmap drawableToBitmap (Drawable drawable) {
@@ -300,7 +306,7 @@ public static Bitmap drawableToBitmap (Drawable drawable) {
         drawable.draw(canvas);
         return bitmap;
     }
-    private void onImageLoaded(Bitmap bitmap) {
+    private void onImageLoaded(@Nullable Bitmap bitmap) {
         imageViewBook.setImageBitmap(bitmap);
 
     }
diff --git a/app/src/main/java/org/bookdash/android/presentation/readbook/PageAdapter.java b/app/src/main/java/org/bookdash/android/presentation/readbook/PageAdapter.java
index 283e6ba6..c693b2d9 100644
--- a/app/src/main/java/org/bookdash/android/presentation/readbook/PageAdapter.java
+++ b/app/src/main/java/org/bookdash/android/presentation/readbook/PageAdapter.java
@@ -16,7 +16,7 @@ public class PageAdapter extends FragmentStatePagerAdapter {
 
 
     public PageAdapter(FragmentManager fm, List<Page> pages, String rootFileLocation) {
-        super(fm);
+        super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         this.pages = pages;
         this.rootFileLocation = rootFileLocation;
     }
diff --git a/fabbutton/src/main/java/mbanje/kurt/fabbutton/FabButton.java b/fabbutton/src/main/java/mbanje/kurt/fabbutton/FabButton.java
index 974fb6b3..ff135789 100644
--- a/fabbutton/src/main/java/mbanje/kurt/fabbutton/FabButton.java
+++ b/fabbutton/src/main/java/mbanje/kurt/fabbutton/FabButton.java
@@ -35,6 +35,7 @@
 import android.view.View;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorListener;
@@ -48,8 +49,7 @@
 /**
  * Created by kurt on 21 02 2015 .
  */
-@CoordinatorLayout.DefaultBehavior(FabButton.Behavior.class)
-public class FabButton extends FrameLayout implements CircleImageView.OnFabViewListener {
+public class FabButton extends FrameLayout implements CircleImageView.OnFabViewListener, CoordinatorLayout.AttachedBehavior {
 
     private static final String TAG = "FabButton";
     private CircleImageView circle;
@@ -206,6 +206,12 @@ public void onProgressCompleted() {
         }
     }
 
+    @NonNull
+    @Override
+    public CoordinatorLayout.Behavior<FabButton> getBehavior() {
+        return new Behavior();
+    }
+
 
     public static class Behavior extends CoordinatorLayout.Behavior<FabButton> {
         // We only support the FAB <> Snackbar shift movement on Honeycomb and above. This is
@@ -266,7 +272,7 @@ private void updateFabTranslationForSnackbar(CoordinatorLayout parent, FabButton
                             .setInterpolator(AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR).setListener(null);
                 } else {
                     // Else we'll set use setTranslationY
-                    ViewCompat.setTranslationY(fab, translationY);
+                    fab.setTranslationY(translationY);
                 }
                 mTranslationY = translationY;
             }
@@ -323,7 +329,7 @@ private float getFabTranslationYForSnackbar(CoordinatorLayout parent, FabButton
             for (int i = 0, z = dependencies.size(); i < z; i++) {
                 final View view = dependencies.get(i);
                 if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(fab, view)) {
-                    minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - view.getHeight());
+                    minOffset = Math.min(minOffset, view.getTranslationY() - view.getHeight());
                 }
             }
 
diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/adapter/MaterialTutorialAdapter.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/adapter/MaterialTutorialAdapter.java
index 05066857..9a4f2b2d 100644
--- a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/adapter/MaterialTutorialAdapter.java
+++ b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/adapter/MaterialTutorialAdapter.java
@@ -35,7 +35,7 @@ public class MaterialTutorialAdapter extends FragmentPagerAdapter {
     private List<MaterialTutorialFragment> fragments;
 
     public MaterialTutorialAdapter(FragmentManager fm, List<MaterialTutorialFragment> fragments) {
-        super(fm);
+        super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         this.fragments = fragments;
 
     }
diff --git a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/view/CirclePageIndicator.java b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/view/CirclePageIndicator.java
index 53be43c2..3ea25b50 100644
--- a/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/view/CirclePageIndicator.java
+++ b/materialhelptutorial/src/main/java/za/co/riggaroo/materialhelptutorial/view/CirclePageIndicator.java
@@ -104,7 +104,7 @@ public CirclePageIndicator(Context context, AttributeSet attrs, int defStyle) {
 
         Drawable background = a.getDrawable(R.styleable.CirclePageIndicator_android_background);
         if (background != null) {
-            setBackgroundDrawable(background);
+            setBackground(background);
         }
 
         a.recycle();
@@ -367,13 +367,13 @@ public void setViewPager(ViewPager view) {
             return;
         }
         if (mViewPager != null) {
-            mViewPager.setOnPageChangeListener(null);
+            mViewPager.removeOnPageChangeListener(this);
         }
         if (view.getAdapter() == null) {
             throw new IllegalStateException("ViewPager does not have adapter instance.");
         }
         mViewPager = view;
-        mViewPager.setOnPageChangeListener(this);
+        mViewPager.addOnPageChangeListener(this);
         invalidate();
     }
 

From 361f88a27f7738d85e4daff5c42260115237d78a Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sat, 31 Oct 2020 16:36:36 +0200
Subject: [PATCH 10/18] CHANGE Update Glide's proguard rules to fix crash
 "VerifyError" on API 16.

---
 app/proguard-rules.pro | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 70d72ad8..ec830b17 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,13 +20,16 @@
 -keep class me.zhanghai.android.materialprogressbar.** { *; }
 -keep class com.joanzapata.** { *; }
 
-
-
-
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
-    **[] $VALUES;
-    public *;
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
 }
 
 -keepattributes SourceFile,LineNumberTable

From 8290ffb05c9cb15bd8758f7370835bfcf38442ae Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Sun, 1 Nov 2020 14:19:15 +0200
Subject: [PATCH 11/18] MIGRATE Update target and compile  SDK version to
 Android 10 API 29. Thorough investigation into migration steps revealed no
 changes necessary for this project.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index de01c13e..93fca08e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ ext {
     versionCode = 34
     versionName = "2.8.0"
     minSdkVersion = 16
-    compileSdkVersion = 28
+    compileSdkVersion = 29
     junitVersion = '4.13.1'
     mockitoVersion = '1.10.19'
     powerMockito = '1.7.4'

From a27054f95a8f64bf69414671b1a9259585a551dd Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Mon, 2 Nov 2020 15:52:33 +0200
Subject: [PATCH 12/18] UPDATE Version build number and version name for the
 2.9.0 Play Store release.

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 93fca08e..44c8fd6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,8 +24,8 @@ allprojects {
 }
 
 ext {
-    versionCode = 34
-    versionName = "2.8.0"
+    versionCode = 35
+    versionName = "2.9.0"
     minSdkVersion = 16
     compileSdkVersion = 29
     junitVersion = '4.13.1'

From e1aa24cb6130936de0b6ce3d86061d4cf1f081c0 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Fri, 30 Apr 2021 10:02:56 +0200
Subject: [PATCH 13/18] BUGFIX Fix book downloading issue where the
 FireBookDetails.getFolderLocation() method returns a "__MACOSX" folder as a
 book folder on certain devices.

---
 .../android/data/book/DownloadServiceImpl.java      |  4 ++--
 .../domain/model/firebase/FireBookDetails.java      | 13 ++++++++++++-
 .../presentation/bookinfo/BookInfoPresenter.java    |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java b/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
index b6b80c38..a0aff899 100644
--- a/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
+++ b/app/src/main/java/org/bookdash/android/data/book/DownloadServiceImpl.java
@@ -100,11 +100,11 @@ private BookPages getBookPages(String fileName) {
                 Log.e(TAG, "EX: ", e);
             }
 
-            FirebaseCrashlytics.getInstance().log("File path: " + fileName);
+            FirebaseCrashlytics.getInstance().log("File path: " + fileName); // TODO Remove in next release if book downloading bug is fixed.
             FirebaseCrashlytics.getInstance().recordException(e);
             Log.e(TAG, "Ex:" + e.getMessage(), e);
         } catch (Exception e) {
-            FirebaseCrashlytics.getInstance().log("File path: " + fileName);
+            FirebaseCrashlytics.getInstance().log("File path: " + fileName); // TODO Remove in next release if book downloading bug is fixed.
             FirebaseCrashlytics.getInstance().recordException(e);
             Log.e(TAG, "error parsing book: " + fileName, e);
         }
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 864fbf00..990a1dcf 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
@@ -137,7 +137,18 @@ private String getFolderLocation(File file) {
             if (files == null || files.length == 0 || files[0] == null) {
                 return null;
             }
-            return files[0].getAbsoluteFile().toString();
+            for (File aFile : files) {
+                if (!aFile.getAbsoluteFile().toString().contains("MACOSX")) {
+                    // This is a workaround bugfix (no other solution possible). Previously the app
+                    // assumed that a book's root folder only contains one folder (containing the
+                    // book images and .json file). However, in the CMS content conversion process
+                    // where PDF books are converted into .json and images so that the app can
+                    // consume it, mac inserted a "__MACOSX" folder in certain cases. This causes
+                    // this method to return the MACOSX folder as the book folder on certain devices
+                    // as file.listFiles() does not guarantee any specific ordering.
+                    return aFile.getAbsoluteFile().toString();
+                }
+            }
         }
         return null;
     }
diff --git a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
index e09b766e..910602ea 100644
--- a/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
+++ b/app/src/main/java/org/bookdash/android/presentation/bookinfo/BookInfoPresenter.java
@@ -103,7 +103,7 @@ public void onNext(DownloadProgressItem downloadProgressItem) {
                             BookPages bookPages = downloadProgressItem.getBookPages();
                             if (bookPages == null) {
                                 getView().showSnackBarMessage(R.string.failed_to_open_book);
-                                FirebaseCrashlytics.getInstance().recordException(new Exception("Book pages null after completed download."));
+                                FirebaseCrashlytics.getInstance().recordException(new Exception("Book pages null after completed download.")); // TODO Remove in next release if book downloading bug is fixed.
                                 analytics.trackDownloadBookFailed(bookInfo, "failed_to_open_book");
                                 return;
                             }

From a456aa9b8a25c67b6696f92b1e3c519c874fa286 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Fri, 30 Apr 2021 10:14:50 +0200
Subject: [PATCH 14/18] BUGFIX ActivityNotFoundException when trying to share a
 book.

---
 .../presentation/bookinfo/BookInfoActivity.java   | 15 ++++++++++-----
 app/src/main/res/values/strings.xml               |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

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 ba73ac70..af29a5b5 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
@@ -1,6 +1,7 @@
 package org.bookdash.android.presentation.bookinfo;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
@@ -470,11 +471,15 @@ public void showContributors(List<FireContributor> list) {
 
     @Override
     public void sendShareEvent(String bookTitle) {
-        Intent sendIntent = new Intent();
-        sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT, getString(R.string.sharing_book_title, bookTitle));
-        sendIntent.setType("text/plain");
-        startActivity(sendIntent);
+        try {
+            Intent sendIntent = new Intent();
+            sendIntent.setAction(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_TEXT, getString(R.string.sharing_book_title, bookTitle));
+            sendIntent.setType("text/plain");
+            startActivity(sendIntent);
+        } catch (ActivityNotFoundException anfe) {
+            showSnackBarMessage(R.string.share_book_error_no_apps_found);
+        }
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5af8497d..401ecff7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,6 +77,7 @@
     <string name="sharing_book_title">I have just read \"%s\". Download Book Dash now and read it for free! http://play.google.com/store/apps/details?id=org.bookdash.android</string>
     <string name="invitation_title">Download Book Dash</string>
     <string name="invite_error_no_apps_found">Unfortunately no apps were found to invite your friends with.</string>
+    <string name="share_book_error_no_apps_found">Unfortunately no apps were found that can share this book with your friends.</string>
     <string name="invite_using">Choose an app to invite with</string>
     <string name="invitation_subject">Install the Book Dash app for free books</string>
     <string name="invitation_message">I think you\'ll love the Book Dash app for free children\'s books.\n\nYou can get it here:\nhttps://play.google.com/store/apps/details?id=org.bookdash.android</string>

From b6308ff3b005d82313661a838c26aab1d895a475 Mon Sep 17 00:00:00 2001
From: HeinrichWesson <heinrich@thereachtrust.org>
Date: Fri, 30 Apr 2021 14:35:36 +0200
Subject: [PATCH 15/18] UPDATE Build number and version name for the 2.9.1 Play
 Store release

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 44c8fd6b..bdd1e12b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,8 +24,8 @@ allprojects {
 }
 
 ext {
-    versionCode = 35
-    versionName = "2.9.0"
+    versionCode = 36
+    versionName = "2.9.1"
     minSdkVersion = 16
     compileSdkVersion = 29
     junitVersion = '4.13.1'

From 849adcfbdbbbdb56a35257b21e125040e2c12ccb Mon Sep 17 00:00:00 2001
From: Mandi <mandi@thereachtrust.org>
Date: Mon, 24 Oct 2022 08:03:40 +0200
Subject: [PATCH 16/18] TargetSDK -> 33

Starting in November 2022, app updates must target API level 31 or above and adjust for behavioral changes in Android 12; except for Wear OS apps, which must target API level 30 or higher.

https://developer.android.com/google/play/requirements/target-sdk
---
 app/src/main/AndroidManifest.xml | 18 ++++++++++++------
 build.gradle                     |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index de877084..e3b068bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,18 +30,21 @@
         <activity
             android:name=".presentation.main.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false">
         </activity>
         <activity
             android:name=".presentation.readbook.BookDetailActivity"
             android:label="@string/app_name"
             android:screenOrientation="sensorLandscape"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen">
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"
+            android:exported="false">
         </activity>
         <activity
             android:name=".presentation.bookinfo.BookInfoActivity"
             android:label=""
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.main.MainActivity"/>
@@ -61,7 +64,8 @@
         <activity
             android:name=".presentation.splash.SplashActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -71,7 +75,8 @@
         <activity
             android:name=".presentation.search.SearchActivity"
             android:label="@string/screen_title_search"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".presentation.main.MainActivity"/>
@@ -79,7 +84,8 @@
         <activity
             android:name="za.co.riggaroo.materialhelptutorial.tutorial.MaterialTutorialActivity"
             android:label="@string/tutorial_screen"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false">
         </activity>
 
         <meta-data
diff --git a/build.gradle b/build.gradle
index bdd1e12b..878fb5a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,10 +24,10 @@ allprojects {
 }
 
 ext {
-    versionCode = 36
-    versionName = "2.9.1"
+    versionCode = 37
+    versionName = "2.9.2"
     minSdkVersion = 16
-    compileSdkVersion = 29
+    compileSdkVersion = 33
     junitVersion = '4.13.1'
     mockitoVersion = '1.10.19'
     powerMockito = '1.7.4'

From 19bfbf9433485837f335e8e2a0e79b7fba1f7e45 Mon Sep 17 00:00:00 2001
From: Mandi <mandi@thereachtrust.org>
Date: Mon, 29 May 2023 07:35:33 +0200
Subject: [PATCH 17/18] Create output.json

---
 app/prod/release/output.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 app/prod/release/output.json

diff --git a/app/prod/release/output.json b/app/prod/release/output.json
new file mode 100644
index 00000000..3f3b3421
--- /dev/null
+++ b/app/prod/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"2.9.2","enabled":true,"outputFile":"app-prod-release.apk","fullName":"prodRelease","baseName":"prod-release","dirName":""},"path":"app-prod-release.apk","properties":{}}]
\ No newline at end of file

From 07dee4cbc7faa1c318c7d4aa7fb56b2e78307b02 Mon Sep 17 00:00:00 2001
From: Mandi <mandi@thereachtrust.org>
Date: Mon, 29 May 2023 08:35:27 +0200
Subject: [PATCH 18/18] Update: Copyright 2023 Book Dash

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb3e5954..196bd5b6 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ google-services.json file. This must then be placed into the app folder of this
 Contributions are welcome. Please read the [contributions guide](CONTRIBUTING.md) for more information. 
 
 # License
-Copyright 2016 Book Dash.
+Copyright 2023 Book Dash.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements. See the NOTICE file distributed with this work for