Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #275 from readium/develop
Browse files Browse the repository at this point in the history 
V2.1.0-beta.4
  • Loading branch information
@aferditamuriqi
aferditamuriqi authored Jan 11, 2020
2 parents acfbaea + 46c20ee commit 0944b8b
Show file tree
Hide file tree
Showing 106 changed files with 5,855 additions and 8,832 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @aferditamuriqi
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/build
/captures
.externalNativeBuild
*.aab
r2-testapp/release
5 changes: 2 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.31'
ext.r2branch = 'develop'
ext.kotlin_version = '1.3.61'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
101 changes: 42 additions & 59 deletions r2-testapp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.github.dcendents.android-maven'
group='com.github.readium'
group = 'com.github.readium'


int major = 2
int minor = 0
int patch = 2
int build = 12
int minor = 1
int patch = 0
int build = 23
String type = ""

def version = "$major.$minor.$patch"
Expand All @@ -35,71 +35,46 @@ project.ext.versionCode = 1_000_000 * major + 10_000 * minor + 100 * patch + bui


android {
flavorDimensions "testapp"

compileSdkVersion 28
signingConfigs {
release {
keyAlias 'EDRLab'
keyPassword '### '
storeFile file('/###')
storePassword '### '
}
compileSdkVersion 29
//Error: Invoke-customs are only supported starting with Android O (--min-api 26)
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId "org.readium.r2reader"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 29
versionCode project.ext.versionCode
versionName project.ext.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
}
packagingOptions {
exclude 'META-INF/*'
}
productFlavors {
intTestapp {
dimension "testapp"
}
intTestappWithLcp {
dimension "testapp"
}
devTestapp {
dimension "testapp"
}
devTestappWithLcp {
dimension "testapp"
}
}

// default build flavour
defaultPublishConfig "intTestappDebug"

sourceSets {
main {
java.srcDirs = ['src/main/java']
res.srcDirs = ['src/main/res']
assets.srcDirs = ['src/main/assets']
}
intTestapp {
java.srcDirs = ['src/main/java', 'src/nondrm/java']
}
devTestapp {
java.srcDirs = ['src/main/java', 'src/nondrm/java']
}
intTestappWithLcp {
java.srcDirs = ['src/main/java', 'src/withlcp/java']
}
devTestappWithLcp {
java.srcDirs = ['src/main/java', 'src/withlcp/java']
if (findProject(':r2-lcp')) {
java.srcDirs = ['src/main/java', 'src/withlcp/java']
} else {
java.srcDirs = ['src/main/java', 'src/nondrm/java']
}
}
}
}
Expand All @@ -111,22 +86,22 @@ dependencies {
if (findProject(':r2-shared')) {
implementation project(':r2-shared')
} else {
implementation "com.github.readium:r2-shared-kotlin:1.0.10"
implementation "com.github.readium:r2-shared-kotlin:1.1.6"
}
if (findProject(':r2-navigator')) {
implementation project(':r2-navigator')
} else {
implementation "com.github.readium:r2-navigator-kotlin:1.0.10"
implementation "com.github.readium:r2-navigator-kotlin:1.1.5"
}
if (findProject(':r2-streamer')) {
implementation project(':r2-streamer')
} else {
implementation "com.github.readium:r2-streamer-kotlin:1.0.10"
implementation "com.github.readium:r2-streamer-kotlin:1.1.5"
}
if (findProject(':r2-opds')) {
implementation project(':r2-opds')
} else {
implementation "com.github.readium:r2-opds-kotlin:1.0.9"
implementation "com.github.readium:r2-opds-kotlin:1.1.4"
}
if (findProject(':r2-lcp')) {
implementation project(':r2-lcp')
Expand All @@ -140,15 +115,22 @@ dependencies {
exclude module: 'support-v4'
}

implementation "androidx.appcompat:appcompat:1.1.0-beta01"
implementation "androidx.recyclerview:recyclerview:1.1.0-alpha06"
implementation "androidx.appcompat:appcompat:1.2.0-alpha01"
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "com.google.android.material:material:1.1.0-alpha07"
implementation 'androidx.webkit:webkit:1.1.0'
implementation "com.google.android.material:material:1.2.0-alpha03"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'org.nanohttpd:nanohttpd:2.3.2-SNAPSHOT'
implementation 'org.nanohttpd:nanohttpd-nanolets:2.3.2-SNAPSHOT'

implementation 'com.google.code.gson:gson:2.8.2'
implementation ('com.github.edrlab.nanohttpd:nanohttpd-nanolets:2.3.2') {
exclude group: 'org.parboiled'
}

implementation ('com.github.edrlab.nanohttpd:nanohttpd:2.3.2') {
exclude group: 'org.parboiled'
}

implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'io.reactivex.rxjava2:rxjava:2.1.8'
implementation 'org.jetbrains.anko:anko-design:0.10.8'
Expand Down Expand Up @@ -183,19 +165,20 @@ dependencies {
implementation "nl.komponents.kovenant:kovenant-jvm:$KOVENANT_VERSION"
implementation "nl.komponents.kovenant:kovenant-functional:$KOVENANT_VERSION"

implementation 'org.zeroturnaround:zt-zip:1.12'
implementation 'org.zeroturnaround:zt-zip:1.13'
implementation 'joda-time:joda-time:2.9.9'
implementation 'org.slf4j:slf4j-nop:1.7.25'

implementation 'com.duolingo.open:rtl-viewpager:1.0.3'
implementation 'androidx.viewpager2:viewpager2:1.0.0-alpha05'
implementation 'androidx.viewpager2:viewpager2:1.0.0'

implementation 'com.commonsware.cwac:merge:1.1.2'
implementation 'com.github.abacritt:sectionedmergeadapter:0.2'
implementation 'org.jsoup:jsoup:1.11.2'
implementation 'org.jsoup:jsoup:1.10.3'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"

}
94 changes: 62 additions & 32 deletions r2-testapp/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,60 +25,83 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup"
tools:targetApi="m">
<activity android:name=".CatalogActivity">
<activity android:name=".CatalogActivity"
android:configChanges="orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".R2DispatcherActivity"
android:name=".utils.R2DispatcherActivity"
android:launchMode="singleInstance"
android:noHistory="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="content" />
<data android:scheme="file" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="app" />
<data android:host="*" />
<data android:pathPattern=".*\.epub" />
<data android:pathPattern=".*\.lcpl" />
<data android:pathPattern=".*\.cbz" />
<data android:mimeType="application/epub+zip" />
<data android:mimeType="application/x-cbz" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.epub" android:scheme="content"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:mimeType="application/epub+zip" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.epub"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="*" />
<data android:pathPattern=".*\.epub" />
<data android:pathPattern=".*\.lcpl" />
<data android:pathPattern=".*\.cbz" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.lcpl" android:scheme="content"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.lcpl"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.divina" android:scheme="content"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.divina"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.audiobook" android:scheme="content"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.audiobook"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.cbz" android:scheme="content" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.cbz"/>
</intent-filter>

</activity>
<activity
android:name=".opds.OPDSCatalogActivity"
Expand All @@ -87,23 +110,30 @@
android:name=".R2AboutActivity"
android:label="@string/title_activity_r2_about" />
<activity
android:name=".R2EpubActivity"
android:name=".epub.EpubActivity"
android:label="@string/title_activity_epub" />
<activity
android:name=".comic.DiViNaActivity"
android:label="@string/title_activity_epub" />
<activity
android:name=".comic.ComicActivity"
android:label="@string/title_activity_epub" />
<activity
android:name=".DRMManagementActivity"
android:label="DRM Management"
android:theme="@style/AppTheme"/>
android:theme="@style/AppTheme" />
<activity
android:name=".R2OutlineActivity"
android:name=".outline.R2OutlineActivity"
android:label="@string/title_activity_outline" />
<activity
android:name=".opds.OPDSListActivity"
android:label="@string/title_activity_opds_list" />
<activity
android:name=".opds.OPDSDetailActivity"
android:label="@string/title_activity_opds_detail" />
<activity android:name=".audiobook.AudiobookActivity" />

<activity
android:name=".audiobook.AudiobookActivity"
android:label="@string/title_activity_epub" />
</application>

</manifest>
Loading

0 comments on commit 0944b8b

Please sign in to comment.