Merge pull request #206 from codetoart/master

used Zip4j library and bug fixed

.travis.yml

@@ -6,8 +6,8 @@ before_install:
 
 android:
   components:
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.3
+    - android-27
     - android-19
     - extra-android-m2repository
 

README.md

@@ -37,7 +37,7 @@ FolioReader-Android is an ePub reader written in Java.
 ### Gradle
 Add following dependency to your app build.gradle
 ``` java
-compile 'com.folioreader:folioreader:0.3.8'
+compile 'com.folioreader:folioreader:0.3.9'
 ```
 
 Add maven repository to your top level build.gradle

build.gradle

@@ -1,4 +1,10 @@
 buildscript {
+    ext.KOTLIN_VERSION= '1.2.41'
+
+    ext.ANDROID_LIB_VERSION = '27.1.1'
+    ext.R2_STREAMER_VERSION = '0.1.5'
+    def KOTLIN_VERSION = ext.KOTLIN_VERSION
+
     repositories {
         jcenter()
         maven {
@@ -10,9 +16,11 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$KOTLIN_VERSION"
     }
 }
 

folioreader/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply from: '../config/quality/quality.gradle'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 ext {
     bintrayRepo = 'maven'
@@ -15,7 +17,7 @@ ext {
     siteUrl = 'https://github.com/FolioReader/FolioReader-Android'
     gitUrl = 'https://github.com/FolioReader/FolioReader-Android.git'
 
-    libraryVersion = '0.3.8'
+    libraryVersion = '0.3.9'
 
     developerId = 'mobisystech'
     developerName = 'Folio Reader'
@@ -28,14 +30,14 @@ ext {
 
 android {
     useLibrary 'org.apache.http.legacy'
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 27
     }
 
     sourceSets {
@@ -78,28 +80,29 @@ android {
     }
 }
 
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':webViewMarker')
 
-    final ANDROID_LIB_VERSION = '26.0.2'
+apply from: '../folioreader/bintray/installv1.gradle'
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':webViewMarker')
 
     //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"
-    compile "com.android.support:design:$ANDROID_LIB_VERSION"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation "com.android.support:appcompat-v7:$ANDROID_LIB_VERSION"
+    implementation "com.android.support:recyclerview-v7:$ANDROID_LIB_VERSION"
+    implementation "com.android.support:support-v4:$ANDROID_LIB_VERSION"
+    implementation "com.android.support:design:$ANDROID_LIB_VERSION"
 
-    compile 'com.daimajia.swipelayout:library:1.2.0@aar'
-    // r2-streamer
-    final R2_STREAMER_VERSION = '0.1.4'
+    implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
 
-    compile "org.readium:r2-fetcher:$R2_STREAMER_VERSION"
-    compile "org.readium:r2-parser:$R2_STREAMER_VERSION"
-    compile "org.readium:r2-server:$R2_STREAMER_VERSION"
+    //Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
 
-    compile 'org.greenrobot:eventbus:3.1.1'
-}
+    // r2-streamer
+    api "org.readium:r2-fetcher:$R2_STREAMER_VERSION"
+    api "org.readium:r2-parser:$R2_STREAMER_VERSION"
+    api "org.readium:r2-server:$R2_STREAMER_VERSION"
 
-apply from: '../folioreader/bintray/installv1.gradle'
+    implementation 'org.greenrobot:eventbus:3.1.1'
+}
 apply from: '../folioreader/bintray/bintrayv1.gradle'

folioreader/res/layout/folio_activity.xml

@@ -12,102 +12,14 @@
         android:layout_height="match_parent"
         app:direction="vertical" />
 
-    <android.support.v7.widget.Toolbar
+    <com.folioreader.view.FolioToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_margin="0dp"
-        android:alpha="0.8"
-        android:background="@color/white"
-        android:contentInsetEnd="0dp"
-        android:contentInsetLeft="0dp"
-        android:contentInsetRight="0dp"
-        android:contentInsetStart="0dp"
-        android:padding="0dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:contentInsetEnd="0dp"
-        app:contentInsetLeft="0dp"
-        app:contentInsetRight="0dp"
-        app:contentInsetStart="0dp">
+        android:layout_height="?android:attr/actionBarSize" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/btn_close"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
-                    android:src="@drawable/ic_close_green_24dp" />
-
-                <ImageView
-                    android:id="@+id/btn_drawer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginTop="16dp"
-                    android:src="@drawable/ic_drawer_green_24dp" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/lbl_center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginEnd="96dp"
-                android:layout_marginStart="96dp"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="Folio Reader"
-                android:textColor="@android:color/black"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/btn_config"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/icon_font" />
-
-                <ImageView
-                    android:id="@+id/btn_speaker"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
-                    android:src="@drawable/man_speech_icon" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:layout_alignParentBottom="true"
-                android:background="@android:color/black" />
-        </RelativeLayout>
-    </android.support.v7.widget.Toolbar>
-
-    <RelativeLayout
+    <com.folioreader.view.MediaControllerView
+        android:id="@+id/media_controller_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/shade"
-        android:visibility="gone"
-        android:background="#99000000">
+        android:layout_height="match_parent" />
 
-        <include layout="@layout/view_audio_player" />
-    </RelativeLayout>
 </RelativeLayout>

folioreader/res/layout/folio_toolbar.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:id="@+id/toolbar_container"
+    android:layout_height="?android:attr/actionBarSize">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/btn_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_close_green_24dp" />
+
+        <ImageView
+            android:id="@+id/btn_drawer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:src="@drawable/ic_drawer_green_24dp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/label_center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginEnd="96dp"
+        android:layout_marginStart="96dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textColor="@android:color/black"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        tool:text="Folio Reader" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/btn_config"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/icon_font" />
+
+        <ImageView
+            android:id="@+id/btn_speaker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:src="@drawable/man_speech_icon" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_alignParentBottom="true"
+        android:background="@android:color/black" />
+</RelativeLayout>