Merge branch 'central-dev' into central-master

# Conflicts: # app/build.gradle # app/src/main/java/me/devsaki/hentoid/parsers/content/NhentaiContent.java
avluis · Jul 25, 2019 · fc5bd8a · fc5bd8a
2 parents 88ddf06 + 3295710
commit fc5bd8a
Show file tree

Hide file tree

Showing 369 changed files with 7,986 additions and 4,762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ app/**/output.json
 # Gradle files
 .gradle/
 build/
-/gradle.properties
 
 # Generated files
 bin/

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,20 +8,18 @@ if (file('signing.gradle').exists()) {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
         applicationId "me.devsaki.hentoid"
-        minSdkVersion 15
-        // Hold updating targetSdkVersion until implementing an image viewer
-        // or Perfect Viewer implements Content URI
+        minSdkVersion 19
         //noinspection ExpiringTargetSdkVersion
-        targetSdkVersion 23
-        versionCode 108
-        versionName '1.7.6'
+        targetSdkVersion 28
+        versionCode 110 // is updated automatically by BitRise; only used when building locally
+        versionName '1.8.4'
 
         def fkToken =  '\"' + (System.getenv("FK_TOKEN")?: "")+'\"'
         def includeObjectBoxBrowser = System.getenv("INCLUDE_OBJECTBOX_BROWSER")?:"false"
@@ -66,26 +64,29 @@ dependencies {
     implementation project(':fakkuLib')
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     // Firebase
-    implementation 'com.google.firebase:firebase-core:16.0.6'
+    implementation 'com.google.firebase:firebase-core:17.0.0'
 
     // Crashlytics
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
     // Stetho core
 //    implementation 'com.facebook.stetho:stetho:1.5.0'
     // Support libraries
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:exifinterface:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:preference-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.google.android.gms:play-services-safetynet:16.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    //implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha08'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.media:media:1.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
 
     // <-- this one to fix the SSLHandshake error with okhttp on Android 4.1-4.4 when server only supports TLS1.2
 
@@ -95,7 +96,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0'
 
     // Intro screens or slides: github.com/apl-devs/AppIntro
-    implementation 'com.github.apl-devs:appintro:v4.2.3'
+    implementation 'com.github.paolorotolo:appintro:v5.1.0'
 
     // Java serialization/deserialization (Java Objects into JSON and back): github.com/google/gson
     implementation 'com.google.code.gson:gson:2.8.5'
@@ -110,9 +111,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
 
     // For downloading images : github.com/google/volley
-    implementation 'com.android.volley:volley:1.1.1'
-
-    // <-- if this evolves, please examine RequestQueueManager.getRequestQueue for evolutions
+    implementation 'com.android.volley:volley:1.1.1' // <-- if this evolves, please examine RequestQueueManager.getRequestQueue for evolutions
 
     // EventBus: github.com/greenrobot/EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
@@ -132,9 +131,7 @@ dependencies {
 */
 
     // Specific UI layout for tag mosaic : github.com/google/flexbox-layout
-    implementation 'com.google.android:flexbox:1.0.0'
-
-    // <- dont upgrade that until the entire app switches to AndroidX
+    implementation 'com.google.android:flexbox:1.1.0'
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation 'commons-io:commons-io:2.6'
@@ -153,8 +150,8 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
 
     // For ViewModel to work
-    implementation "android.arch.lifecycle:extensions:1.1.1"
-    implementation "android.arch.lifecycle:viewmodel:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
 
     // ObjectBox browser dependencies must be set before applying ObjectBox plugin so it does not add objectbox-android
     // (would result in two conflicting versions, e.g. "Duplicate files copied in APK lib/armeabi-v7a/libobjectbox.so").
@@ -165,6 +162,11 @@ dependencies {
 
     // https://github.com/davemorrissey/subsampling-scale-image-view
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
+    //implementation 'com.github.hereisderek:subsampling-scale-image-view:v3.10.2' // Compatible with AndroidX; crashes at resetScaleAndCenter
+
+    // https://github.com/davideas/FlexibleAdapter
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
 }
 
 sonarqube {

diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json
@@ -27,7 +27,7 @@
     },
     {
       "id": "2:5880334030341287801",
-      "lastPropertyId": "18:9117635469382092615",
+      "lastPropertyId": "19:326862264253525250",
       "name": "Content",
       "properties": [
         {
@@ -101,6 +101,10 @@
         {
           "id": "18:9117635469382092615",
           "name": "isBeingDeleted"
+        },
+        {
+          "id": "19:326862264253525250",
+          "name": "jsonUri"
         }
       ],
       "relations": [
@@ -112,7 +116,7 @@
     },
     {
       "id": "3:2849837771881495731",
-      "lastPropertyId": "7:8627441942081468691",
+      "lastPropertyId": "9:3938664550318760597",
       "name": "ImageFile",
       "properties": [
         {
@@ -143,6 +147,10 @@
         {
           "id": "7:8627441942081468691",
           "name": "downloadParams"
+        },
+        {
+          "id": "9:3938664550318760597",
+          "name": "favourite"
         }
       ],
       "relations": []
@@ -252,7 +260,8 @@
     7592738185335406663,
     2516142253958987500,
     7452586865244450379,
-    7159239942191071387
+    7159239942191071387,
+    6300283326491520978
   ],
   "retiredRelationUids": [
     4182320255043105081,

diff --git a/app/src/androidTest/java/me/devsaki/hentoid/ApplicationTest.java b/app/src/androidTest/java/me/devsaki/hentoid/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
         <activity
             android:name=".activities.SplashActivity"
             android:noHistory="true"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/AppTheme.NoActionBar.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -32,49 +32,53 @@
         <activity
             android:name=".activities.IntroActivity"
             android:label="@string/app_intro"
-            android:theme="@style/AppTheme.TaupeBackground" />
+            android:theme="@style/AppTheme" />
         <activity
-            android:name=".activities.websites.HitomiActivity"
+            android:name=".activities.sources.HitomiActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.NhentaiActivity"
+            android:name=".activities.sources.NhentaiActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.TsuminoActivity"
+            android:name=".activities.sources.TsuminoActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.ASMHentaiActivity"
+            android:name=".activities.sources.ASMHentaiActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.HentaiCafeActivity"
+            android:name=".activities.sources.HentaiCafeActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.PururinActivity"
+            android:name=".activities.sources.PururinActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.PandaActivity"
+            android:name=".activities.sources.EHentaiActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.EHentaiActivity"
+            android:name=".activities.sources.FakkuActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
-            android:name=".activities.websites.FakkuActivity"
+            android:name=".activities.sources.NexusActivity"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/BrowserTheme" />
+        <activity
+            android:name=".activities.sources.MusesActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/BrowserTheme" />
         <activity
             android:name=".activities.DownloadsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_downloads"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.Downloads">
+            android:theme="@style/AppTheme.NoActionBar.Overlay">
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
@@ -84,7 +88,7 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_mikan"
             android:parentActivityName=".activities.DownloadsActivity"
-            android:theme="@style/AppTheme.Mikan"
+            android:theme="@style/AppTheme"
             tools:ignore="UnusedAttribute">
             <meta-data
                 android:name="android.app.searchable"
@@ -98,7 +102,7 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_queue"
             android:parentActivityName=".activities.DownloadsActivity"
-            android:theme="@style/AppTheme.TaupeBackground"
+            android:theme="@style/AppTheme"
             tools:ignore="UnusedAttribute">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -109,7 +113,7 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_preferences"
             android:parentActivityName=".activities.DownloadsActivity"
-            android:theme="@style/PrefsThemeDark"
+            android:theme="@style/PrefsTheme"
             tools:ignore="UnusedAttribute">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -128,7 +132,7 @@
         <activity
             android:name=".activities.SearchActivity"
             android:label="@string/title_activity_search"
-            android:theme="@style/AppTheme.Search"
+            android:theme="@style/AppTheme.NoActionBar"
             tools:ignore="UnusedAttribute">
         </activity>
         <activity
@@ -140,12 +144,12 @@
             android:noHistory="true"
             android:resizeableActivity="false"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.TaupeBackgroundNoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.PinPreferenceActivity"
             android:resizeableActivity="false"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Search" />
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.IntentActivity"
             android:theme="@style/BrowserTheme">
@@ -236,40 +240,48 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Accepts URIs that begin with "https://mangapanda.com/" -->
+                <!-- Accepts URIs that begin with "https://e-hentai.org/" -->
                 <data
-                    android:host="www.mangapanda.com"
-                    android:pathPrefix="/"
+                    android:host="e-hentai.org"
+                    android:pathPrefix="/g/"
                     android:scheme="https" />
             </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" />
-                <!-- Accepts URIs that begin with "https://e-hentai.org/" -->
                 <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g/"
+                    android:host="fakku.net"
+                    android:pathPrefix="/hentai/"
                     android:scheme="https" />
             </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" />
-                <!-- Accepts URIs that begin with "https://e-hentai.org/" -->
                 <data
-                    android:host="fakku.net"
-                    android:pathPrefix="/hentai/"
+                    android:host="hentainexus.com"
+                    android:pathPrefix="/view/"
+                    android:scheme="https" />
+            </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="8muses.com"
+                    android:pathPrefix="/comics/album/"
                     android:scheme="https" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".activities.ImageViewerActivity"
             android:label="Image Viewer"
-            android:theme="@style/AppTheme.NoActionBar.viewer">
+            android:theme="@style/AppTheme.NoActionBar.Monochrome">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.DownloadsActivity" />
@@ -293,7 +305,7 @@
         <receiver android:name=".receiver.DownloadNotificationDeleteReceiver" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/app/src/main/assets/licenses.html b/app/src/main/assets/licenses.html
@@ -2928,7 +2928,7 @@ <h3>Notices for files:</h3>
 </ul>
 	<pre>The MIT License
 
-Copyright (c) 2009-2018 Jonathan Hedley <jonathan@hedley.net>
+Copyright (c) 2009-2018 Jonathan Hedley <a href="jonathan@hedley.net">jonathan@hedley.net</a>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal