diff options
30 files changed, 67 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 5f89ffce..0d41c8b9 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="337" - android:versionName="1.111" > + android:versionCode="338" + android:versionName="1.112" > <uses-sdk android:minSdkVersion="15" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 4f2f72ee..89bffbd7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -13,6 +13,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; +import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; @@ -25,6 +26,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; @@ -466,6 +468,16 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt } + ImageView icon = (ImageView) v.findViewById(R.id.icon); + + if (icon != null) { + TypedValue tv = new TypedValue(); + + m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); + icon.setImageResource(tv.resourceId); + + } + TextView tt = (TextView) v.findViewById(R.id.title); if (tt != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 97a96490..e01b4eed 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -14,6 +14,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; +import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; @@ -26,6 +27,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; @@ -645,6 +647,36 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi } + ImageView icon = (ImageView) v.findViewById(R.id.icon); + + if (icon != null) { + TypedValue tv = new TypedValue(); + + if (feed.id == 0 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_archive, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.id == -1 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_star, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.id == -2 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_checkbox_marked, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.id == -3 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_coffee, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.id == -4 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); + icon.setImageResource(tv.resourceId); + } else { + m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); + icon.setImageResource(tv.resourceId); + } + + } + TextView tt = (TextView) v.findViewById(R.id.title); if (tt != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 88abf0f5..fd0da9d6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -12,6 +12,7 @@ import android.provider.BaseColumns; import android.support.v4.widget.SimpleCursorAdapter; import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; +import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; @@ -23,6 +24,7 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; @@ -282,6 +284,16 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen } + ImageView icon = (ImageView) v.findViewById(R.id.icon); + + if (icon != null) { + TypedValue tv = new TypedValue(); + + m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); + icon.setImageResource(tv.resourceId); + + } + TextView tt = (TextView) v.findViewById(R.id.title); if (tt != null) { diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png Binary files differnew file mode 100644 index 00000000..f0bbae1b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png Binary files differnew file mode 100644 index 00000000..c8a6b0da --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee.png Binary files differnew file mode 100644 index 00000000..8214ff33 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee_dark.png Binary files differnew file mode 100644 index 00000000..e18061ec --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_coffee_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png Binary files differnew file mode 100644 index 00000000..3003bd3e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png Binary files differnew file mode 100644 index 00000000..30c6e3ff --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png Binary files differnew file mode 100644 index 00000000..d9e62b15 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png Binary files differnew file mode 100644 index 00000000..fc4d3bf6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee.png Binary files differnew file mode 100644 index 00000000..ab5d3a3c --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee_dark.png Binary files differnew file mode 100644 index 00000000..a897787a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_coffee_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png Binary files differnew file mode 100644 index 00000000..d36dbc0a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png Binary files differnew file mode 100644 index 00000000..1ef3b596 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png Binary files differnew file mode 100644 index 00000000..d613b313 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png Binary files differnew file mode 100644 index 00000000..9a9c755b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee.png Binary files differnew file mode 100644 index 00000000..155bd18c --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee_dark.png Binary files differnew file mode 100644 index 00000000..aded31a0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_coffee_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png Binary files differnew file mode 100644 index 00000000..46fdba88 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png Binary files differnew file mode 100644 index 00000000..3960580d --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png Binary files differnew file mode 100644 index 00000000..aaefe4f7 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png Binary files differnew file mode 100644 index 00000000..6932d864 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee.png Binary files differnew file mode 100644 index 00000000..6b355928 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee_dark.png Binary files differnew file mode 100644 index 00000000..9079b5ee --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_coffee_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png Binary files differnew file mode 100644 index 00000000..7593a527 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png Binary files differnew file mode 100644 index 00000000..8565676b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 6a01e683..ce85dcb7 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -40,6 +40,9 @@ <attr name="ic_filter_variant" format="reference" /> <attr name="ic_cloud_download" format="reference" /> <attr name="ic_cloud_upload" format="reference" /> + <attr name="ic_archive" format="reference" /> + <attr name="ic_coffee" format="reference" /> + <attr name="ic_folder_outline" format="reference" /> <declare-styleable name="ScrimInsetsView"> <attr format="reference|color" name="insetForeground"> </attr></declare-styleable> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index bb933df1..ad3869d7 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -53,6 +53,9 @@ <item name="ic_filter_variant">@drawable/ic_filter_variant_dark</item> <item name="ic_cloud_download">@drawable/ic_cloud_download_dark</item> <item name="ic_cloud_upload">@drawable/ic_cloud_upload_dark</item> + <item name="ic_archive">@drawable/ic_archive_dark</item> + <item name="ic_coffee">@drawable/ic_coffee_dark</item> + <item name="ic_folder_outline">@drawable/ic_folder_outline_dark</item> </style> <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> @@ -107,6 +110,9 @@ <item name="ic_filter_variant">@drawable/ic_filter_variant</item> <item name="ic_cloud_download">@drawable/ic_cloud_download</item> <item name="ic_cloud_upload">@drawable/ic_cloud_upload</item> + <item name="ic_archive">@drawable/ic_archive</item> + <item name="ic_coffee">@drawable/ic_coffee</item> + <item name="ic_folder_outline">@drawable/ic_folder_outline</item> </style> <style name="DarkDialogTheme" parent="android:Theme"></style> |
