From 126d34c8cfcfcfcabdda506057adf51f2a3cfb6e Mon Sep 17 00:00:00 2001 From: doomsdayrs Date: Tue, 11 Jun 2019 07:09:52 -0400 Subject: [PATCH] v1.0.3-alpha New site to format :D --- app/build.gradle | 6 +++--- .../debug/mainApkListPersistenceDebug/apk-list.gson | 2 +- .../bundle-manifest/AndroidManifest.xml | 2 +- .../processDebugManifest/bundle-manifest/output.json | 2 +- .../instant_app_manifest/debug/AndroidManifest.xml | 2 +- .../instant_app_manifest/debug/output.json | 2 +- .../instant_run_merged_manifests/debug/output.json | 2 +- .../merged_manifests/debug/AndroidManifest.xml | 2 +- .../intermediates/merged_manifests/debug/output.json | 2 +- .../merged_manifests/debugAndroidTest/output.json | 2 +- .../processDebugManifest/metadata-feature/output.json | 2 +- .../apps/shosetsu/fragment/CataloguesFragment.java | 6 ++---- .../fragment/novel/NovelFragmentChapters.java | 11 +++++------ 13 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a332640ac9..f390ec6469 100644 --- 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 index b829d910bd..46d14f718b 100644 --- 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"}] \ No newline at end of file +[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0.3-alpha","enabled":true,"outputFile":"shosetsu-v1.0.3-alpha.apk","fullName":"debug","baseName":"debug"}] \ No newline at end of file diff --git a/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index 45da5752ef..602334c7f8 100644 --- a/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/app/build/intermediates/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" > + android:versionName="v1.0.3-alpha" > + android:versionName="v1.0.3-alpha" > (); 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/app/src/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/novel/NovelFragmentChapters.java b/app/src/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/novel/NovelFragmentChapters.java index b1251c8b1c..306e9d0a44 100644 --- a/app/src/main/java/com/github/Doomsdayrs/apps/shosetsu/fragment/novel/NovelFragmentChapters.java +++ b/app/src/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,7 +82,7 @@ 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; } @@ -91,7 +90,7 @@ public void setNovels(List 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; } }