From eddf1c78b0de1c627fe6866d7aa70a585b9eae07 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubhampandey979271@gmail.com>
Date: Thu, 23 Dec 2021 22:35:27 +0530
Subject: [PATCH 1/2] manifest merger failed

---
 folioreader/AndroidManifest.xml     | 9 ++++++---
 sample/src/main/AndroidManifest.xml | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/folioreader/AndroidManifest.xml b/folioreader/AndroidManifest.xml
index 96e7be6ee..88b580a41 100644
--- a/folioreader/AndroidManifest.xml
+++ b/folioreader/AndroidManifest.xml
@@ -21,15 +21,18 @@
         <activity
             android:name="com.folioreader.ui.activity.FolioActivity"
             android:label="@string/app_name"
-            android:theme="@style/FolioActivityDayTheme" />
+            android:theme="@style/FolioActivityDayTheme"
+            android:exported="false" />
 
         <activity
             android:name="com.folioreader.ui.activity.ContentHighlightActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="false" />
 
         <activity
             android:name="com.folioreader.ui.activity.SearchActivity"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 314c99e98..3759b3fe3 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
 
         <activity
             android:name=".HomeActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

From 7ad0ab30aab069f3bb15766f9995a761757b46a0 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubhampandey979271@gmail.com>
Date: Thu, 23 Dec 2021 22:45:50 +0530
Subject: [PATCH 2/2] progress dialog style

---
 folioreader/res/layout/progress_dialog.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/folioreader/res/layout/progress_dialog.xml b/folioreader/res/layout/progress_dialog.xml
index 0d823fe0e..1af531ed7 100644
--- a/folioreader/res/layout/progress_dialog.xml
+++ b/folioreader/res/layout/progress_dialog.xml
@@ -13,8 +13,7 @@
         <ProgressBar
             android:id="@+id/loading"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="?android:attr/android:progressBarStyle" />
+            android:layout_height="wrap_content"/>
 
         <TextView
             android:id="@+id/label_loading"