diff options
author | Andrew Dolgov <[email protected]> | 2019-01-24 09:05:14 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-01-24 09:05:14 +0300 |
commit | 8f1d3b58d5888e890c1b3bf109c73347431edc06 (patch) | |
tree | 5f1905fb67d7498f7272384c73c92d568beb055d /org.fox.ttcomics | |
parent | 757c6ef27c4ce2562c93d73e24fe3ef69227eec0 (diff) | |
parent | 50dee187fb4c35142de36b4230a414d5e87acd12 (diff) |
Merge branch 'master' of git.fakecake.org:tt-comics
Diffstat (limited to 'org.fox.ttcomics')
46 files changed, 5 insertions, 12 deletions
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index 05eed40..cf5cccc 100755 --- a/org.fox.ttcomics/org.fox.ttcomics.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -86,7 +86,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" /> @@ -94,7 +93,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" /> @@ -104,13 +102,10 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> @@ -123,7 +118,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index 74e8cd3..5e42bae 100755 --- a/org.fox.ttcomics/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.fox.ttcomics2"
- android:versionCode="84"
- android:versionName="1.42" >
+ android:versionCode="85"
+ android:versionName="1.43" >
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java index 31fd6a8..96ddf78 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java @@ -171,10 +171,10 @@ public class ComicListFragment extends StateSavedFragment implements OnItemClick if (holder.overflow != null) {
if (size == SIZE_DIR) {
- holder.overflow.setImageResource(R.drawable.ic_folder);
+ holder.overflow.setImageResource(R.drawable.ic_folder_outline);
} else {
- holder.overflow.setImageResource(R.drawable.ic_dots_vertical);
+ holder.overflow.setImageResource(R.drawable.ic_dots_circle);
}
holder.overflow.setOnClickListener(new View.OnClickListener() {
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_cloud_download.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 6396630..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_circle.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_circle.png Binary files differnew file mode 100644 index 0000000..bd6275c --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_circle.png diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index f4b0bf2..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png Binary files differdeleted file mode 100644 index e4388c9..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.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 Binary files differindex 3003bd3..2c505be 100644 --- 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 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 Binary files differdeleted file mode 100644 index 095a18f..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_magnify.png +++ /dev/null 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 Binary files differindex 6b98370..8c0a324 100644 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh.png 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 Binary files differindex bb91c4a..e65808c 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 Binary files differindex 20b6e4e..60269c5 100644 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share.png diff --git a/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_dots_circle.png b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_dots_circle.png Binary files differnew file mode 100644 index 0000000..1284feb --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_dots_circle.png diff --git a/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_folder_outline.png b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_folder_outline.png Binary files differnew file mode 100644 index 0000000..84a8146 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_folder_outline.png diff --git a/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_refresh.png b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_refresh.png Binary files differnew file mode 100644 index 0000000..47e6791 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_refresh.png diff --git a/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_settings.png Binary files differnew file mode 100644 index 0000000..6f4637a --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_settings.png diff --git a/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_share.png b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_share.png Binary files differnew file mode 100644 index 0000000..cff4a73 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-mdpi/ic_share.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_cloud_download.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index dab24e0..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_circle.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_circle.png Binary files differnew file mode 100644 index 0000000..d7dc01d --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_circle.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 7119299..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png Binary files differdeleted file mode 100644 index dd6369f..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.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 Binary files differindex d36dbc0..a5eeeca 100644 --- 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 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 Binary files differdeleted file mode 100644 index 0c07bde..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_magnify.png +++ /dev/null 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 Binary files differindex b3a7234..2582b47 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh.png 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 Binary files differindex 68d146c..f01e537 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 Binary files differindex 395638d..6688550 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 035fef0..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_circle.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_circle.png Binary files differnew file mode 100644 index 0000000..3e09a58 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_circle.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 12c0e9c..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png Binary files differdeleted file mode 100644 index 5175e19..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.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 Binary files differindex 46fdba8..ce60e7e 100644 --- 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 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 Binary files differdeleted file mode 100644 index e230378..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_magnify.png +++ /dev/null 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 Binary files differindex 9ab6da5..31c4c44 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_refresh.png +++ 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 Binary files differindex e8b1c6a..1b0e314 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_settings.png +++ 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 Binary files differindex b575ca0..a44cf76 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_share.png +++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_share.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_cloud_download.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index c5ad32a..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_circle.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_circle.png Binary files differnew file mode 100644 index 0000000..884d0f0 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_circle.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index c4997cf..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png Binary files differdeleted file mode 100644 index c4ba099..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png +++ /dev/null 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 Binary files differindex 7593a52..7d012c9 100644 --- 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 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 Binary files differdeleted file mode 100644 index 54fd959..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_magnify.png +++ /dev/null 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 Binary files differindex 0bbbcc4..2db096d 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_refresh.png +++ 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 Binary files differindex 140862d..6f0a9d5 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_settings.png +++ 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 Binary files differindex 3fc5a65..095a457 100644 --- a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_share.png +++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_share.png diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index 9c7c06e..d030731 100755 --- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml +++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml @@ -75,7 +75,7 @@ android:paddingTop="8dp" android:paddingRight="8dp" android:layout_gravity="top|right" - android:src="@drawable/ic_dots_vertical" + android:src="@drawable/ic_dots_circle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/overflow" 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 62645ab..e7c7f7b 100755 --- a/org.fox.ttcomics/src/main/res/menu/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml @@ -8,7 +8,6 @@ <item android:id="@+id/menu_sync_directory" android:title="@string/menu_sync_directory" - android:icon="@drawable/ic_cloud_download" app:showAsAction="" /> |