material icons, etc

38 files changed, 43 insertions, 23 deletions

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index cd49182..a304a49 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Tiny-Comics-Reader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":org.fox.ttcomics" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="tt-comics" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,10 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,6 +26,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -93,5 +96,4 @@
     <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index a3fbf2d..91c3e43 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttcomics2"
-    android:versionCode="58"
-    android:versionName="1.18" >
+    android:versionCode="59"
+    android:versionName="1.19" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png
deleted file mode 100644
index 002fc4b..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder_outline.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder_outline.png
new file mode 100644
index 0000000..3003bd3
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder_outline.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_magnify.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_magnify.png
new file mode 100644
index 0000000..095a18f
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_magnify.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh.png
new file mode 100644
index 0000000..6b98370
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png
deleted file mode 100644
index bb9d855..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png
index 3e4580e..bb91c4a 100644
--- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png
+++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share.png
new file mode 100644
index 0000000..20b6e4e
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png
deleted file mode 100644
index c329f58..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-v21/ripple.xml b/org.fox.ttcomics/src/main/res/drawable-v21/ripple.xml
new file mode 100644
index 0000000..015979b
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-v21/ripple.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight" />
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png
deleted file mode 100644
index 49b85ca..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png
deleted file mode 100644
index cfe1287..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder_outline.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder_outline.png
new file mode 100644
index 0000000..d36dbc0
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder_outline.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_magnify.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_magnify.png
new file mode 100644
index 0000000..0c07bde
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_magnify.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh.png
new file mode 100644
index 0000000..b3a7234
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png
deleted file mode 100644
index a7fdc0d..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png
deleted file mode 100644
index 3549f84..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png
index 09b0148..68d146c 100644
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png
+++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share.png
new file mode 100644
index 0000000..395638d
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png
deleted file mode 100644
index 15549b0..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder_outline.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder_outline.png
new file mode 100644
index 0000000..46fdba8
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder_outline.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_magnify.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_magnify.png
new file mode 100644
index 0000000..e230378
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_magnify.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_refresh.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_refresh.png
new file mode 100644
index 0000000..9ab6da5
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_refresh.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_settings.png
new file mode 100644
index 0000000..e8b1c6a
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_settings.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_share.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_share.png
new file mode 100644
index 0000000..b575ca0
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_share.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder_outline.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder_outline.png
new file mode 100644
index 0000000..7593a52
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder_outline.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_magnify.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_magnify.png
new file mode 100644
index 0000000..54fd959
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_magnify.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_refresh.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_refresh.png
new file mode 100644
index 0000000..0bbbcc4
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_refresh.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_settings.png
new file mode 100644
index 0000000..140862d
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_settings.png
diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_share.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_share.png
new file mode 100644
index 0000000..3fc5a65
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_share.png
diff --git a/org.fox.ttcomics/src/main/res/drawable/ripple.xml b/org.fox.ttcomics/src/main/res/drawable/ripple.xml
new file mode 100644
index 0000000..1999ca0
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/drawable/ripple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- no ripple support before api21 so its a dummy transparent bg -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
index 0a6ecd0..41b5d2c 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -10,9 +10,9 @@
         android:id="@+id/materialTabHost"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        app:textColor="#FFFFFF"
-        app:primaryColor="#FF6F00"
-        app:accentColor="#F8CE00" />
+        app:textColor="@android:color/primary_text_dark"
+        app:primaryColor="?colorPrimary"
+        app:accentColor="?colorAccent" />
 
     <FrameLayout
         android:id="@+id/comics_list"
diff --git a/org.fox.ttcomics/src/main/res/layout/preferences.xml b/org.fox.ttcomics/src/main/res/layout/preferences.xml
new file mode 100644
index 0000000..e68fa9e
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/layout/preferences.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/preferences_container"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/menu/activity_main.xml b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
index a7ca037..695102d 100644
--- a/org.fox.ttcomics/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
@@ -3,7 +3,7 @@
 
     <item android:id="@+id/menu_rescan"
         android:title="@string/menu_rescan"
-        android:icon="@drawable/ic_refresh_light" 
+        android:icon="@drawable/ic_refresh"
         app:showAsAction="ifRoom" />
     
     <item android:id="@+id/menu_settings"
diff --git a/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml
index 1e5fc29..2e5327d 100644
--- a/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml
+++ b/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml
@@ -9,7 +9,7 @@
 
     <item android:id="@+id/menu_share"
         android:title="@string/menu_share"
-        android:icon="@drawable/ic_share_light"
+        android:icon="@drawable/ic_share"
         ugh:showAsAction="ifRoom" />
     
     <item android:id="@+id/menu_go_location"
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml
index 6852e4a..23c3f70 100755
--- a/org.fox.ttcomics/src/main/res/values/style.xml
+++ b/org.fox.ttcomics/src/main/res/values/style.xml
@@ -1,9 +1,9 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">#FF0000</item>
-        <item name="colorPrimaryDark">#990000</item>
-        <item name="colorAccent">#FF7500</item>
+        <item name="colorPrimary">#607D8B</item>
+        <item name="colorPrimaryDark">#455A64</item>
+        <item name="colorAccent">#FF5722</item>
     </style>
 
     <style name="ViewLightTheme" parent="AppTheme">
@@ -11,9 +11,9 @@
     </style>
 
     <style name="ViewDarkTheme" parent="Theme.AppCompat">
-        <item name="colorPrimary">#600000</item>
-        <item name="colorPrimaryDark">#300000</item>
-        <item name="colorAccent">#FF6600</item>
+        <item name="colorPrimary">#607D8B</item>
+        <item name="colorPrimaryDark">#455A64</item>
+        <item name="colorAccent">#FF5722</item>
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>
diff --git a/tt-comics.iml b/tt-comics.iml
index 5550340..ebaec24 100755
--- a/tt-comics.iml
+++ b/tt-comics.iml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="tt-comics" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
@@ -17,5 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file