Time to work on new things

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

Hide file tree

Showing 10 changed files with 105 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     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.7'
+    implementation 'com.github.Doomsdayrs:novelreader-core:v1.0.8'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'org.jetbrains:annotations:15.0'
 }
diff --git a/...ermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/...ermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
@@ -23,10 +23,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
+        android:testOnly="true"
+        android:theme="@style/lightTheme" >
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/lightTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -35,12 +36,19 @@
         </activity>
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.novel.NovelFragmentChapterView"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/lightTheme.NoActionBar" />
+        <activity
+            android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.CatalogueFragement"
+            android:theme="@style/lightTheme.NoActionBar" />
 
         <provider
             android:name="com.squareup.picasso.PicassoProvider"
             android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.squareup.picasso"
             android:exported="false" />
+        <provider
+            android:name="com.android.tools.ir.server.InstantRunContentProvider"
+            android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.android.tools.ir.server.InstantRunContentProvider"
+            android:multiprocess="true" />
     </application>
 
 </manifest>
diff --git a/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -24,10 +24,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
+        android:testOnly="true"
+        android:theme="@style/lightTheme" >
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/lightTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -36,12 +37,19 @@
         </activity>
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.novel.NovelFragmentChapterView"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/lightTheme.NoActionBar" />
+        <activity
+            android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.CatalogueFragement"
+            android:theme="@style/lightTheme.NoActionBar" />
 
         <provider
             android:name="com.squareup.picasso.PicassoProvider"
             android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.squareup.picasso"
             android:exported="false" />
+        <provider
+            android:name="com.android.tools.ir.server.InstantRunContentProvider"
+            android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.android.tools.ir.server.InstantRunContentProvider"
+            android:multiprocess="true" />
     </application>
 
 </manifest>
diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -23,10 +23,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
+        android:testOnly="true"
+        android:theme="@style/lightTheme" >
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.MainActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/lightTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -35,12 +36,19 @@
         </activity>
         <activity
             android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.novel.NovelFragmentChapterView"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/lightTheme.NoActionBar" />
+        <activity
+            android:name="com.github.Doomsdayrs.apps.shosetsu.fragment.CatalogueFragement"
+            android:theme="@style/lightTheme.NoActionBar" />
 
         <provider
             android:name="com.squareup.picasso.PicassoProvider"
             android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.squareup.picasso"
             android:exported="false" />
