v1.0.3-alpha New site to format :D

shosetsuorg · Jun 11, 2019 · 126d34c · 126d34c
1 parent 2464984
commit 126d34c
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 23 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion var
         targetSdkVersion 28
         versionCode 1
-        versionName "v1.0.2-alpha"
+        versionName "v1.0.3-alpha"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -31,13 +31,13 @@ android.applicationVariants.all { variant ->
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta1'
+    //noinspection GradleCompatible
     implementation 'com.android.support:design:28.0.0'
     testImplementation 'junit:junit:4.13-beta-3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.android.support:gridlayout-v7:28.0.0'
-    implementation 'com.github.Doomsdayrs:novelreader-core:v1.0.6'
-    implementation 'com.github.Doomsdayrs:novelreader-extensions:v1.0.5'
+    implementation 'com.github.Doomsdayrs:novelreader-core:v1.0.7'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'org.jetbrains:annotations:15.0'
 }
diff --git a/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson b/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
@@ -1 +1 @@
-[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"}]
+[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"}]
diff --git a/...ermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/...ermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     package="com.github.Doomsdayrs.apps.shosetsu"
     android:versionCode="1"
-    android:versionName="v1.0.2-alpha" >
+    android:versionName="v1.0.3-alpha" >
 
     <uses-sdk
         android:minSdkVersion="24"

diff --git a/...uild/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json b/...uild/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
+[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
diff --git a/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -4,7 +4,7 @@
     package="com.github.Doomsdayrs.apps.shosetsu"
     android:targetSandboxVersion="2"
     android:versionCode="1"
-    android:versionName="v1.0.2-alpha" >
+    android:versionName="v1.0.3-alpha" >
 
     <uses-sdk
         android:minSdkVersion="24"

diff --git a/app/build/intermediates/instant_app_manifest/debug/output.json b/app/build/intermediates/instant_app_manifest/debug/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
+[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
diff --git a/app/build/intermediates/instant_run_merged_manifests/debug/output.json b/app/build/intermediates/instant_run_merged_manifests/debug/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     package="com.github.Doomsdayrs.apps.shosetsu"
     android:versionCode="1"
-    android:versionName="v1.0.2-alpha" >
+    android:versionName="v1.0.3-alpha" >
 
     <uses-sdk
         android:minSdkVersion="24"

diff --git a/app/build/intermediates/merged_manifests/debug/output.json b/app/build/intermediates/merged_manifests/debug/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
diff --git a/app/build/intermediates/merged_manifests/debugAndroidTest/output.json b/app/build/intermediates/merged_manifests/debugAndroidTest/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"app-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"},"path":"AndroidManifest.xml","properties":{}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"app-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"},"path":"AndroidManifest.xml","properties":{}}]
diff --git a/...ediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json b/...ediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]
+[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]
diff --git a/app/src/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/CataloguesFragment.java b/app/src/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/CataloguesFragment.java
@@ -64,10 +64,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         if (cards == null) {
             cards = new ArrayList<>();
             for (Formatter formatter : DefaultScrapers.formatters) {
-                String imageURL = formatter.getImageURL();
-                if (imageURL == null) {
-                    cards.add(new CatalogueCard(formatter));
-                }
+                cards.add(new CatalogueCard(formatter));
+
             }
         }
         fragmentManager = getFragmentManager();

diff --git a/...c/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/novel/NovelFragmentChapters.java b/...c/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/novel/NovelFragmentChapters.java
@@ -16,7 +16,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.github.Doomsdayrs.api.novelreader_core.extensions.lang.en.novel_full.NovelFull;
 import com.github.Doomsdayrs.api.novelreader_core.services.core.dep.Formatter;
 import com.github.Doomsdayrs.api.novelreader_core.services.core.objects.NovelChapter;
 import com.github.Doomsdayrs.api.novelreader_core.services.core.objects.NovelPage;
@@ -83,15 +82,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         recyclerView = view.findViewById(R.id.fragment_novel_chapters_recycler);
         setNovels(novelChapters);
         this.context = Objects.requireNonNull(container).getContext();
-        Log.d("OnCreate","Complete");
+        Log.d("OnCreate", "Complete");
         return view;
     }
 
     public void setNovels(List<NovelChapter> novels) {
         recyclerView.setHasFixedSize(false);
         layoutManager = new LinearLayoutManager(context);
 
-        adapter = new NovelChaptersAdapter(this,novels, fragmentManager, formatter);
+        adapter = new NovelChaptersAdapter(this, novels, fragmentManager, formatter);
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.addOnScrollListener(new bottom(this));
         recyclerView.setAdapter(adapter);
@@ -148,18 +147,18 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
 
             if (!running)
                 if (!novelFragmentChapters.recyclerView.canScrollVertically(1)) {
-                    Log.d("NovelFragmentsScrollLoad","Loading...");
+                    Log.d("NovelFragmentsScrollLoad", "Loading...");
                     running = true;
                     novelFragmentChapters.currentMaxPage++;
                     try {
                         if (new addMore(novelFragmentChapters).execute(novelFragmentChapters.currentMaxPage).get())
-                            novelFragmentChapters.adapter.notifyDataSetChanged();
+                            novelFragmentChapters.recyclerView.post(() -> novelFragmentChapters.adapter.notifyDataSetChanged());
                     } catch (ExecutionException e) {
                         e.printStackTrace();
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    Log.d("NovelFragmentsScrollLoad","Completed.");
+                    Log.d("NovelFragmentsScrollLoad", "Completed.");
                     running = false;
                 }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"}]
		[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
		[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
		[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
		[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
		[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.github.Doomsdayrs.apps.shosetsu","split":"","minSdkVersion":"24"}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.2-alpha","enabled":true,"outputFile":"shosetsu-v1.0.2-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]
		[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]