From 7899daa3d4b4ab3e4bf99f604ad40c8a4e5610f7 Mon Sep 17 00:00:00 2001
From: Manan Arya <mananarya22@gmail.com>
Date: Wed, 3 May 2023 16:18:41 +0530
Subject: [PATCH 1/4] Initial Build

---
 folioreader/AndroidManifest.xml            | 3 ++-
 folioreader/res/layout/progress_dialog.xml | 2 +-
 folioreader/res/layout/text_selection.xml  | 2 ++
 versions.gradle                            | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/folioreader/AndroidManifest.xml b/folioreader/AndroidManifest.xml
index 96e7be6ee..0ed4a3f23 100644
--- a/folioreader/AndroidManifest.xml
+++ b/folioreader/AndroidManifest.xml
@@ -29,7 +29,8 @@
 
         <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/folioreader/res/layout/progress_dialog.xml b/folioreader/res/layout/progress_dialog.xml
index 0d823fe0e..f13a31731 100644
--- a/folioreader/res/layout/progress_dialog.xml
+++ b/folioreader/res/layout/progress_dialog.xml
@@ -14,7 +14,7 @@
             android:id="@+id/loading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?android:attr/android:progressBarStyle" />
+            />
 
         <TextView
             android:id="@+id/label_loading"
diff --git a/folioreader/res/layout/text_selection.xml b/folioreader/res/layout/text_selection.xml
index 32b004d20..516239dfa 100644
--- a/folioreader/res/layout/text_selection.xml
+++ b/folioreader/res/layout/text_selection.xml
@@ -30,6 +30,7 @@
                     style="@style/TextViewTextSelector"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:text="@string/copy" />
 
                 <TextView
@@ -37,6 +38,7 @@
                     style="@style/TextViewTextSelector"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:text="@string/share" />
 
                 <TextView
diff --git a/versions.gradle b/versions.gradle
index ec456b157..2e47684cb 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,6 +1,6 @@
 def versions = [:]
 
-versions.folioreaderSdk = "0.5.4"
+versions.folioreaderSdk = "1.0.0-local"
 versions.r2SharedKotlin = "1.0.4-2"
 versions.r2StreamerKotlin = "1.0.4-2"
 

From 694991ab1d9fb5ea1d8b364b779bb2e0c0cf4cae Mon Sep 17 00:00:00 2001
From: Manan Arya <mananarya22@gmail.com>
Date: Fri, 5 May 2023 12:12:13 +0530
Subject: [PATCH 2/4] Build fix for android V33

---
 folioreader/AndroidManifest.xml               |  3 ++-
 .../folioreader/ui/activity/FolioActivity.kt  | 26 +++++++++++--------
 versions.gradle                               |  6 ++---
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/folioreader/AndroidManifest.xml b/folioreader/AndroidManifest.xml
index 0ed4a3f23..11590df80 100644
--- a/folioreader/AndroidManifest.xml
+++ b/folioreader/AndroidManifest.xml
@@ -11,7 +11,8 @@
     <application
         android:allowBackup="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup"
+        android:requestLegacyExternalStorage="true">
 
         <provider
             android:name=".AppContext"
diff --git a/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt b/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt
index 8df26fbe8..c02544950 100644
--- a/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt
+++ b/folioreader/src/main/java/com/folioreader/ui/activity/FolioActivity.kt
@@ -282,17 +282,21 @@ class FolioActivity : AppCompatActivity(), FolioActivityCallback, MediaControlle
         initActionBar()
         initMediaController()
 
-        if (ContextCompat.checkSelfPermission(
-                this@FolioActivity,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            ActivityCompat.requestPermissions(
-                this@FolioActivity,
-                Constants.getWriteExternalStoragePerms(),
-                Constants.WRITE_EXTERNAL_STORAGE_REQUEST
-            )
-        } else {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            if (ContextCompat.checkSelfPermission(
+                    this@FolioActivity,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
+                ActivityCompat.requestPermissions(
+                    this@FolioActivity,
+                    Constants.getWriteExternalStoragePerms(),
+                    Constants.WRITE_EXTERNAL_STORAGE_REQUEST
+                )
+            } else {
+                setupBook()
+            }
+        } else{
             setupBook()
         }
     }
diff --git a/versions.gradle b/versions.gradle
index 2e47684cb..884b332c7 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,6 +1,6 @@
 def versions = [:]
 
-versions.folioreaderSdk = "1.0.0-local"
+versions.folioreaderSdk = "1.0.1-local"
 versions.r2SharedKotlin = "1.0.4-2"
 versions.r2StreamerKotlin = "1.0.4-2"
 
@@ -8,8 +8,8 @@ versions.projectVersionCode = 1
 versions.projectVersionName = "1.0"
 
 versions.androidMinSdk = 21
-versions.androidCompileSdk = 28
-versions.androidTargetSdk = 28
+versions.androidCompileSdk = 33
+versions.androidTargetSdk = 33
 
 versions.androidGradlePlugin = "3.5.3"
 versions.kotlin = "1.3.11"

From 68e2a9bebd3776c9d3cb398df1ec139d119b4497 Mon Sep 17 00:00:00 2001
From: Manan Arya <mananarya22@gmail.com>
Date: Sat, 6 May 2023 00:08:38 +0530
Subject: [PATCH 3/4] Initial Build

---
 folioreader/res/layout/progress_dialog.xml | 10 +++++-----
 folioreader/res/layout/text_selection.xml  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/folioreader/res/layout/progress_dialog.xml b/folioreader/res/layout/progress_dialog.xml
index f13a31731..aa4bb7228 100644
--- a/folioreader/res/layout/progress_dialog.xml
+++ b/folioreader/res/layout/progress_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/layout_loading"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         android:gravity="center">
 
@@ -14,7 +14,7 @@
             android:id="@+id/loading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            />
+            style="?android:attr/progressBarStyle" />
 
         <TextView
             android:id="@+id/label_loading"
diff --git a/folioreader/res/layout/text_selection.xml b/folioreader/res/layout/text_selection.xml
index 516239dfa..a50211758 100644
--- a/folioreader/res/layout/text_selection.xml
+++ b/folioreader/res/layout/text_selection.xml
@@ -30,16 +30,16 @@
                     style="@style/TextViewTextSelector"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:text="@string/copy" />
+                    android:text="@string/copy"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/shareSelection"
                     style="@style/TextViewTextSelector"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:text="@string/share" />
+                    android:text="@string/share"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/defineSelection"

From 0c26bfeafdf3d414b56e7ef57199de8dd86619e7 Mon Sep 17 00:00:00 2001
From: Ashish Sabharwal <ashish.sabharwal01@gmail.com>
Date: Sat, 26 Oct 2024 17:23:08 +0530
Subject: [PATCH 4/4] * Updated the gradle file to include the new/migrated
 repositories maven urls

---
 build.gradle | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build.gradle b/build.gradle
index 143e57b76..5ca0d04d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,13 @@ buildscript {
     apply from: 'versions.gradle'
 
     repositories {
+        mavenCentral()
+        mavenLocal()
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://repo.grails.org/grails/core/' }
+        maven { url 'https://plugins.gradle.org/m2/' }
     }
 
     dependencies {
@@ -32,7 +37,10 @@ allprojects {
         mavenLocal()
         google()
         jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'https://repo.grails.org/grails/core/' }
+        maven { url 'https://plugins.gradle.org/m2/' }
     }
 }