Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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/' }
}
}

Expand Down
6 changes: 4 additions & 2 deletions folioreader/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -29,7 +30,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>
Expand Down
10 changes: 5 additions & 5 deletions folioreader/res/layout/progress_dialog.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?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">

<ProgressBar
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/android:progressBarStyle" />
style="?android:attr/progressBarStyle" />

<TextView
android:id="@+id/label_loading"
Expand Down
6 changes: 4 additions & 2 deletions folioreader/res/layout/text_selection.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@
style="@style/TextViewTextSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:text="@string/share" />
android:text="@string/share"
android:visibility="gone" />

<TextView
android:id="@+id/defineSelection"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand Down
6 changes: 3 additions & 3 deletions versions.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
def versions = [:]

versions.folioreaderSdk = "0.5.4"
versions.folioreaderSdk = "1.0.1-local"
versions.r2SharedKotlin = "1.0.4-2"
versions.r2StreamerKotlin = "1.0.4-2"

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"
Expand Down