+        <provider
+            android:name="com.android.tools.ir.server.InstantRunContentProvider"
+            android:authorities="com.github.Doomsdayrs.apps.shosetsu.com.android.tools.ir.server.InstantRunContentProvider"
+            android:multiprocess="true" />
     </application>
 
 </manifest>
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
+ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
 MERGED from [com.android.support.constraint:constraint-layout:2.0.0-beta1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/52dd9eee32f18d8be9a6d0124b4adaa9/AndroidManifest.xml:2:1-11:12
 MERGED from [com.android.support:design:28.0.0] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/b5afacf53c79d31d5d72c60a9abd3a95/AndroidManifest.xml:17:1-24:12
 MERGED from [com.android.support:gridlayout-v7:28.0.0] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/d3415b4df8ae78f3a1c14fcc8d329185/AndroidManifest.xml:17:1-22:12
@@ -38,24 +38,24 @@ MERGED from [android.arch.lifecycle:viewmodel:1.1.1] /home/doomsdayrs/.gradle/ca
 MERGED from [android.arch.lifecycle:livedata:1.1.1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/ea5adf78a0e37f6e1305e731e947b7f2/AndroidManifest.xml:17:1-22:12
 MERGED from [android.arch.lifecycle:livedata-core:1.1.1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/fbc7974910efe1b4fadbfb043498945d/AndroidManifest.xml:17:1-22:12
 MERGED from [android.arch.core:runtime:1.1.1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/71a8c6f4ce59d795565afb9ca5cb8ba8/AndroidManifest.xml:17:1-22:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
-INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
+INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
 	package
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:5:5-50
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
 	android:versionName
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
-		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
 	xmlns:tools
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:4:5-51
 	xmlns:dist
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:3:5-61
 	android:versionCode
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
-		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-34:12
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:1-38:12
 		INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml
 	xmlns:android
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:2:11-69
@@ -68,7 +68,7 @@ ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app
 	android:name
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:8:22-64
 application
-ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:9:5-32:19
+ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:9:5-36:19
 MERGED from [com.android.support.constraint:constraint-layout:2.0.0-beta1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/52dd9eee32f18d8be9a6d0124b4adaa9/AndroidManifest.xml:9:5-20
 MERGED from [com.android.support.constraint:constraint-layout:2.0.0-beta1] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/52dd9eee32f18d8be9a6d0124b4adaa9/AndroidManifest.xml:9:5-20
 MERGED from [com.android.support:design:28.0.0] /home/doomsdayrs/.gradle/caches/transforms-2/files-2.1/b5afacf53c79d31d5d72c60a9abd3a95/AndroidManifest.xml:22:5-20
@@ -96,13 +96,13 @@ MERGED from [com.android.support:versionedparcelable:28.0.0] /home/doomsdayrs/.g
 	android:allowBackup
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:10:9-35
 	android:theme
-		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:17:9-40
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:17:9-42
 	android:networkSecurityConfig
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:14:9-69
 activity#com.github.Doomsdayrs.apps.shosetsu.MainActivity
 ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:19:9-27:20
 	android:theme
-		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:21:13-56
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:21:13-58
 	android:name
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:20:13-41
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
@@ -116,11 +116,17 @@ ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app
 	android:name
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:25:27-74
 activity#com.github.Doomsdayrs.apps.shosetsu.fragment.novel.NovelFragmentChapterView
-ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:29:9-31:59
+ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:29:9-31:61
 	android:theme
-		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:31:13-56
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:31:13-58
 	android:name
 		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:30:13-68
+activity#com.github.Doomsdayrs.apps.shosetsu.fragment.CatalogueFragement
+ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:33:9-35:61
+	android:theme
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:35:13-58
+	android:name
+		ADDED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml:34:13-56
 uses-sdk
 INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from /mnt/40b88ecf-5660-4110-b4c1-b6105e528191/SourceCode/git/shosetsu/app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,11 +14,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/lightTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/lightTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,7 +28,11 @@
 
         <activity
             android:name=".fragment.novel.NovelFragmentChapterView"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/lightTheme.NoActionBar" />
+
+        <activity
+            android:name=".fragment.CatalogueFragement"
+            android:theme="@style/lightTheme.NoActionBar" />
     </application>
 
 </manifest>
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="200dp"
     android:gravity="bottom"
-    android:background="@color/colorAccent"
+    android:background="@color/colorLightAccent"
     android:orientation="vertical"
     android:padding="16dp"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">

diff --git a/app/src/main/res/layout/toolbar_main.xml b/app/src/main/res/layout/toolbar_main.xml
@@ -4,7 +4,7 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/colorAccent"
+    android:background="@color/colorLightAccent"
     android:elevation="4dp"
     android:theme="@style/ThemeOverlay.AppCompat.Light"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FFEB3B</color>
-    <color name="colorPrimaryDark">#8600BED4</color>
-    <color name="colorAccent">#00BED4</color>
+    <color name="textColorLight">#000</color>
+
+    <color name="textColorDark">#FFFFFF</color>
+
+
+    <color name="colorLightPrimary">#80FFEB3B</color>
+    <color name="colorLightPrimaryDark">#00A0B6</color>
+    <color name="colorLightAccent">#0096AC</color>
+    <color name="colorLightBackground">#FFFFFF</color>
+
+    <color name="colorDarkPrimary">#80FFEB3B</color>
+    <color name="colorDarkPrimaryDark">#4B4B4B</color>
+    <color name="colorDarkAccent">#646464</color>
+    <color name="colorDarkBackground">#4B4B4B</color>
+
+    <color name="colorNightPrimary">#80FFEB3B</color>
+    <color name="colorNightPrimaryDark">#000</color>
+    <color name="colorNightAccent">#191919</color>
+    <color name="colorNightBackground">#000</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,14 +1,32 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="lightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColor">@color/textColorLight</item>
+        <item name="colorPrimary">@color/colorLightPrimary</item>
+        <item name="colorPrimaryDark">@color/colorLightPrimaryDark</item>
+        <item name="colorAccent">@color/colorLightAccent</item>
+        <!--<item name="android:background">@color/colorLightBackground</item>-->
     </style>
 
-    <style name="AppTheme.NoActionBar">
+    <style name="darkTheme">
+        <item name="android:textColor">@color/textColorDark</item>
+        <item name="colorPrimary">@color/colorDarkPrimary</item>
+        <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
+        <item name="colorAccent">@color/colorDarkAccent</item>
+        <!-- <item name="android:background">@color/colorDarkBackground</item>-->
+    </style>
+
+    <style name="nightTheme">
+        <item name="android:textColor">@color/textColorDark</item>
+        <item name="colorPrimary">@color/colorNightPrimary</item>
+        <item name="colorPrimaryDark">@color/colorNightPrimaryDark</item>
+        <item name="colorAccent">@color/colorNightAccent</item>
+        <!-- <item name="android:background">@color/colorNightBackground</item>-->
+    </style>
+
+    <style name="lightTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>