Skip to content

Code refactor #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahavir155 merged 2 commits into from
May 10, 2018
Merged

Code refactor #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591f4e8
update gradle and android sdk version
GautamChibde May 9, 2018
ad4b823
added custom view for media controller
GautamChibde May 10, 2018
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
12 changes: 10 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
buildscript {
ext.KOTLIN_VERSION= '1.2.41'

ext.ANDROID_LIB_VERSION = '27.1.1'
ext.R2_STREAMER_VERSION = '0.1.4'
def KOTLIN_VERSION = ext.KOTLIN_VERSION

repositories {
jcenter()
maven {
Expand All @@ -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"
}
}

Expand Down
42 changes: 22 additions & 20 deletions folioreader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -78,28 +80,28 @@ 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: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'
10 changes: 3 additions & 7 deletions folioreader/res/layout/folio_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,9 @@
</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>
Loading