Merge branch 'master' of github.com:FolioReader/FolioReader-Android

FolioReader · Nov 29, 2017 · 68fe717 · 68fe717
2 parents 32bd17d + 93a1fc2
commit 68fe717
Show file tree

Hide file tree

Showing 49 changed files with 407 additions and 304 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,13 @@
 language: android
 
-before_install:
-    - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
-    - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
-
 android:
   components:
     - tools
-    - build-tools-23.0.2
-    - android-23
+    - build-tools-27.0.0
+    - build-tools-26.0.2
+    - android-27
+    - android-19
     - extra-android-m2repository
 
-  licenses:
-    - android-sdk-license-.+
-
 script:
   ./gradlew checkstyle build
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ FolioReader-Android is an ePub reader and parser framework written in Java.
 ### Gradle
 Add following dependency to your app build.gradle
 ``` java
-compile 'com.folioreader:folioreader:0.3.1'
+compile 'com.folioreader:folioreader:0.3.2'
 ```
 
 ### Usage

diff --git a/ViewPager/build.gradle b/ViewPager/build.gradle
@@ -5,12 +5,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.0"
 
     defaultConfig {
-        minSdkVersion 7
-        targetSdkVersion 19
+        minSdkVersion 14
+        targetSdkVersion 27
     }
 
     compileOptions {
@@ -20,5 +20,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:18.0.0'
+    compile 'com.android.support:appcompat-v7:27.0.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -4,11 +4,15 @@ buildscript {
         maven {
             url  "http://dl.bintray.com/mobisystech/maven"
         }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 
@@ -18,5 +22,9 @@ allprojects {
         maven {
             url  "http://dl.bintray.com/mobisystech/maven"
         }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle
@@ -18,7 +18,7 @@ dependencies {
     checkstyle 'com.puppycrawl.tools:checkstyle:6.5'
 }
 
-def qualityConfigDir = "$project.rootDir/config/quality";
+def qualityConfigDir = "$project.rootDir/config/quality"
 def reportsDir = "$project.buildDir/reports"
 
 check.dependsOn 'checkstyle', 'findbugs', 'pmd'

diff --git a/folioreader/bintray/bintrayv1.gradle b/folioreader/bintray/bintrayv1.gradle
@@ -30,30 +30,35 @@ artifacts {
 }
 
 // Bintray
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        name = bintrayName
-        desc = libraryDescription
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = allLicenses
-        publish = true
-        publicDownloadNumbers = true
-        version {
+def propertiesFile = project.rootProject.file('local.properties')
+if( propertiesFile.exists()) {
+    Properties properties = new Properties()
+    properties.load(propertiesFile.newDataInputStream())
+
+    bintray {
+        user = properties.getProperty("bintray.user")
+        key = properties.getProperty("bintray.apikey")
+
+        configurations = ['archives']
+        pkg {
+            repo = bintrayRepo
+            name = bintrayName
             desc = libraryDescription
-            gpg {
-                sign = true //Determines whether to GPG sign the files. The default is false
-                passphrase = properties.getProperty("bintray.gpg.password")
-                //Optional. The passphrase for GPG signing'
+            websiteUrl = siteUrl
+            vcsUrl = gitUrl
+            licenses = allLicenses
+            publish = true
+            publicDownloadNumbers = true
+            version {
+                desc = libraryDescription
+                gpg {
+                    sign = true //Determines whether to GPG sign the files. The default is false
+                    passphrase = properties.getProperty("bintray.gpg.password")
+                    //Optional. The passphrase for GPG signing'
+                }
             }
         }
     }
-}
+} else {
+    logger.info("local.properties does not exist. Skipping Bintray.")
+}
diff --git a/folioreader/build.gradle b/folioreader/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply from: '../config/quality/quality.gradle'
+apply plugin: 'com.github.dcendents.android-maven'
 
 ext {
     bintrayRepo = 'maven'
@@ -27,14 +28,14 @@ ext {
 
 android {
     useLibrary 'org.apache.http.legacy'
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.0"
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 27
     }
 
     sourceSets {
@@ -81,8 +82,9 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':webViewMarker')
 
-    final ANDROID_LIB_VERSION = '26.0.0-alpha1'
+    final ANDROID_LIB_VERSION = '27.0.0'
 
+    //noinspection GradleDependency
     compile "com.android.support:appcompat-v7:$ANDROID_LIB_VERSION"
     compile "com.android.support:recyclerview-v7:$ANDROID_LIB_VERSION"
     compile "com.android.support:support-v4:$ANDROID_LIB_VERSION"

diff --git a/folioreader/res/layout/row_table_of_contents.xml b/folioreader/res/layout/row_table_of_contents.xml
@@ -17,5 +17,5 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        app:font="SanFranciscoText-Regular.otf" />
+        app:folio_font="SanFranciscoText-Regular.otf" />
 </LinearLayout>
diff --git a/folioreader/res/layout/view_audio_player.xml b/folioreader/res/layout/view_audio_player.xml
@@ -80,7 +80,7 @@
             android:gravity="center"
             android:text="@string/half_speed"
             android:textSize="14sp"
-            app:font="@string/andada_font" />
+            app:folio_font="@string/andada_font" />
 
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_one_x_speed"
@@ -90,7 +90,7 @@
             android:gravity="center"
             android:text="@string/onex"
             android:textSize="17sp"
-            app:font="@string/lato_font" />
+            app:folio_font="@string/lato_font" />
 
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_one_and_half_speed"
@@ -100,7 +100,7 @@
             android:gravity="center"
             android:text="@string/one_and_half"
             android:textSize="14sp"
-            app:font="@string/lora_font" />
+            app:folio_font="@string/lora_font" />
 
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_twox_speed"
@@ -110,7 +110,7 @@
             android:gravity="center"
             android:text="@string/two_x"
             android:textSize="17sp"
-            app:font="@string/raleway_font" />
+            app:folio_font="@string/raleway_font" />
     </LinearLayout>
 
     <View
@@ -134,7 +134,7 @@
             android:gravity="center"
             android:text="@string/style"
             android:textSize="17sp"
-            app:font="@string/lato_font" />
+            app:folio_font="@string/lato_font" />
 
         <View
             android:id="@+id/third_separator"
@@ -152,7 +152,7 @@
             android:layerType="software"
             android:text="@string/style_underline"
             android:textSize="17sp"
-            app:font="@string/lora_font" />
+            app:folio_font="@string/lora_font" />
 
         <View
             android:id="@+id/fourth_separator"
@@ -168,7 +168,7 @@
             android:gravity="center"
             android:text="@string/style"
             android:textSize="17sp"
-            app:font="@string/raleway_font" />
+            app:folio_font="@string/raleway_font" />
 
     </LinearLayout>
 

diff --git a/folioreader/res/layout/view_config.xml b/folioreader/res/layout/view_config.xml
@@ -47,7 +47,7 @@
             android:gravity="center"
             android:text="@string/andada"
             android:textSize="17sp"
-            app:font="@string/andada_font" />
+            app:folio_font="@string/andada_font" />
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_font_lato"
             android:layout_width="0dp"
@@ -56,7 +56,7 @@
             android:gravity="center"
             android:text="@string/lato"
             android:textSize="17sp"
-            app:font="@string/lato_font" />
+            app:folio_font="@string/lato_font" />
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_font_lora"
             android:layout_width="0dp"
@@ -65,7 +65,7 @@
             android:gravity="center"
             android:text="@string/lora"
             android:textSize="17sp"
-            app:font="@string/lora_font" />
+            app:folio_font="@string/lora_font" />
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_font_raleway"
             android:layout_width="0dp"
@@ -74,7 +74,7 @@
             android:gravity="center"
             android:text="@string/raleway"
             android:textSize="17sp"
-            app:font="@string/raleway_font" />
+            app:folio_font="@string/raleway_font" />
     </LinearLayout>
     <View
         android:id="@+id/second_separator"
@@ -136,7 +136,7 @@
             android:text="vertical"
             android:textColor="@drawable/font_text_selector"
             android:textSize="17sp"
-            app:font="@string/andada_font" />
+            app:folio_font="@string/andada_font" />
         <com.folioreader.view.StyleableTextView
             android:id="@+id/btn_horizontal_orentation"
             android:layout_width="0dp"
@@ -146,6 +146,6 @@
             android:text="horizontal"
             android:textColor="@drawable/font_text_selector"
             android:textSize="17sp"
-            app:font="@string/lato_font" />
+            app:folio_font="@string/lato_font" />
            </LinearLayout>
 </RelativeLayout>
diff --git a/folioreader/res/values/attrs.xml b/folioreader/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="StyleableTextView">
-        <attr name="font" format="string"/>
+        <attr name="folio_font" format="string"/>
     </declare-styleable>
 
     <declare-styleable name="DirectionalViewpager">

diff --git a/folioreader/res/values/styles.xml b/folioreader/res/values/styles.xml
@@ -12,46 +12,46 @@
     <style name="Animations.PopDownMenu" />
 
     <style name="Animations.PopDownMenu.Center">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_top</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_bottom</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_top</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_bottom</item>
     </style>
 
     <style name="Animations.PopDownMenu.Left">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item>
     </style>
 
     <style name="Animations.PopDownMenu.Right">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item>
     </style>
 
     <style name="Animations.PopDownMenu.Reflect">
-        <item name="@android:windowEnterAnimation">@anim/pump_top</item>
-        <item name="@android:windowExitAnimation">@anim/disappear</item>
+        <item name="android:windowEnterAnimation">@anim/pump_top</item>
+        <item name="android:windowExitAnimation">@anim/disappear</item>
     </style>
 
     <!-- PopUpMenu -->
     <style name="Animations.PopUpMenu" />
 
     <style name="Animations.PopUpMenu.Center">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_bottom</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_top</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_bottom</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_top</item>
     </style>
 
     <style name="Animations.PopUpMenu.Left">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item>
     </style>
 
     <style name="Animations.PopUpMenu.Right">
-        <item name="@android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item>
-        <item name="@android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item>
+        <item name="android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item>
+        <item name="android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item>
     </style>
 
     <style name="Animations.PopUpMenu.Reflect">
-        <item name="@android:windowEnterAnimation">@anim/pump_bottom</item>
-        <item name="@android:windowExitAnimation">@anim/disappear</item>
+        <item name="android:windowEnterAnimation">@anim/pump_bottom</item>
+        <item name="android:windowExitAnimation">@anim/disappear</item>
     </style>
 
     <declare-styleable name="UnderlinedTextView">