diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-09 12:12:03 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-09 12:12:03 +0300 |
| commit | d720a53e0b94ce2872fd4141e3f044ff7ec4baab (patch) | |
| tree | 0e9ba206f2a0fae00373ce6591f36ad55e1f3836 /org.fox.ttrss/src/main/res | |
| parent | be2aec246a4d096cf6ee36353ddf84cea59da448 (diff) | |
| parent | 961104e4426ac48aa390915f118be6f6ff0387ce (diff) | |
Merge branch 'protected/spring-cleaning' into 'master'
Protected/spring cleaning
See merge request tt-rss/tt-rss-android!29
Diffstat (limited to 'org.fox.ttrss/src/main/res')
387 files changed, 1662 insertions, 1351 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png b/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png Binary files differdeleted file mode 100644 index 99ffa932..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png Binary files differdeleted file mode 100644 index d556700b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png Binary files differdeleted file mode 100644 index e41c647d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png Binary files differdeleted file mode 100644 index 7cf97e22..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png Binary files differdeleted file mode 100644 index d84624ca..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png Binary files differdeleted file mode 100644 index 1b4e2ac6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png Binary files differdeleted file mode 100644 index ec65283b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png Binary files differdeleted file mode 100644 index d877db05..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png Binary files differdeleted file mode 100644 index 68945759..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png Binary files differdeleted file mode 100644 index b3ecbf00..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png Binary files differdeleted file mode 100644 index b7347bbc..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png +++ /dev/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 differdeleted file mode 100644 index 86658e2c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png +++ /dev/null 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 differdeleted file mode 100644 index 6849379a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png Binary files differdeleted file mode 100644 index d444973e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png Binary files differdeleted file mode 100644 index 2f7c51d1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png Binary files differdeleted file mode 100644 index 389acd29..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png Binary files differdeleted file mode 100644 index 9e92b8c5..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png Binary files differdeleted file mode 100644 index a568060a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png Binary files differdeleted file mode 100644 index 67bd912b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 5d15649c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png Binary files differdeleted file mode 100644 index a9fee824..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png Binary files differdeleted file mode 100644 index c27d448d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png Binary files differdeleted file mode 100644 index b685b8d3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png Binary files differdeleted file mode 100644 index f3febcae..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 9e091806..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png Binary files differdeleted file mode 100644 index 8f24f42c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png Binary files differdeleted file mode 100644 index bd6275c7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png Binary files differdeleted file mode 100644 index 1819c7f3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png Binary files differdeleted file mode 100644 index c3a004a3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png Binary files differdeleted file mode 100644 index 463a808b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png Binary files differdeleted file mode 100644 index 4faa102b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png Binary files differdeleted file mode 100644 index 623ea2c5..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png +++ /dev/null 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 differdeleted file mode 100644 index f7cc7739..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png +++ /dev/null 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 differdeleted file mode 100644 index 2c505beb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png Binary files differdeleted file mode 100644 index 650d0f11..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png Binary files differdeleted file mode 100644 index 29bed701..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png Binary files differdeleted file mode 100644 index fc6ebb25..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png Binary files differdeleted file mode 100644 index e4322c95..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png Binary files differdeleted file mode 100644 index 58ae6503..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png Binary files differdeleted file mode 100644 index 92ab24ce..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png Binary files differdeleted file mode 100644 index 9c42749c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png Binary files differdeleted file mode 100644 index b4e322e2..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png Binary files differdeleted file mode 100644 index 1778fb15..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png Binary files differdeleted file mode 100644 index b4d4f903..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png Binary files differdeleted file mode 100644 index 8c0a324d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png Binary files differdeleted file mode 100644 index 3cc4fd3f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png Binary files differdeleted file mode 100644 index d3282429..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png Binary files differdeleted file mode 100644 index 2139f158..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png Binary files differdeleted file mode 100644 index 8ea7af61..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png Binary files differdeleted file mode 100644 index da11a757..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png Binary files differdeleted file mode 100644 index 6c469fe9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png Binary files differdeleted file mode 100644 index e65808c9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png Binary files differdeleted file mode 100644 index c404fd0c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png Binary files differdeleted file mode 100644 index 60269c5f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png Binary files differdeleted file mode 100644 index 7d730af3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png Binary files differdeleted file mode 100644 index 69815f4a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png Binary files differdeleted file mode 100644 index aadffe6a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png Binary files differdeleted file mode 100644 index a9e5ba81..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png Binary files differdeleted file mode 100644 index e5e5c271..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png Binary files differdeleted file mode 100644 index 17afc5f5..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png Binary files differdeleted file mode 100644 index f36d9259..00000000 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png Binary files differdeleted file mode 100644 index 7dcdca0e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png Binary files differdeleted file mode 100644 index 37ea9a33..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png Binary files differdeleted file mode 100644 index 7b47abd1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png Binary files differdeleted file mode 100644 index d9251d44..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png Binary files differdeleted file mode 100644 index fe3218cf..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png Binary files differdeleted file mode 100644 index 5af3c92e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png Binary files differdeleted file mode 100644 index 7e5958ac..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png Binary files differdeleted file mode 100644 index 908e4bbc..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png Binary files differdeleted file mode 100644 index 0a350363..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png Binary files differdeleted file mode 100644 index 24ed83da..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png Binary files differdeleted file mode 100644 index 9936076e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png Binary files differdeleted file mode 100644 index 781b6372..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png Binary files differdeleted file mode 100644 index 7c884662..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png Binary files differdeleted file mode 100644 index cea1ad89..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png Binary files differdeleted file mode 100644 index 4b85499d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 7ac3955f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png Binary files differdeleted file mode 100644 index 37c3ccf9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png Binary files differdeleted file mode 100644 index f84984b0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png Binary files differdeleted file mode 100644 index d025c97e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png Binary files differdeleted file mode 100644 index aff7317c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 38591372..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png Binary files differdeleted file mode 100644 index cb96e59b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png Binary files differdeleted file mode 100644 index 1284feba..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png Binary files differdeleted file mode 100644 index eb100c47..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png Binary files differdeleted file mode 100644 index 688bcfdf..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png Binary files differdeleted file mode 100644 index e3156355..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png Binary files differdeleted file mode 100644 index 7f3d0364..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png Binary files differdeleted file mode 100644 index a761e237..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png Binary files differdeleted file mode 100644 index 6c1d7d85..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png Binary files differdeleted file mode 100644 index 84a81461..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png Binary files differdeleted file mode 100644 index 6c098bf5..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png Binary files differdeleted file mode 100644 index 2bce1991..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png Binary files differdeleted file mode 100644 index e88fe3db..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png Binary files differdeleted file mode 100644 index bbe935db..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png Binary files differdeleted file mode 100644 index 5c943d79..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png Binary files differdeleted file mode 100644 index b12f5c19..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png Binary files differdeleted file mode 100644 index 3ad671e3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png Binary files differdeleted file mode 100644 index b6ea39c8..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png Binary files differdeleted file mode 100644 index 24abb2fb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png Binary files differdeleted file mode 100644 index e442ae26..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png Binary files differdeleted file mode 100644 index 47e67916..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png Binary files differdeleted file mode 100644 index 8417d747..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png Binary files differdeleted file mode 100644 index 6b5bee62..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png Binary files differdeleted file mode 100644 index fd54c863..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png Binary files differdeleted file mode 100644 index 1a878c47..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png Binary files differdeleted file mode 100644 index ddd225a7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png Binary files differdeleted file mode 100644 index 19dfda24..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png Binary files differdeleted file mode 100644 index 6f4637a7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png Binary files differdeleted file mode 100644 index 9947ffb8..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png Binary files differdeleted file mode 100644 index cff4a732..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png Binary files differdeleted file mode 100644 index 829087f8..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png Binary files differdeleted file mode 100644 index 31c6806f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png Binary files differdeleted file mode 100644 index c87100e2..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png Binary files differdeleted file mode 100644 index 6d15e8a7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png Binary files differdeleted file mode 100644 index a53d0f60..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png Binary files differdeleted file mode 100644 index d0405813..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png Binary files differdeleted file mode 100644 index 5dbfc8d1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png Binary files differdeleted file mode 100644 index 65ebe3c1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png Binary files differdeleted file mode 100644 index 53ff92a2..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png Binary files differdeleted file mode 100644 index 0f15737f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png Binary files differdeleted file mode 100644 index 33d96f00..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png Binary files differdeleted file mode 100644 index 8c1ea784..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png Binary files differdeleted file mode 100644 index 33b01737..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png Binary files differdeleted file mode 100644 index ec479dbf..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png Binary files differdeleted file mode 100644 index db5cbe60..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png +++ /dev/null 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 differdeleted file mode 100644 index e759dc38..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png +++ /dev/null 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 differdeleted file mode 100644 index d29d7861..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png Binary files differdeleted file mode 100644 index 26f61c29..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png Binary files differdeleted file mode 100644 index 05aeeff7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png Binary files differdeleted file mode 100644 index 69d778e1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png Binary files differdeleted file mode 100644 index d0657c0e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png Binary files differdeleted file mode 100644 index 6964562d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png Binary files differdeleted file mode 100644 index 54936ef9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 20bcdd58..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png Binary files differdeleted file mode 100644 index c1bb95d7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png Binary files differdeleted file mode 100644 index b0bed197..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png Binary files differdeleted file mode 100644 index ab9f1c71..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png Binary files differdeleted file mode 100644 index 9f63f9b0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 8a1172f2..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png Binary files differdeleted file mode 100644 index 469e4074..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png Binary files differdeleted file mode 100644 index d7dc01d2..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png Binary files differdeleted file mode 100644 index 27538d34..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png Binary files differdeleted file mode 100644 index c1a79b44..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png Binary files differdeleted file mode 100644 index d65791a1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png Binary files differdeleted file mode 100644 index 4511f444..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png Binary files differdeleted file mode 100644 index 3468b02b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png +++ /dev/null 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 differdeleted file mode 100644 index 036daa89..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png +++ /dev/null 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 differdeleted file mode 100644 index a5eeeca0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png Binary files differdeleted file mode 100644 index ff106b38..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png Binary files differdeleted file mode 100644 index 7b541ca8..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png Binary files differdeleted file mode 100644 index b3a5556b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png Binary files differdeleted file mode 100644 index a2ef528f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png Binary files differdeleted file mode 100644 index 2f4d73cb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png Binary files differdeleted file mode 100644 index 35f6fc1b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png Binary files differdeleted file mode 100644 index bcceb5c4..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png Binary files differdeleted file mode 100644 index ee7edf0c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png Binary files differdeleted file mode 100644 index 25e32eff..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png Binary files differdeleted file mode 100644 index 46b06231..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png Binary files differdeleted file mode 100644 index 2582b47a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png Binary files differdeleted file mode 100644 index 24052165..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png Binary files differdeleted file mode 100644 index b066e8d6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png Binary files differdeleted file mode 100644 index ad319be9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png Binary files differdeleted file mode 100644 index 7e8b428c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png Binary files differdeleted file mode 100644 index 1e01383f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png Binary files differdeleted file mode 100644 index d46a33e3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png Binary files differdeleted file mode 100644 index f01e5372..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png Binary files differdeleted file mode 100644 index 27c334bf..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png Binary files differdeleted file mode 100644 index 6688550f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png Binary files differdeleted file mode 100644 index 7185c9be..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png Binary files differdeleted file mode 100644 index e735d160..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png Binary files differdeleted file mode 100644 index 06a24604..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png Binary files differdeleted file mode 100644 index 71fc5c28..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png Binary files differdeleted file mode 100644 index 1b932488..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png Binary files differdeleted file mode 100644 index 7be768e1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png Binary files differdeleted file mode 100644 index 1194d0db..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png Binary files differdeleted file mode 100644 index 80c578ba..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png Binary files differdeleted file mode 100644 index 463fba18..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png Binary files differdeleted file mode 100644 index 77170adb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png Binary files differdeleted file mode 100644 index c2ec115e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png Binary files differdeleted file mode 100644 index 02183b60..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png Binary files differdeleted file mode 100644 index 7b51ffcc..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png Binary files differdeleted file mode 100644 index f55069c1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png Binary files differdeleted file mode 100644 index dd732d55..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png Binary files differdeleted file mode 100644 index f8d6b481..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png Binary files differdeleted file mode 100644 index 1a845b9f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png +++ /dev/null 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 differdeleted file mode 100644 index 97ebb509..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png +++ /dev/null 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 differdeleted file mode 100644 index 03a36027..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png Binary files differdeleted file mode 100644 index 0117966d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png Binary files differdeleted file mode 100644 index d91d1cd7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png Binary files differdeleted file mode 100644 index 9df9428f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png Binary files differdeleted file mode 100644 index 369567c6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png Binary files differdeleted file mode 100644 index 8237fa47..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png Binary files differdeleted file mode 100644 index 84cc49cc..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index 87110eb1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png Binary files differdeleted file mode 100644 index 3906cd11..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png Binary files differdeleted file mode 100644 index f9d8318d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png Binary files differdeleted file mode 100644 index f02f39f4..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png Binary files differdeleted file mode 100644 index b4ae0edb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index b1618d48..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png Binary files differdeleted file mode 100644 index 2d21a371..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png Binary files differdeleted file mode 100644 index 3e09a58d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png Binary files differdeleted file mode 100644 index 449deaea..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png Binary files differdeleted file mode 100644 index a68455d0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png Binary files differdeleted file mode 100644 index 7527bb3b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png Binary files differdeleted file mode 100644 index 8639bb4b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png Binary files differdeleted file mode 100644 index 4bfc1042..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png +++ /dev/null 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 differdeleted file mode 100644 index 87307ab0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png +++ /dev/null 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 differdeleted file mode 100644 index ce60e7e3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png Binary files differdeleted file mode 100644 index af3e831b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png Binary files differdeleted file mode 100644 index e2ff7761..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png Binary files differdeleted file mode 100644 index 24202f15..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png Binary files differdeleted file mode 100644 index ed7dcbd0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png Binary files differdeleted file mode 100644 index a301f00e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png Binary files differdeleted file mode 100644 index 78b64c81..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png Binary files differdeleted file mode 100644 index c2752bf9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png Binary files differdeleted file mode 100644 index f77fb27a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png Binary files differdeleted file mode 100644 index 5ef9b41d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png Binary files differdeleted file mode 100644 index 0e41ce8c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png Binary files differdeleted file mode 100644 index 31c4c443..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png Binary files differdeleted file mode 100644 index 2951c59f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png Binary files differdeleted file mode 100644 index 35331d03..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png Binary files differdeleted file mode 100644 index 34b1df58..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png Binary files differdeleted file mode 100644 index beb0dd19..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png Binary files differdeleted file mode 100644 index 04814136..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png Binary files differdeleted file mode 100644 index 4f81a58d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png Binary files differdeleted file mode 100644 index 1b0e3149..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png Binary files differdeleted file mode 100644 index f51b3913..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png Binary files differdeleted file mode 100644 index a44cf763..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png Binary files differdeleted file mode 100644 index 3e712879..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png Binary files differdeleted file mode 100644 index 0f0f4ed8..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png Binary files differdeleted file mode 100644 index 176e426f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png Binary files differdeleted file mode 100644 index 4b25596f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png Binary files differdeleted file mode 100644 index 8b7b8367..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png Binary files differdeleted file mode 100644 index fb68b6c6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png Binary files differdeleted file mode 100644 index bd097e4f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png Binary files differdeleted file mode 100644 index ef0c2a10..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png Binary files differdeleted file mode 100644 index 7dd24dcd..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png Binary files differdeleted file mode 100644 index 26cffdf5..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png Binary files differdeleted file mode 100644 index bd78a122..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png Binary files differdeleted file mode 100644 index 0d020b1f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png Binary files differdeleted file mode 100644 index 7a750aa4..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png Binary files differdeleted file mode 100644 index 97798369..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png +++ /dev/null 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 differdeleted file mode 100644 index 6de98b17..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png +++ /dev/null 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 differdeleted file mode 100644 index 516be711..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png Binary files differdeleted file mode 100644 index 78d73b80..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png Binary files differdeleted file mode 100644 index e4b8794e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png Binary files differdeleted file mode 100644 index f9edd9d6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png Binary files differdeleted file mode 100644 index d0939f3c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png Binary files differdeleted file mode 100644 index 3cc0cbaf..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png Binary files differdeleted file mode 100644 index a29076b6..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png Binary files differdeleted file mode 100644 index de4e3ed3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png Binary files differdeleted file mode 100644 index 838f62b7..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png Binary files differdeleted file mode 100644 index d82c1f1b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png Binary files differdeleted file mode 100644 index b6797aab..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png Binary files differdeleted file mode 100644 index f9ed3a1a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png Binary files differdeleted file mode 100644 index 2dacd528..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png Binary files differdeleted file mode 100644 index 05895fa3..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png Binary files differdeleted file mode 100644 index 884d0f0d..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png Binary files differdeleted file mode 100644 index f463232f..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png Binary files differdeleted file mode 100644 index 9482e57b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png Binary files differdeleted file mode 100644 index 1eb68434..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png Binary files differdeleted file mode 100644 index bb353bd9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png Binary files differdeleted file mode 100644 index 6a640b3c..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png +++ /dev/null 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 differdeleted file mode 100644 index ede9f7b9..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png +++ /dev/null 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 differdeleted file mode 100644 index 7d012c92..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png Binary files differdeleted file mode 100644 index 89b72943..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png Binary files differdeleted file mode 100644 index 2525f453..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png Binary files differdeleted file mode 100644 index c909f21a..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png Binary files differdeleted file mode 100644 index d6eeb6cb..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png Binary files differdeleted file mode 100644 index bbd94d99..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png Binary files differdeleted file mode 100644 index 2aa78d56..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png Binary files differdeleted file mode 100644 index 90dbaf9b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png Binary files differdeleted file mode 100644 index b4dea4a0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png Binary files differdeleted file mode 100644 index 5c1dca04..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png Binary files differdeleted file mode 100644 index 2f2eff29..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png Binary files differdeleted file mode 100644 index 2db096de..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png Binary files differdeleted file mode 100644 index b7c389e4..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png Binary files differdeleted file mode 100644 index 193ce37b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png Binary files differdeleted file mode 100644 index d31146fd..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png Binary files differdeleted file mode 100644 index 4aa1057b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png Binary files differdeleted file mode 100644 index 0f671764..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png Binary files differdeleted file mode 100644 index 161476e1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png Binary files differdeleted file mode 100644 index 6f0a9d57..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png Binary files differdeleted file mode 100644 index 5b597b8b..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png Binary files differdeleted file mode 100644 index 095a4574..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png Binary files differdeleted file mode 100644 index f51c3e91..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png Binary files differdeleted file mode 100644 index 431756b0..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png Binary files differdeleted file mode 100644 index dacfc20e..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png Binary files differdeleted file mode 100644 index c156ea15..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png Binary files differdeleted file mode 100644 index 191708d1..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png Binary files differdeleted file mode 100644 index 06b4ddae..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png Binary files differdeleted file mode 100644 index ee708798..00000000 --- a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png +++ /dev/null diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml new file mode 100644 index 00000000..c50fa951 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml new file mode 100644 index 00000000..075e95dc --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml new file mode 100644 index 00000000..b09f8bc0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml new file mode 100644 index 00000000..def9bd66 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml new file mode 100644 index 00000000..f6d56943 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml new file mode 100644 index 00000000..9a6427bc --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml new file mode 100644 index 00000000..82b88ac1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml new file mode 100644 index 00000000..942aeb96 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml new file mode 100644 index 00000000..a3335d40 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml new file mode 100644 index 00000000..22ac7411 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml new file mode 100644 index 00000000..56013720 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml new file mode 100644 index 00000000..bb6540aa --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml new file mode 100644 index 00000000..ec632cbb --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19.48,12.35c-1.57,-4.08 -7.16,-4.3 -5.81,-10.23c0.1,-0.44 -0.37,-0.78 -0.75,-0.55C9.29,3.71 6.68,8 8.87,13.62c0.18,0.46 -0.36,0.89 -0.75,0.59c-1.81,-1.37 -2,-3.34 -1.84,-4.75c0.06,-0.52 -0.62,-0.77 -0.91,-0.34C4.69,10.16 4,11.84 4,14.37c0.38,5.6 5.11,7.32 6.81,7.54c2.43,0.31 5.06,-0.14 6.95,-1.87C19.84,18.11 20.6,15.03 19.48,12.35zM10.2,17.38c1.44,-0.35 2.18,-1.39 2.38,-2.31c0.33,-1.43 -0.96,-2.83 -0.09,-5.09c0.33,1.87 3.27,3.04 3.27,5.08C15.84,17.59 13.1,19.76 10.2,17.38z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml new file mode 100644 index 00000000..d99fc664 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5,-5L11,7zM20,19h-8v2h8c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-8v2h8V19z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml new file mode 100644 index 00000000..94381df3 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M18.83,7h-2.6L10.5,4 4,7.4L4,17c-1.1,0 -2,-0.9 -2,-2L2,7.17c0,-0.53 0.32,-1.09 0.8,-1.34L10.5,2l7.54,3.83c0.43,0.23 0.73,0.7 0.79,1.17zM20,8L7,8c-1.1,0 -2,0.9 -2,2v9c0,1.1 0.9,2 2,2h13c1.1,0 2,-0.9 2,-2v-9c0,-1.1 -0.9,-2 -2,-2zM20,11.67L13.5,15 7,11.67L7,10l6.5,3.33L20,10v1.67z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml new file mode 100644 index 00000000..8c898cfa --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M12,19c0,-3.87 3.13,-7 7,-7c1.08,0 2.09,0.25 3,0.68V6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h8.08C12.03,19.67 12,19.34 12,19zM4,6l8,5l8,-5v2l-8,5L4,8V6zM17.34,22l-3.54,-3.54l1.41,-1.41l2.12,2.12l4.24,-4.24L23,16.34L17.34,22z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml new file mode 100644 index 00000000..5ffb98a5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml new file mode 100644 index 00000000..1e502e2f --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M22,10l-6,-6L4,4c-1.1,0 -2,0.9 -2,2v12.01c0,1.1 0.9,1.99 2,1.99l16,-0.01c1.1,0 2,-0.89 2,-1.99v-8zM15,5.5l5.5,5.5L15,11L15,5.5z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml new file mode 100644 index 00000000..465c22e8 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml new file mode 100644 index 00000000..19eeec6a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M18,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM11,4h5v7l-2.5,-1.5L11,11V4zM7,18l2.38,-3.17L11,17l2.62,-3.5L17,18H7z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml new file mode 100644 index 00000000..9bb5a196 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM9.5,16.5v-9l7,4.5L9.5,16.5z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml new file mode 100644 index 00000000..b1bdebfe --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml new file mode 100644 index 00000000..86504d0e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml new file mode 100644 index 00000000..6ad75a1c --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml new file mode 100644 index 00000000..1cccd026 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/> + + <path android:fillColor="@android:color/white" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml new file mode 100644 index 00000000..d29c6ea6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml new file mode 100644 index 00000000..b59b4f77 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml new file mode 100644 index 00000000..6593f3a4 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml new file mode 100644 index 00000000..74753b7a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml new file mode 100644 index 00000000..33eeeae1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml new file mode 100644 index 00000000..db03b2e5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M14.94,4.66h-4.72l2.36,-2.36zM10.25,19.37h4.66l-2.33,2.33zM6.1,6.27L1.6,17.73h1.84l0.92,-2.45h5.11l0.92,2.45h1.84L7.74,6.27L6.1,6.27zM4.97,13.64l1.94,-5.18 1.94,5.18L4.97,13.64zM15.73,16.14h6.12v1.59h-8.53v-1.29l5.92,-8.56h-5.88v-1.6h8.3v1.26l-5.93,8.6z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml new file mode 100644 index 00000000..9b295a03 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml new file mode 100644 index 00000000..925b9731 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml new file mode 100644 index 00000000..9038a87a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M16,18l2.29,-2.29 -4.88,-4.88 -4,4L2,7.41 3.41,6l6,6 4,-4 6.3,6.29L22,12v6z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml new file mode 100644 index 00000000..45b32861 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M22,12l-4,-4v3H3v2h15v3z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml new file mode 100644 index 00000000..756f7ed3 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml b/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml new file mode 100644 index 00000000..c80312a7 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml @@ -0,0 +1,11 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM22,19L7.07,19L2.4,12l4.66,-7L22,5v14z"/> + + <path android:fillColor="@android:color/white" android:pathData="M9,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/> + + <path android:fillColor="@android:color/white" android:pathData="M14,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/> + + <path android:fillColor="@android:color/white" android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml index 95215992..09534bc7 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml @@ -5,8 +5,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - <FrameLayout android:id="@+id/sw600dp_anchor" android:layout_width="match_parent" @@ -21,23 +19,38 @@ android:baselineAligned="false" android:orientation="horizontal" > - <FrameLayout - android:paddingRight="4dp" - android:id="@+id/headlines_fragment" + <com.google.android.material.navigation.NavigationView + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/navigation_view" + android:background="?colorSurfaceContainer" android:layout_width="0dp" - android:layout_height="match_parent" android:layout_weight="0.3" - android:background="?headlinesBackground" > + android:layout_height="match_parent" + android:padding="8dp" + app:shapeAppearance="@style/ShapeAppearanceHeadlinesTablet" + android:layout_gravity="start"> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:layout_width="wrap_content" + android:layout_height="match_parent"> </FrameLayout> + </com.google.android.material.navigation.NavigationView> + <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="0dp" android:layout_weight="0.7" - android:elevation="4dp" - android:background="?articleBackground" android:layout_height="match_parent"> + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + </com.google.android.material.appbar.AppBarLayout> + <FrameLayout android:layout_width="match_parent" android:id="@+id/article_fragment" @@ -50,7 +63,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:visibility="gone" - android:src="@drawable/ic_action_web_site" + android:src="@drawable/baseline_open_in_browser_24" android:layout_margin="16dp" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 9ba663f6..b6a6f19d 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -5,15 +5,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - <LinearLayout android:id="@+id/fragment_container" + android:background="?colorSurfaceContainer" android:layout_width="fill_parent" android:layout_height="fill_parent" android:baselineAligned="false" - android:orientation="horizontal" - android:layout_below="@+id/toolbar"> + android:orientation="horizontal"> <FrameLayout android:id="@+id/sw600dp_anchor" @@ -22,26 +20,48 @@ android:visibility="gone" > </FrameLayout> - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="0dp" + <com.google.android.material.navigation.NavigationView + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/navigation_view" + android:layout_width="300dp" + app:shapeAppearance="@style/ShapeAppearanceFeedsTablet" android:layout_height="match_parent" - android:layout_weight="0.25" - android:background="?feedlistBackground" > - </FrameLayout> + android:layout_gravity="start"> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </FrameLayout> + + </com.google.android.material.navigation.NavigationView> <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="0dp" android:layout_weight="0.75" - android:elevation="4dp" - android:background="?headlinesBackground" android:layout_height="match_parent"> - <FrameLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.google.android.material.appbar.MaterialToolbar + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" + app:layout_scrollFlags="scroll|enterAlways" + app:titleTextAppearance="?attr/textAppearanceTitleMedium" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:background="?colorSurfaceContainer" + android:minHeight="?attr/actionBarSize"/> + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_height="match_parent"/> + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/master_fab" @@ -49,7 +69,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:visibility="gone" - android:src="@drawable/ic_refresh" + android:src="@drawable/baseline_refresh_24" android:layout_margin="16dp" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml deleted file mode 100644 index 95cb35e0..00000000 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ /dev/null @@ -1,62 +0,0 @@ -<!-- we don't hide actionbar on tablets even in portrait so this is a bit different from activity_master_phone.xml --> - -<androidx.drawerlayout.widget.DrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" - android:id="@+id/headlines_drawer" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_below="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/master_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/ic_refresh" - android:layout_margin="16dp" /> - - <FrameLayout - android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - </RelativeLayout> - - <org.fox.ttrss.util.ScrimInsetsFrameLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/scrimInsetsFrameLayout" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@android:color/white" - android:elevation="10dp" - android:fitsSystemWindows="true" - app:insetForeground="#4000"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?feedlistBackground" - android:layout_height="match_parent" > - </FrameLayout> - - </org.fox.ttrss.util.ScrimInsetsFrameLayout> - -</androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml index 8f36bbd6..8cb1ba10 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout -xmlns:android="http://schemas.android.com/apk/res/android" -android:layout_width="match_parent" -android:layout_height="match_parent"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> -<include layout="@layout/activity_detail_phone" /> + <include layout="@layout/layout_detail_phone" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index 6d9a8dbd..8cb1ba10 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -1,48 +1,10 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" - android:animateLayoutChanges="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/detail_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/ic_action_web_site" - android:layout_margin="16dp" /> - - <com.google.android.material.appbar.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/article_fragment" - app:layout_behavior=".util.DetailActivityScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?articleBackground"> - </FrameLayout> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp" - android:background="?headlinesBackground"> - </FrameLayout> + <include layout="@layout/layout_detail_phone" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index 7f47de50..f44bb74b 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -1,9 +1,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/article_images" android:layout_width="fill_parent" android:animateLayoutChanges="true" - android:background="@android:color/black" android:layout_height="fill_parent"> <com.bogdwellers.pinchtozoom.view.ImageViewPager @@ -12,18 +11,16 @@ android:layout_height="fill_parent" android:layout_alignParentTop="true" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/gallery_overflow" - android:clickable="true" android:layout_width="wrap_content" - android:layout_height="26dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:src="@drawable/ic_dots_vertical_circle" + app:icon="?ic_dots_vertical" android:layout_alignParentRight="true" - android:tint="?colorAccent" - android:layout_marginRight="8dp" - android:layout_marginTop="@dimen/activity_vertical_margin" /> + android:layout_marginTop="48dp" + app:iconTint="?colorTertiary" /> <ProgressBar style="?android:attr/progressBarStyleHorizontal" @@ -44,7 +41,8 @@ <me.relex.circleindicator.CircleIndicator android:id="@+id/gallery_pager_indicator" android:layout_width="fill_parent" - android:layout_height="40dp" + android:layout_height="32dp" + android:layout_marginBottom="55dp" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" diff --git a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml index f6cccd22..f13a17b3 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml @@ -1,5 +1,4 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="?android:colorBackground" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/activity_login.xml b/org.fox.ttrss/src/main/res/layout/activity_login.xml index 8f6cf4ed..829e0897 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_login.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_login.xml @@ -1,5 +1,4 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="?android:colorBackground" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 9bb9bff5..4ea81118 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -4,5 +4,5 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/activity_master_phone" /> + <include layout="@layout/layout_master_phone" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index 6ae5064f..4ea81118 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,59 +1,8 @@ - <androidx.drawerlayout.widget.DrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" - android:id="@+id/headlines_drawer" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/master_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/ic_refresh" - android:layout_margin="16dp" /> - - <com.google.android.material.appbar.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <org.fox.ttrss.util.ScrimInsetsFrameLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/scrimInsetsFrameLayout" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@android:color/white" - android:elevation="10dp" - android:fitsSystemWindows="true" - app:insetForeground="#4000"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?feedlistBackground" - android:layout_height="match_parent" > - </FrameLayout> - - </org.fox.ttrss.util.ScrimInsetsFrameLayout> - - </androidx.drawerlayout.widget.DrawerLayout> +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/layout_master_phone" /> +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml index 519bfe61..6032b951 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml @@ -2,11 +2,11 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" + android:fitsSystemWindows="true" android:layout_height="match_parent"> <FrameLayout android:id="@+id/preferences_container" - android:background="?android:colorBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" diff --git a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml b/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml deleted file mode 100644 index efdd76ab..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml +++ /dev/null @@ -1,36 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dp" > - - <Button - android:id="@+id/close_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:text="@string/tasker_save_and_close" /> - - <RadioGroup - android:id="@+id/taskerActions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" > - - <RadioButton - android:id="@+id/actionDownload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:checked="true" - android:text="@string/download_articles_and_go_offline" /> - - <RadioButton - android:id="@+id/actionUpload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/synchronize_read_articles_and_go_online" /> - </RadioGroup> - -</RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml deleted file mode 100644 index 0b423edc..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml +++ /dev/null @@ -1,29 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true" - android:background="@android:color/black"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/toolbar"> - - <fragment - android:name="com.google.android.youtube.player.YouTubePlayerSupportFragment" - android:id="@+id/fragment_youtube_player" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <ProgressBar - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/video_loading" - android:layout_gravity="center" - android:indeterminate="true" /> - - </FrameLayout> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - -</RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index d47c3b5b..55aa5fdc 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <View - android:layout_gravity="top|center_horizontal" - android:layout_marginTop="10dp" + <com.google.android.material.divider.MaterialDivider android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?headlineFooterColor"/> + app:dividerInsetEnd="16dp" + app:dividerInsetStart="16dp" + android:layout_marginTop="8dp" + android:layout_height="wrap_content"/> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 6779a950..f4954259 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,40 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="120dp" + android:layout_height="72dp" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:weightSum="1" android:clickable="false"> - <ImageView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:id="@+id/imageView" - android:scaleType="fitXY" - android:background="?colorPrimaryDark" - android:src="?drawer_header" /> - <FrameLayout android:layout_width="match_parent" - android:background="@android:color/transparent" android:layout_height="match_parent"> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_settings" + android:scaleX="1.5" + android:scaleY="1.5" + app:icon="@drawable/baseline_settings_24" android:id="@+id/drawer_settings_btn" - android:layout_gravity="bottom|end" - android:clickable="true" - android:layout_marginBottom="16dp" - android:layout_marginEnd="12dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="8dp" android:transitionName="SETTINGS_REVEAL" - android:background="@drawable/ripple" /> + /> <LinearLayout android:layout_width="match_parent" - android:layout_height="56dp" + android:layout_height="wrap_content" android:orientation="vertical" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" @@ -47,25 +40,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textColor="@android:color/primary_text_dark" - tools:text="test" - android:textSize="14sp" - android:textStyle="bold" - - /> + tools:text="user" + android:textAppearance="?attr/textAppearanceHeadlineSmall" + android:textColor="?attr/colorOnSurface"/> <TextView android:id="@+id/drawer_header_server" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/primary_text_dark" android:layout_marginStart="16dp" - android:layout_marginTop="5dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" tools:text="example.org" - android:textSize="14sp" - android:textStyle="normal" - - /> + android:textAppearance="?attr/textAppearanceTitleSmall" + android:textColor="?attr/colorOnSurfaceVariant"/> </LinearLayout> </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index bb263237..f4c580a3 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -19,8 +20,8 @@ android:layout_height="21dp" android:layout_weight="0" android:scaleType="fitXY" - android:tint="?colorAccent" - android:src="?ic_go_back" /> + android:src="?ic_go_back" + app:tint="?colorTertiary" /> <TextView android:fontFamily="sans-serif-medium" @@ -29,11 +30,9 @@ android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingStart="35dp" + android:paddingStart="16dp" android:singleLine="true" android:text=".." - android:paddingBottom="2dp" - android:textColor="?feedlistTextColor" android:textSize="14sp" /> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 7a10bc23..32e20c26 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/feeds_row" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:baselineAligned="true" - android:gravity="center_vertical" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/icon" - android:layout_gravity="center_vertical" - android:layout_width="21dp" - android:layout_height="21dp" - android:layout_weight="0" - android:scaleType="fitXY" - android:src="?ic_rss_box" /> - - <TextView - android:id="@+id/title" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/feeds_row" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:baselineAligned="true" android:gravity="center_vertical" - android:layout_weight="1" - android:ellipsize="middle" - android:paddingStart="35dp" - android:paddingEnd="16dp" - android:singleLine="true" - tools:text="Feed title" - android:textAlignment="viewStart" - android:paddingBottom="2dp" - android:textColor="?feedlistTextColor" - android:textSize="14sp" /> + android:orientation="horizontal"> - <TextView - android:id="@+id/unread_counter" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="3200" - android:textColor="?unreadCounterColor" - android:textSize="14sp" /> + <ImageView + android:id="@+id/icon" + android:layout_gravity="center_vertical" + android:layout_width="21dp" + android:layout_height="21dp" + android:layout_weight="0" + android:scaleType="fitXY" + app:tint="?colorOnPrimaryContainer" + android:src="?ic_rss_box" /> - <!-- <ImageButton - android:id="@+id/feed_menu_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:background="@null" - android:paddingLeft="8dp" - android:visibility="gone" - android:src="?ic_dots_vertical" /> --> + <TextView + android:id="@+id/title" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:ellipsize="middle" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:singleLine="true" + tools:text="Feed title" + android:textSize="14sp" /> + + <TextView + android:id="@+id/unread_counter" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:textAlignment="viewEnd" + android:singleLine="true" + tools:text="3200" + android:textColor="?colorTertiary" + android:textSize="14sp" /> + + <!-- <ImageButton + android:id="@+id/feed_menu_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:background="@null" + android:paddingLeft="8dp" + android:visibility="gone" + android:src="?ic_dots_vertical" /> --> -</LinearLayout>
\ No newline at end of file + </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index d5b6cb3c..c12c732d 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -1,66 +1,73 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/feeds_row" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants" - android:background="?feedsSelectedBackground" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:baselineAligned="true" - android:gravity="center_vertical" - android:orientation="horizontal"> + app:strokeWidth="0dp" + app:cardBackgroundColor="?colorTertiaryContainer" + android:layout_height="wrap_content"> - <ImageView - android:id="@+id/icon" - android:tint="?colorAccent" - android:layout_gravity="center_vertical" - android:layout_width="21dp" - android:layout_height="21dp" - android:layout_weight="0" - android:scaleType="fitXY" - android:src="?ic_rss_box" /> - - <TextView - android:id="@+id/title" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/feeds_row" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:baselineAligned="true" android:gravity="center_vertical" - android:layout_weight="1" - android:ellipsize="middle" - android:paddingStart="35dp" - android:paddingEnd="16dp" - android:singleLine="true" - tools:text="Feed title" - android:textAlignment="viewStart" - android:paddingBottom="2dp" - android:textColor="?feedlistSelectedTextColor" - android:textSize="14sp" /> + android:orientation="horizontal"> - <TextView - android:id="@+id/unread_counter" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="3200" - android:textColor="?unreadCounterColor" - android:textSize="14sp" /> + <ImageView + android:id="@+id/icon" + android:layout_gravity="center_vertical" + android:layout_width="21dp" + android:layout_height="21dp" + android:layout_weight="0" + android:scaleType="fitXY" + app:tint="?colorOnTertiaryContainer" + android:src="?ic_rss_box" /> - <!-- <ImageButton - android:id="@+id/feed_menu_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:background="@null" - android:paddingLeft="8dp" - android:visibility="gone" - android:src="?ic_dots_vertical" /> --> + <TextView + android:id="@+id/title" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:ellipsize="middle" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:singleLine="true" + tools:text="Feed title" + android:textColor="?colorOnTertiaryContainer" + android:textSize="14sp" /> + + <TextView + android:id="@+id/unread_counter" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:textAlignment="viewEnd" + android:singleLine="true" + tools:text="3200" + android:textColor="?colorTertiary" + android:textSize="14sp" /> + + <!-- <ImageButton + android:id="@+id/feed_menu_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:background="@null" + android:paddingLeft="8dp" + android:visibility="gone" + android:src="?ic_dots_vertical" /> --> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index f9f377f6..d4451bbe 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" android:paddingLeft="16dp" android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" android:baselineAligned="true" android:gravity="center_vertical" android:orientation="horizontal"> @@ -20,6 +19,7 @@ android:layout_height="21dp" android:layout_weight="0" android:scaleType="fitXY" + app:tint="?colorOnPrimaryContainer" android:src="?ic_rss_box" /> <TextView @@ -27,19 +27,16 @@ android:fontFamily="sans-serif-medium" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_vertical" + android:layout_gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingStart="35dp" + android:paddingStart="16dp" android:paddingEnd="16dp" android:singleLine="true" - tools:text="Unread only" - android:textAlignment="viewStart" - android:paddingBottom="2dp" - android:textColor="?feedlistTextColor" + tools:text="@string/unread_only" android:textSize="14sp" /> - <androidx.appcompat.widget.SwitchCompat + <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 61215a40..e75980b0 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/article_fragment" android:layout_width="fill_parent" - android:layout_height="match_parent" - android:background="?articleBackground"> + android:background="?colorSurfaceContainer" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/article_fullscreen_video" @@ -17,105 +17,63 @@ android:layout_height="wrap_content"> <com.google.android.material.appbar.AppBarLayout - android:background="?articleHeader" - android:elevation="0dp" - app:elevation="0dp" android:layout_width="match_parent" + android:background="?colorSurfaceContainer" android:layout_height="match_parent"> - <LinearLayout + <com.google.android.material.card.MaterialCardView app:layout_scrollFlags="scroll|enterAlways" - android:padding="16dp" + app:strokeWidth="0dp" + app:shapeAppearance="@style/ShapeAppearanceArticleHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout android:id="@+id/article_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="6dp"> + android:orientation="vertical"> <LinearLayout android:orientation="horizontal" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_width="match_parent" android:layout_height="match_parent"> <TextView android:id="@+id/title" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginEnd="8dp" - android:textAlignment="viewStart" + android:textColor="?colorPrimary" tools:text="Unreasonably long article title blah blah blah blah blah blah" - android:textColor="?articleHeaderTextColor" android:textSize="18sp" - android:layout_marginRight="8dp" android:gravity="start" /> - <ImageView - android:id="@+id/score" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" - android:layout_marginLeft="8dp" - android:src="?ic_action_trending_flat" - android:layout_gravity="center_vertical|end" /> - - <ImageView - android:id="@+id/attachments" - android:background="@drawable/ripple" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:layout_marginLeft="8dp" - android:clickable="true" - android:src="?ic_attachment_vert" - android:layout_gravity="center_vertical|end" /> - - <ImageView - android:id="@+id/share" - android:background="@drawable/ripple" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:clickable="true" - android:src="?ic_share" - android:layout_gravity="center_vertical|end" /> </LinearLayout> <TextView android:id="@+id/comments" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" tools:text="comments" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAlignment="viewStart" android:layout_weight="1" android:fontFamily="sans-serif-light" - android:paddingTop="8dp" - android:textColor="?headlineSecondaryTextColor" + android:layout_marginTop="8dp" + android:textColor="?colorPrimary" android:textSize="12sp" /> - <TextView - android:id="@+id/host" - tools:text="host" - android:background="@drawable/ripple" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAlignment="viewStart" - android:layout_weight="1" - android:fontFamily="sans-serif-light" - android:paddingTop="8dp" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" - android:visibility="gone"/> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="8dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp"> <TextView android:id="@+id/tags" @@ -127,7 +85,7 @@ android:textAlignment="viewStart" android:singleLine="true" android:fontFamily="sans-serif-light" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> <TextView @@ -136,69 +94,64 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.3" - android:gravity="" android:textAlignment="viewEnd" android:fontFamily="sans-serif-light" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> </LinearLayout> - </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <View - android:layout_gravity="top|center_horizontal" - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?articleHeaderSeparator"/> + <com.google.android.material.card.MaterialCardView + android:id="@+id/note_container" + android:layout_width="match_parent" + app:cardBackgroundColor="?colorTertiaryContainer" + android:layout_margin="8dp" + app:strokeWidth="0dp" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_margin="8dp" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/note" + tools:text="Article note (if any...)" + android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:textColor="?colorOnTertiaryContainer" + android:layout_weight="1" + android:textSize="12sp"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + app:tint="?colorOnTertiaryContainer" + android:src="@drawable/baseline_note_24"/> + + </LinearLayout> + </com.google.android.material.card.MaterialCardView> + + </LinearLayout> + </LinearLayout> + </com.google.android.material.card.MaterialCardView> </com.google.android.material.appbar.AppBarLayout> - <androidx.core.widget.NestedScrollView - android:id="@+id/article_scrollview" - android:scrollbars="vertical|horizontal" + <com.telefonica.nestedscrollwebview.NestedScrollWebView + android:id="@+id/article_content" app:layout_behavior="@string/appbar_scrolling_view_behavior" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:descendantFocusability="blocksDescendants" - android:orientation="vertical" > - - <TextView - android:id="@+id/note" - tools:text="Article note (if any...)" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="?articleNoteBackground" - android:textColor="?articleNoteTextColor" - android:textSize="12sp" - android:paddingLeft="16dp" - android:paddingTop="8dp" - android:paddingRight="16dp" - android:paddingBottom="8dp" /> - - <org.fox.ttrss.util.LessBrokenWebView - android:layout_margin="16dp" - android:id="@+id/article_content" - android:scrollbars="none" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> - </androidx.core.widget.NestedScrollView> + android:layout_height="wrap_content" /> </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout> - <TextView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/article_status_message" - android:gravity="center" - android:visibility="gone" /> - </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml index 62b3fea4..1a687b1d 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml @@ -2,6 +2,5 @@ <androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/article_pager" - android:background="?android:colorBackground" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="wrap_content"/> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml deleted file mode 100755 index 64240be6..00000000 --- a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/cats_fragment.xml" - android:layout_width="match_parent" - android:layout_height="fill_parent" > - - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:id="@+id/feeds_swipe_container" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ListView - android:id="@+id/feeds" - android:dividerHeight="0dp" - android:divider="@null" - android:layout_width="match_parent" - android:layout_height="match_parent" > - </ListView> - </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> -</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index 2d8d963b..bf26e3fc 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -11,8 +11,10 @@ <ListView android:id="@+id/feeds" - android:dividerHeight="0dp" + android:dividerHeight="4dp" android:divider="@null" + android:paddingStart="4dp" + android:paddingEnd="4dp" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index 9f09290f..2783a1e4 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines_fragment" - android:background="?android:colorBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -12,6 +11,7 @@ <org.fox.ttrss.util.ContextMenuRecyclerView android:id="@+id/headlines_list" + android:background="?colorSurfaceContainer" android:drawSelectorOnTop="true" android:scrollbars="vertical" android:layout_width="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml index 6e43864a..4ce8c1dd 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines_fragment" - android:background="?android:colorBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -12,7 +11,11 @@ <ListView android:id="@+id/headlines_list" + android:background="?colorSurfaceContainer" android:drawSelectorOnTop="true" + android:padding="8dp" + android:dividerHeight="8dp" + android:divider="@null" android:layout_width="match_parent" android:layout_height="match_parent" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml index a734a294..b4d52fd5 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml @@ -11,6 +11,6 @@ android:layout_marginBottom="10dp" android:layout_width="128dp" android:layout_height="1dp" - android:background="?headlineFooterColor"/> + android:background="?colorPrimary"/> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 2e997e2c..52bbae56 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" + app:strokeWidth="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content"> @@ -12,162 +17,136 @@ android:shrinkColumns="0,1" android:stretchColumns="0,1"> - <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/flavorImageHolder" + <RelativeLayout + android:id="@+id/headline_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_span="2"> + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - <RelativeLayout + <TextView + android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorPrimary" + android:textSize="18sp" + android:textStyle="normal" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" - style="?android:attr/progressBarStyleHorizontal" - android:layout_alignParentTop="false" - android:layout_alignParentRight="false" - android:layout_alignParentEnd="true" - android:max="100" - android:indeterminate="false" - android:layout_toRightOf="@+id/flavor_video" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/title" + android:orientation="horizontal"> - <ImageView - android:id="@+id/flavor_image" - android:foreground="@drawable/ripple" - android:layout_width="match_parent" + <TextView + android:id="@+id/feed_title" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:cropToPadding="true" - android:scaleType="fitCenter" - android:visibility="visible" /> + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - <TextureView - android:id="@+id/flavor_video" - android:foreground="@null" - android:layout_width="match_parent" + <TextView + android:id="@+id/date" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@null" - android:cropToPadding="true" - android:src="@drawable/drawer_header" - android:scaleType="fitCenter" - android:visibility="gone" - android:layout_alignBottom="@+id/flavor_image" - android:layout_alignTop="@+id/flavor_image" /> + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - <RelativeLayout - android:id="@+id/headline_header" - android:clickable="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlineHeaderBackground" - android:padding="16dp"> + </LinearLayout> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/ripple" - android:ellipsize="end" - android:textAlignment="viewStart" - android:gravity="center_vertical" - android:maxLines="3" - android:paddingBottom="8dp" - android:singleLine="false" - android:textColor="?headlineExcerptTextColor" - android:textSize="18sp" - android:textStyle="normal" - tools:text="Sample entry title" /> + </RelativeLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/title" - android:orientation="horizontal" - android:id="@+id/linearLayout2"> + </TableRow> - <TextView - android:id="@+id/feed_title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="middle" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewStart" - android:singleLine="true" - tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" > - <TextView - android:id="@+id/date" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="none" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="Jan 01, 12:00, 1970" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <FrameLayout + android:id="@+id/flavorImageHolder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2"> - </LinearLayout> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="false" + android:max="100" + android:visibility="visible" /> - </RelativeLayout> + <ImageView + android:id="@+id/flavor_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:cropToPadding="true" + android:scaleType="centerCrop" + tools:src="@drawable/ic_launcher_background" + android:visibility="visible" /> - </RelativeLayout> + <TextureView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@null" + android:cropToPadding="true" + android:foreground="@null" + android:scaleType="fitCenter" + android:visibility="gone" /> <ImageView android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start|bottom" + android:layout_marginStart="8dp" + android:layout_marginBottom="10dp" + android:elevation="4dp" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" - android:layout_below="@+id/headline_header" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="8dp" - android:layout_marginStart="8dp" /> + app:tint="?colorTertiary" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/gallery_overflow" - android:clickable="true" + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="10dp" - tools:targetApi="lollipop" /> + android:layout_marginEnd="-8dp" + app:icon="@drawable/baseline_more_vert_24" + app:iconTint="?colorTertiary"/> </FrameLayout> </TableRow> @@ -187,7 +166,6 @@ android:maxLines="5" android:padding="16dp" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -204,7 +182,7 @@ android:paddingBottom="8dp" android:paddingLeft="8dp"> - <CheckBox + <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/selected" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -222,65 +200,60 @@ android:singleLine="true" tools:text="by Author" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:textStyle="italic" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/score" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_action_trending_flat" /> + app:icon="?ic_action_trending_flat" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/attachments" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_attachment" /> + app:icon="?ic_attachment" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/marked" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_star_outline" /> + app:icon="?ic_star_outline" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/published" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_rss_box" /> + app:icon="?ic_rss_box" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/article_menu_button" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_dots_vertical" /> + app:icon="?ic_dots_vertical" /> </LinearLayout> </TableRow> </TableLayout> - -</FrameLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index d139313e..fd328276 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" @@ -48,7 +49,7 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorPrimary" android:textSize="18sp" android:layout_span="2" /> @@ -60,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorSecondary" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -80,7 +81,7 @@ android:singleLine="true" tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -105,22 +106,20 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorPrimary" android:textSize="12sp" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml index 2e449dbb..6030df54 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml @@ -2,12 +2,14 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorTertiaryContainer" + android:textColor="?colorOnTertiaryContainer" tools:ignore="HardcodedText" > <FrameLayout @@ -49,7 +51,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineSelectedTextColor" android:textSize="18sp" android:layout_span="2" /> @@ -61,7 +62,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -81,7 +81,6 @@ android:singleLine="true" tools:text="Example Feed" android:textAlignment="viewStart" - android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -106,23 +105,20 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSelectedSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:tint="?headlineFooterColor" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml index 024eb7cf..0d8d930d 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml @@ -2,12 +2,13 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorTertiaryContainer" tools:ignore="HardcodedText" > <FrameLayout @@ -47,7 +48,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineSelectedTextColor" android:textStyle="bold" android:textSize="18sp" android:layout_span="2" /> @@ -60,7 +60,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -80,7 +79,6 @@ android:singleLine="true" tools:text="Example Feed" android:textAlignment="viewStart" - android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -105,23 +103,17 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSelectedSecondaryTextColor" - android:textSize="12sp" - /> + android:textColor="?colorSecondary" + android:textSize="12sp" /> - - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:tint="?headlineFooterColor" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml index e440188f..222d19d1 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml @@ -2,12 +2,13 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineUnreadBackground" + android:background="?colorSurfaceContainerLowest" tools:ignore="HardcodedText" > <FrameLayout @@ -49,7 +50,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineUnreadTextColor" android:textStyle="bold" android:textSize="18sp" android:layout_span="2" /> @@ -62,7 +62,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -82,7 +81,6 @@ android:singleLine="true" tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -103,38 +101,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="sans-serif-light" + android:textColor="?colorSecondary" android:singleLine="true" android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" - /> + android:textSize="12sp" /> - - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> - <!-- <ImageView - android:id="@+id/article_menu_button" - android:layout_gravity="center" - android:layout_width="wrap_content" - android:layout_height="16dp" - android:layout_weight="0" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_action_overflow" /> --> - - </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml index 6444bfa5..43e9d8c8 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml @@ -19,7 +19,7 @@ android:id="@+id/loadmore_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorSecondary" android:text="@string/loading_message" /> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index ba70bb89..4b20d9cb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -1,10 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" + app:cardBackgroundColor="?colorSurfaceContainerLowest" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" + app:strokeWidth="0dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?headlineUnreadBackground"> + android:layout_height="wrap_content"> <TableLayout android:layout_width="fill_parent" @@ -17,157 +22,131 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/flavorImageHolder" + <RelativeLayout + android:id="@+id/headline_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_span="2"> + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - <RelativeLayout + <TextView + android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorOnSurface" + android:textSize="18sp" + android:textStyle="bold" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" - style="?android:attr/progressBarStyleHorizontal" - android:layout_alignParentTop="false" - android:layout_alignParentRight="false" - android:layout_alignParentEnd="true" - android:max="100" - android:indeterminate="false" - android:layout_toRightOf="@+id/flavor_video" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/title" + android:orientation="horizontal"> - <ImageView - android:id="@+id/flavor_image" - android:foreground="@drawable/ripple" - android:layout_width="match_parent" + <TextView + android:id="@+id/feed_title" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:cropToPadding="true" - android:scaleType="fitCenter" - android:visibility="visible" /> + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - <TextureView - android:id="@+id/flavor_video" - android:foreground="@null" - android:layout_width="match_parent" + <TextView + android:id="@+id/date" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@null" - android:cropToPadding="true" - android:src="@drawable/drawer_header" - android:scaleType="fitCenter" - android:visibility="gone" - android:layout_alignBottom="@+id/flavor_image" - android:layout_alignTop="@+id/flavor_image" /> + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - <RelativeLayout - android:id="@+id/headline_header" - android:clickable="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlineHeaderBackground" - android:padding="16dp"> + </LinearLayout> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_span="2" - android:background="@drawable/ripple" - android:ellipsize="end" - android:gravity="center_vertical" - android:maxLines="3" - android:paddingBottom="8dp" - android:singleLine="false" - android:textAlignment="viewStart" - android:textColor="?headlineUnreadTextColor" - android:textSize="18sp" - android:textStyle="bold" - tools:text="Sample entry title" /> + </RelativeLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/title" - android:orientation="horizontal" - android:id="@+id/linearLayout2"> + </TableRow> - <TextView - android:id="@+id/feed_title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="middle" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewStart" - android:singleLine="true" - tools:text="Example Feed" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" > - <TextView - android:id="@+id/date" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="none" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="Jan 01, 12:00, 1970" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <FrameLayout + android:id="@+id/flavorImageHolder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2"> - </LinearLayout> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="false" + android:max="100" + android:visibility="visible" /> - </RelativeLayout> + <ImageView + android:id="@+id/flavor_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:cropToPadding="true" + android:scaleType="centerCrop" + tools:src="@drawable/ic_launcher_background" + android:visibility="visible" /> - </RelativeLayout> + <TextureView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@null" + android:cropToPadding="true" + android:foreground="@null" + android:scaleType="fitCenter" + android:visibility="gone" /> <ImageView android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|start" + android:layout_gravity="start|bottom" + android:layout_marginStart="8dp" + android:layout_marginBottom="10dp" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" - android:layout_below="@+id/headline_header" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:tint="?colorAccent" - android:layout_marginStart="8dp" - android:layout_marginBottom="8dp" /> + app:tint="?colorTertiary" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/gallery_overflow" - android:clickable="true" + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="10dp" - tools:targetApi="lollipop" /> + android:layout_marginEnd="-8dp" + app:icon="@drawable/baseline_more_vert_24" + app:iconTint="?colorTertiary"/> </FrameLayout> </TableRow> @@ -187,7 +166,6 @@ android:maxLines="5" android:padding="16dp" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -204,7 +182,7 @@ android:paddingBottom="8dp" android:paddingLeft="8dp"> - <CheckBox + <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/selected" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -222,65 +200,60 @@ android:singleLine="true" tools:text="by Author" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:textStyle="italic" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/score" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_action_trending_flat" /> + app:icon="?ic_action_trending_flat" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/attachments" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_attachment" /> + app:icon="?ic_attachment" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/marked" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_star_outline" /> + app:icon="?ic_star_outline" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/published" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_rss_box" /> + app:icon="?ic_rss_box" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/article_menu_button" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_dots_vertical" /> + app:icon="?ic_dots_vertical" /> </LinearLayout> </TableRow> </TableLayout> - -</FrameLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml new file mode 100644 index 00000000..429b27c0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml @@ -0,0 +1,39 @@ +<androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/detail_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_open_in_browser_24" + android:layout_margin="16dp" /> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/article_fragment" + app:layout_behavior=".util.DetailActivityScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + </FrameLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp"> + </FrameLayout> + +</androidx.coordinatorlayout.widget.CoordinatorLayout> + diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml new file mode 100644 index 00000000..b4cb6b59 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml @@ -0,0 +1,53 @@ +<androidx.drawerlayout.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines_drawer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/headlines_coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/master_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_refresh_24" + android:layout_margin="16dp" /> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + <com.google.android.material.navigation.NavigationView + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/modal_navigation_view" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start"> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </FrameLayout> + + </com.google.android.material.navigation.NavigationView> + +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml new file mode 100644 index 00000000..94d654f0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml --> +<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/switchWidget" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@null" + android:clickable="false" + android:focusable="false" />
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index f5fb7654..989292b2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.Toolbar +<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" - android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + app:titleTextAppearance="?attr/textAppearanceTitleMedium" android:layout_height="wrap_content" android:layout_width="match_parent" - android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimary" />
\ No newline at end of file + android:minHeight="?attr/actionBarSize"/> diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml index b3afdafc..35981c01 100644 --- a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml +++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml @@ -3,18 +3,21 @@ <item android:id="@+id/selection_toggle_unread" app:showAsAction="always" - android:icon="@drawable/ic_email_open" + app:iconTint="?attr/colorControlNormal" + android:icon="@drawable/baseline_mark_as_unread_24" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_star_outline" + android:icon="@drawable/baseline_star_outline_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="always" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_rss_box" + android:icon="@drawable/baseline_rss_feed_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="always" android:title="@string/selection_toggle_published"/> diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml index 52ee9b26..66734665 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml @@ -2,13 +2,15 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/logcat_refresh" - android:icon="@drawable/ic_refresh" + android:icon="@drawable/baseline_refresh_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/logcat_refresh"/> <item android:id="@+id/logcat_copy" - android:icon="@drawable/ic_content_copy" + android:icon="@drawable/baseline_content_copy_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/logcat_copy"/> diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml index d2ef27a0..f983e224 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_main.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml @@ -12,22 +12,27 @@ <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/search" - android:icon="@drawable/ic_search" + android:icon="@drawable/baseline_search_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" app:showAsAction="" + app:iconTint="?attr/colorControlNormal" + android:icon="@drawable/baseline_mark_email_read_24" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" app:showAsAction="ifRoom" - android:icon="@drawable/ic_select" + app:iconTint="?attr/colorControlNormal" + android:icon="@drawable/baseline_select_all_24" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_toggle_sort_order" - android:icon="@drawable/ic_sort" + app:iconTint="?attr/colorControlNormal" + android:icon="@drawable/baseline_sort_by_alpha_24" app:showAsAction="ifRoom" android:title="@string/toggle_sort_order"/> @@ -45,29 +50,31 @@ <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_star_outline" + android:icon="@drawable/baseline_star_outline_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_rss_box" + android:icon="@drawable/baseline_rss_feed_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item android:id="@+id/toggle_unread" - android:icon="@drawable/ic_email" - app:showAsAction="ifRoom" + android:icon="@drawable/baseline_email_24" + app:iconTint="?attr/colorControlNormal" android:title="@string/article_toggle_unread"/> - <!-- <item + <item android:id="@+id/toggle_attachments" - android:icon="@drawable/ic_attachment" + android:icon="@drawable/baseline_attach_file_24" app:showAsAction="" - android:title="@string/attachments_prompt"/> --> - <!-- <item + android:title="@string/attachments_prompt"/> + <item android:id="@+id/share_article" - android:icon="@drawable/ic_share" + android:icon="@drawable/baseline_share_24" app:showAsAction="ifRoom" - android:title="@string/share_article"/> --> + android:title="@string/share_article"/> <item android:id="@+id/set_labels" app:showAsAction="" @@ -76,6 +83,10 @@ android:id="@+id/article_set_note" app:showAsAction="" android:title="@string/article_set_note"/> + <item + android:id="@+id/article_set_score" + app:showAsAction="" + android:title="@string/set_score"/> <item android:id="@+id/catchup_above" @@ -83,26 +94,21 @@ </group> - <!-- <item - android:orderInCategory="999" - android:id="@+id/preferences" - android:icon="@drawable/ic_settings" - app:showAsAction="" - android:title="@string/preferences"/> --> - </group> <group android:id="@+id/menu_group_logged_out" > <item android:id="@+id/login" - android:icon="@drawable/ic_login" + android:icon="@drawable/baseline_login_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/login_login"/> <item android:orderInCategory="999" android:id="@+id/preferences" - android:icon="@drawable/ic_settings" + android:icon="@drawable/baseline_settings_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" android:title="@string/preferences"/> diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml index c533ae75..09dbf194 100644 --- a/org.fox.ttrss/src/main/res/menu/activity_offline.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml @@ -5,22 +5,22 @@ <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/search" - app:showAsAction="ifRoom" - android:icon="@drawable/ic_search" - android:title="@string/search"/> + android:icon="@drawable/baseline_search_24" + android:title="@string/search" + app:showAsAction="ifRoom" /> <item android:id="@+id/headlines_mark_as_read" app:showAsAction="" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_select" + android:icon="@drawable/baseline_select_all_24" app:showAsAction="ifRoom" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_toggle_sort_order" - android:icon="@drawable/ic_sort" + android:icon="@drawable/baseline_sort_24" app:showAsAction="ifRoom" android:title="@string/toggle_sort_order"/> @@ -32,17 +32,17 @@ <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_star_outline" + android:icon="@drawable/baseline_star_outline_24" app:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_rss_box" + android:icon="@drawable/baseline_rss_feed_24" app:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item android:id="@+id/toggle_unread" - android:icon="@drawable/ic_email" + android:icon="@drawable/baseline_email_24" app:showAsAction="ifRoom" android:title="@string/article_toggle_unread"/> <!-- <item diff --git a/org.fox.ttrss/src/main/res/menu/activity_share.xml b/org.fox.ttrss/src/main/res/menu/activity_share.xml index 40bb9237..2722f68b 100644 --- a/org.fox.ttrss/src/main/res/menu/activity_share.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_share.xml @@ -2,7 +2,7 @@ <item android:id="@+id/preferences" - android:icon="@drawable/ic_settings" + android:icon="@drawable/baseline_settings_24" app:showAsAction="" android:title="@string/preferences"/> diff --git a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml deleted file mode 100644 index acce1d3a..00000000 --- a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml +++ /dev/null @@ -1,19 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools"> - - <item - android:id="@+id/article_vid_open" - app:showAsAction="" - android:title="@string/open_with"/> - <item - android:id="@+id/article_vid_copy" - app:showAsAction="" - android:icon="@drawable/ic_content_copy" - android:title="@string/article_link_copy"/> - <item - android:id="@+id/article_vid_share" - android:icon="@drawable/ic_share" - app:showAsAction="ifRoom" - android:title="@string/video_player_share"/> -</menu> diff --git a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml index 70e2bdfb..12bc5c20 100755 --- a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml +++ b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml @@ -7,16 +7,19 @@ <item android:id="@+id/article_img_copy" app:showAsAction="" - android:icon="@drawable/ic_content_copy" + app:iconTint="?attr/colorControlNormal" + android:icon="@drawable/baseline_content_copy_24" android:title="@string/article_link_copy"/> <item android:id="@+id/article_img_share" - android:icon="@drawable/ic_share" + android:icon="@drawable/baseline_share_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="" android:title="@string/img_share_image"/> <item android:id="@+id/article_img_share_url" - android:icon="@drawable/ic_share" + android:icon="@drawable/baseline_share_24" + app:iconTint="?attr/colorControlNormal" app:showAsAction="" android:title="@string/img_share_url"/> <item diff --git a/org.fox.ttrss/src/main/res/values-night-v21/style.xml b/org.fox.ttrss/src/main/res/values-night-v21/style.xml deleted file mode 100644 index c154ed8a..00000000 --- a/org.fox.ttrss/src/main/res/values-night-v21/style.xml +++ /dev/null @@ -1,12 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar"> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowBackground">@color/window_background_dark</item> - <item name="android:navigationBarColor">@android:color/black</item> - </style> - - <style name="DarkDialogTheme" parent="android:Theme.Material.Dialog"> - </style> - -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-night/colors.xml b/org.fox.ttrss/src/main/res/values-night/colors.xml new file mode 100644 index 00000000..86ffc96f --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/colors.xml @@ -0,0 +1,143 @@ +<resources> + <color name="md_theme_primary">#93CDF6</color> + <color name="md_theme_onPrimary">#00344C</color> + <color name="md_theme_primaryContainer">#004C6C</color> + <color name="md_theme_onPrimaryContainer">#C7E7FF</color> + <color name="md_theme_secondary">#B6C9D8</color> + <color name="md_theme_onSecondary">#21323E</color> + <color name="md_theme_secondaryContainer">#374955</color> + <color name="md_theme_onSecondaryContainer">#D2E5F5</color> + <color name="md_theme_tertiary">#FFB5A0</color> + <color name="md_theme_onTertiary">#561F0F</color> + <color name="md_theme_tertiaryContainer">#723523</color> + <color name="md_theme_onTertiaryContainer">#FFDBD1</color> + <color name="md_theme_error">#FFB4AB</color> + <color name="md_theme_onError">#690005</color> + <color name="md_theme_errorContainer">#93000A</color> + <color name="md_theme_onErrorContainer">#FFDAD6</color> + <color name="md_theme_background">#101417</color> + <color name="md_theme_onBackground">#DFE3E7</color> + <color name="md_theme_surface">#101417</color> + <color name="md_theme_onSurface">#DFE3E7</color> + <color name="md_theme_surfaceVariant">#41484D</color> + <color name="md_theme_onSurfaceVariant">#C1C7CE</color> + <color name="md_theme_outline">#8B9198</color> + <color name="md_theme_outlineVariant">#41484D</color> + <color name="md_theme_scrim">#000000</color> + <color name="md_theme_inverseSurface">#DFE3E7</color> + <color name="md_theme_inverseOnSurface">#2D3135</color> + <color name="md_theme_inversePrimary">#226488</color> + <color name="md_theme_primaryFixed">#C7E7FF</color> + <color name="md_theme_onPrimaryFixed">#001E2E</color> + <color name="md_theme_primaryFixedDim">#93CDF6</color> + <color name="md_theme_onPrimaryFixedVariant">#004C6C</color> + <color name="md_theme_secondaryFixed">#D2E5F5</color> + <color name="md_theme_onSecondaryFixed">#0B1D29</color> + <color name="md_theme_secondaryFixedDim">#B6C9D8</color> + <color name="md_theme_onSecondaryFixedVariant">#374955</color> + <color name="md_theme_tertiaryFixed">#FFDBD1</color> + <color name="md_theme_onTertiaryFixed">#3A0B01</color> + <color name="md_theme_tertiaryFixedDim">#FFB5A0</color> + <color name="md_theme_onTertiaryFixedVariant">#723523</color> + <color name="md_theme_surfaceDim">#101417</color> + <color name="md_theme_surfaceBright">#353A3D</color> + <color name="md_theme_surfaceContainerLowest">#0A0F12</color> + <color name="md_theme_surfaceContainerLow">#181C20</color> + <color name="md_theme_surfaceContainer">#1C2024</color> + <color name="md_theme_surfaceContainerHigh">#262A2E</color> + <color name="md_theme_surfaceContainerHighest">#313539</color> + <color name="md_theme_primary_mediumContrast">#BAE1FF</color> + <color name="md_theme_onPrimary_mediumContrast">#00293D</color> + <color name="md_theme_primaryContainer_mediumContrast">#5C97BD</color> + <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color> + <color name="md_theme_secondary_mediumContrast">#CCDFEE</color> + <color name="md_theme_onSecondary_mediumContrast">#162833</color> + <color name="md_theme_secondaryContainer_mediumContrast">#8193A1</color> + <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color> + <color name="md_theme_tertiary_mediumContrast">#FFD2C7</color> + <color name="md_theme_onTertiary_mediumContrast">#481506</color> + <color name="md_theme_tertiaryContainer_mediumContrast">#CB7C66</color> + <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color> + <color name="md_theme_error_mediumContrast">#FFD2CC</color> + <color name="md_theme_onError_mediumContrast">#540003</color> + <color name="md_theme_errorContainer_mediumContrast">#FF5449</color> + <color name="md_theme_onErrorContainer_mediumContrast">#000000</color> + <color name="md_theme_background_mediumContrast">#101417</color> + <color name="md_theme_onBackground_mediumContrast">#DFE3E7</color> + <color name="md_theme_surface_mediumContrast">#101417</color> + <color name="md_theme_onSurface_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceVariant_mediumContrast">#41484D</color> + <color name="md_theme_onSurfaceVariant_mediumContrast">#D7DDE4</color> + <color name="md_theme_outline_mediumContrast">#ACB3B9</color> + <color name="md_theme_outlineVariant_mediumContrast">#8B9197</color> + <color name="md_theme_scrim_mediumContrast">#000000</color> + <color name="md_theme_inverseSurface_mediumContrast">#DFE3E7</color> + <color name="md_theme_inverseOnSurface_mediumContrast">#262B2E</color> + <color name="md_theme_inversePrimary_mediumContrast">#004D6E</color> + <color name="md_theme_primaryFixed_mediumContrast">#C7E7FF</color> + <color name="md_theme_onPrimaryFixed_mediumContrast">#00131F</color> + <color name="md_theme_primaryFixedDim_mediumContrast">#93CDF6</color> + <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003A54</color> + <color name="md_theme_secondaryFixed_mediumContrast">#D2E5F5</color> + <color name="md_theme_onSecondaryFixed_mediumContrast">#02131E</color> + <color name="md_theme_secondaryFixedDim_mediumContrast">#B6C9D8</color> + <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273844</color> + <color name="md_theme_tertiaryFixed_mediumContrast">#FFDBD1</color> + <color name="md_theme_onTertiaryFixed_mediumContrast">#290400</color> + <color name="md_theme_tertiaryFixedDim_mediumContrast">#FFB5A0</color> + <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#5D2515</color> + <color name="md_theme_surfaceDim_mediumContrast">#101417</color> + <color name="md_theme_surfaceBright_mediumContrast">#414549</color> + <color name="md_theme_surfaceContainerLowest_mediumContrast">#05080B</color> + <color name="md_theme_surfaceContainerLow_mediumContrast">#1A1E22</color> + <color name="md_theme_surfaceContainer_mediumContrast">#24282C</color> + <color name="md_theme_surfaceContainerHigh_mediumContrast">#2F3337</color> + <color name="md_theme_surfaceContainerHighest_mediumContrast">#3A3E42</color> + <color name="md_theme_primary_highContrast">#E3F2FF</color> + <color name="md_theme_onPrimary_highContrast">#000000</color> + <color name="md_theme_primaryContainer_highContrast">#8FC9F2</color> + <color name="md_theme_onPrimaryContainer_highContrast">#000D16</color> + <color name="md_theme_secondary_highContrast">#E3F2FF</color> + <color name="md_theme_onSecondary_highContrast">#000000</color> + <color name="md_theme_secondaryContainer_highContrast">#B3C5D4</color> + <color name="md_theme_onSecondaryContainer_highContrast">#000D16</color> + <color name="md_theme_tertiary_highContrast">#FFECE7</color> + <color name="md_theme_onTertiary_highContrast">#000000</color> + <color name="md_theme_tertiaryContainer_highContrast">#FFAF99</color> + <color name="md_theme_onTertiaryContainer_highContrast">#1E0300</color> + <color name="md_theme_error_highContrast">#FFECE9</color> + <color name="md_theme_onError_highContrast">#000000</color> + <color name="md_theme_errorContainer_highContrast">#FFAEA4</color> + <color name="md_theme_onErrorContainer_highContrast">#220001</color> + <color name="md_theme_background_highContrast">#101417</color> + <color name="md_theme_onBackground_highContrast">#DFE3E7</color> + <color name="md_theme_surface_highContrast">#101417</color> + <color name="md_theme_onSurface_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceVariant_highContrast">#41484D</color> + <color name="md_theme_onSurfaceVariant_highContrast">#FFFFFF</color> + <color name="md_theme_outline_highContrast">#EAF1F7</color> + <color name="md_theme_outlineVariant_highContrast">#BDC3CA</color> + <color name="md_theme_scrim_highContrast">#000000</color> + <color name="md_theme_inverseSurface_highContrast">#DFE3E7</color> + <color name="md_theme_inverseOnSurface_highContrast">#000000</color> + <color name="md_theme_inversePrimary_highContrast">#004D6E</color> + <color name="md_theme_primaryFixed_highContrast">#C7E7FF</color> + <color name="md_theme_onPrimaryFixed_highContrast">#000000</color> + <color name="md_theme_primaryFixedDim_highContrast">#93CDF6</color> + <color name="md_theme_onPrimaryFixedVariant_highContrast">#00131F</color> + <color name="md_theme_secondaryFixed_highContrast">#D2E5F5</color> + <color name="md_theme_onSecondaryFixed_highContrast">#000000</color> + <color name="md_theme_secondaryFixedDim_highContrast">#B6C9D8</color> + <color name="md_theme_onSecondaryFixedVariant_highContrast">#02131E</color> + <color name="md_theme_tertiaryFixed_highContrast">#FFDBD1</color> + <color name="md_theme_onTertiaryFixed_highContrast">#000000</color> + <color name="md_theme_tertiaryFixedDim_highContrast">#FFB5A0</color> + <color name="md_theme_onTertiaryFixedVariant_highContrast">#290400</color> + <color name="md_theme_surfaceDim_highContrast">#101417</color> + <color name="md_theme_surfaceBright_highContrast">#4C5155</color> + <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color> + <color name="md_theme_surfaceContainerLow_highContrast">#1C2024</color> + <color name="md_theme_surfaceContainer_highContrast">#2D3135</color> + <color name="md_theme_surfaceContainerHigh_highContrast">#383C40</color> + <color name="md_theme_surfaceContainerHighest_highContrast">#43474B</color> +</resources> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml deleted file mode 100644 index 3c15a0fd..00000000 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ /dev/null @@ -1,66 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="AppTheme" parent="AppTheme.Base"> - <item name="windowActionModeOverlay">true</item> - - <!-- <item name="statusBarHintColor">?colorPrimary</item> --> - <item name="unreadCounterColor">#909090</item> - <item name="feedlistTextColor">@android:color/white</item> - <item name="headlineUnreadTextColor">@android:color/white</item> - <item name="headlineSelectedTextColor">@android:color/white</item> - <item name="headlineExcerptTextColor">#bebebe</item> - <item name="headlineSecondaryTextColor">#909090</item> - <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> - <item name="headlineSelectedExcerptTextColor">#bebebe</item> - <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item> - <item name="headlineSelectedBackground">#1c1c1c</item> - <item name="headlineHeaderBackground">#99000000</item> - <item name="headlineUnreadBackground">#101010</item> - <item name="linkColor">#2d92c8</item> - <item name="loadingBackground">@android:color/black</item> - <item name="articleNoteTextColor">#bebebe</item> - <item name="articleNoteBackground">#303030</item> - <item name="parentBtnBackground">#101010</item> - <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> - <item name="feedlistBackground">#1c1d1e</item> - <item name="headlinesBackground">#1c1d1e</item> - <item name="articleBackground">@android:color/black</item> - <item name="feedsSelectedBackground">#1c1c1c</item> - <item name="feedlistSelectedTextColor">@android:color/white</item> - <item name="articleHeader">@android:color/transparent</item> - <item name="articleHeaderTextColor">@android:color/white</item> - <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> --> - <item name="articleTextColor">#e0e0e0</item> - <item name="headlineFooterColor">?colorPrimary</item> - <item name="articleHeaderSeparator">#303030</item> - - <item name="colorPrimary">#1e6286</item> - <item name="colorPrimaryDark">#18506e</item> - <item name="colorAccent">#D84315</item> - - <item name="ic_rss_box">@drawable/ic_rss_box</item> - <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item> - <item name="ic_star">@drawable/ic_star</item> - <item name="ic_star_outline">@drawable/ic_star_outline</item> - <item name="ic_share">@drawable/ic_share</item> - <item name="ic_inbox">@drawable/ic_inbox</item> - <item name="ic_go_back">@drawable/ic_go_back</item> - <item name="ic_settings">@drawable/ic_settings</item> - <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_fresh">@drawable/ic_fresh</item> - <item name="ic_restore">@drawable/ic_restore</item> - <item name="ic_folder_outline">@drawable/ic_folder_outline</item> - <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item> - <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item> - <item name="ic_attachment">@drawable/ic_attachment</item> - <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item> - <item name="ic_action_trending_up">@drawable/ic_action_trending_up</item> - <item name="ic_action_trending_flat">@drawable/ic_action_trending_flat</item> - <item name="ic_action_trending_down">@drawable/ic_action_trending_down</item> - - <item name="drawer_header">@drawable/drawer_header_dark</item> - </style> -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml b/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml new file mode 100644 index 00000000..02adac70 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml @@ -0,0 +1,98 @@ +<resources> + <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Dark.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> + <item name="colorError">@color/md_theme_error_mediumContrast</item> + <item name="colorOnError">@color/md_theme_onError_mediumContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item> + <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item> + <item name="colorSurface">@color/md_theme_surface_mediumContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item> + <item name="colorOutline">@color/md_theme_outline_mediumContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> + </style> + <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Dark.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_highContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_highContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> + <item name="colorError">@color/md_theme_error_highContrast</item> + <item name="colorOnError">@color/md_theme_onError_highContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item> + <item name="android:colorBackground">@color/md_theme_background_highContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item> + <item name="colorSurface">@color/md_theme_surface_highContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item> + <item name="colorOutline">@color/md_theme_outline_highContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..7d54a029 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -0,0 +1,76 @@ +<resources> + <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar"> + <item name="windowActionModeOverlay">true</item> + <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> + + <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> + <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> + <item name="ic_star">@drawable/baseline_star_24</item> + <item name="ic_star_outline">@drawable/baseline_star_outline_24</item> + <item name="ic_share">@drawable/baseline_share_24</item> + <item name="ic_inbox">@drawable/baseline_inbox_24</item> + <item name="ic_go_back">@drawable/baseline_arrow_back_24</item> + <item name="ic_settings">@drawable/baseline_settings_24</item> + <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item> + <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item> + <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item> + <item name="ic_archive">@drawable/baseline_archive_24</item> + <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item> + <item name="ic_restore">@drawable/baseline_restore_24</item> + <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item> + <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item> + <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item> + <item name="ic_attachment">@drawable/baseline_attachment_24</item> + <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item> + <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item> + <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item> + <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item> + + <item name="colorPrimary">@color/md_theme_primary</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_secondary</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_error</item> + <item name="colorOnError">@color/md_theme_onError</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_background</item> + <item name="colorOnBackground">@color/md_theme_onBackground</item> + <item name="colorSurface">@color/md_theme_surface</item> + <item name="colorOnSurface">@color/md_theme_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_outline</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values-v11/style.xml b/org.fox.ttrss/src/main/res/values-v11/style.xml deleted file mode 100644 index 54a7530e..00000000 --- a/org.fox.ttrss/src/main/res/values-v11/style.xml +++ /dev/null @@ -1,6 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog"> - </style> - -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-v21/style.xml b/org.fox.ttrss/src/main/res/values-v21/style.xml deleted file mode 100755 index 3e26f96f..00000000 --- a/org.fox.ttrss/src/main/res/values-v21/style.xml +++ /dev/null @@ -1,20 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar"> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowBackground">@color/window_background</item> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> - </style> - - <!-- <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowBackground">@color/window_background_dark</item> - <item name="android:navigationBarColor">@android:color/black</item> - </style> --> - - <style name="DarkDialogTheme" parent="android:Theme.Material.Dialog"> - </style> - -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 93892545..daf2323c 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,35 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="ttrssHorizontalDivider" format="reference|color" /> - <attr name="feedlistBackground" format="reference|color" /> - <attr name="unreadCounterColor" format="reference|color" /> - <attr name="headlinesBackground" format="reference|color" /> - <attr name="articleBackground" format="reference|color" /> - <attr name="headlineSelectedBackground" format="reference|color" /> - <attr name="headlineUnreadBackground" format="reference|color" /> - <attr name="feedsSelectedBackground" format="reference|color" /> - <attr name="feedlistTextColor" format="reference|color" /> - <attr name="feedlistSelectedTextColor" format="reference|color" /> - <!-- <attr name="headlineTextColor" format="reference|color" /> --> - <attr name="headlineHeaderBackground" format="reference|color" /> - <attr name="headlineUnreadTextColor" format="reference|color" /> - <attr name="headlineSelectedTextColor" format="reference|color" /> - <attr name="headlineExcerptTextColor" format="reference|color" /> - <attr name="headlineSecondaryTextColor" format="reference|color" /> - <attr name="headlineSelectedSecondaryTextColor" format="reference|color" /> - <attr name="headlineSelectedExcerptTextColor" format="reference|color" /> - <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" /> - <attr name="linkColor" format="reference|color" /> - <attr name="loadingBackground" format="reference|color" /> - <attr name="articleNoteBackground" format="reference|color" /> - <attr name="articleNoteTextColor" format="reference|color" /> - <!-- <attr name="statusBarHintColor" format="reference|color" /> --> - <attr name="parentBtnBackground" format="reference|color" /> - <attr name="articleHeader" format="reference|color" /> - <attr name="articleHeaderTextColor" format="reference|color" /> - <attr name="articleTextColor" format="reference|color" /> - <attr name="headlineFooterColor" format="reference|color" /> - <attr name="articleHeaderSeparator" format="reference|color" /> <attr name="ic_rss_box" format="reference"/> <attr name="ic_checkbox_marked" format="reference" /> <attr name="ic_star" format="reference" /> diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml index d87ac346..795cbaec 100755..100644 --- a/org.fox.ttrss/src/main/res/values/colors.xml +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -1,6 +1,143 @@ -<?xml version="1.0" encoding="utf-8"?> <resources> - <item name="window_background" type="color">#216d96</item> - <item name="window_background_dark" type="color">#18506e</item> - <item name="window_background_amber" type="color">#6e4b1a</item> -</resources>
\ No newline at end of file + <color name="md_theme_primary">#226488</color> + <color name="md_theme_onPrimary">#FFFFFF</color> + <color name="md_theme_primaryContainer">#C7E7FF</color> + <color name="md_theme_onPrimaryContainer">#004C6C</color> + <color name="md_theme_secondary">#4F616E</color> + <color name="md_theme_onSecondary">#FFFFFF</color> + <color name="md_theme_secondaryContainer">#D2E5F5</color> + <color name="md_theme_onSecondaryContainer">#374955</color> + <color name="md_theme_tertiary">#8F4B38</color> + <color name="md_theme_onTertiary">#FFFFFF</color> + <color name="md_theme_tertiaryContainer">#FFDBD1</color> + <color name="md_theme_onTertiaryContainer">#723523</color> + <color name="md_theme_error">#BA1A1A</color> + <color name="md_theme_onError">#FFFFFF</color> + <color name="md_theme_errorContainer">#FFDAD6</color> + <color name="md_theme_onErrorContainer">#93000A</color> + <color name="md_theme_background">#F6FAFE</color> + <color name="md_theme_onBackground">#181C20</color> + <color name="md_theme_surface">#F6FAFE</color> + <color name="md_theme_onSurface">#181C20</color> + <color name="md_theme_surfaceVariant">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant">#41484D</color> + <color name="md_theme_outline">#71787E</color> + <color name="md_theme_outlineVariant">#C1C7CE</color> + <color name="md_theme_scrim">#000000</color> + <color name="md_theme_inverseSurface">#2D3135</color> + <color name="md_theme_inverseOnSurface">#EEF1F6</color> + <color name="md_theme_inversePrimary">#93CDF6</color> + <color name="md_theme_primaryFixed">#C7E7FF</color> + <color name="md_theme_onPrimaryFixed">#001E2E</color> + <color name="md_theme_primaryFixedDim">#93CDF6</color> + <color name="md_theme_onPrimaryFixedVariant">#004C6C</color> + <color name="md_theme_secondaryFixed">#D2E5F5</color> + <color name="md_theme_onSecondaryFixed">#0B1D29</color> + <color name="md_theme_secondaryFixedDim">#B6C9D8</color> + <color name="md_theme_onSecondaryFixedVariant">#374955</color> + <color name="md_theme_tertiaryFixed">#FFDBD1</color> + <color name="md_theme_onTertiaryFixed">#3A0B01</color> + <color name="md_theme_tertiaryFixedDim">#FFB5A0</color> + <color name="md_theme_onTertiaryFixedVariant">#723523</color> + <color name="md_theme_surfaceDim">#D7DADF</color> + <color name="md_theme_surfaceBright">#F6FAFE</color> + <color name="md_theme_surfaceContainerLowest">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow">#F1F4F9</color> + <color name="md_theme_surfaceContainer">#EBEEF3</color> + <color name="md_theme_surfaceContainerHigh">#E5E8ED</color> + <color name="md_theme_surfaceContainerHighest">#DFE3E7</color> + <color name="md_theme_primary_mediumContrast">#003A54</color> + <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color> + <color name="md_theme_primaryContainer_mediumContrast">#357397</color> + <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondary_mediumContrast">#273844</color> + <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryContainer_mediumContrast">#5E6F7D</color> + <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiary_mediumContrast">#5D2515</color> + <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryContainer_mediumContrast">#A15A46</color> + <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_error_mediumContrast">#740006</color> + <color name="md_theme_onError_mediumContrast">#FFFFFF</color> + <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color> + <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_background_mediumContrast">#F6FAFE</color> + <color name="md_theme_onBackground_mediumContrast">#181C20</color> + <color name="md_theme_surface_mediumContrast">#F6FAFE</color> + <color name="md_theme_onSurface_mediumContrast">#0D1215</color> + <color name="md_theme_surfaceVariant_mediumContrast">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant_mediumContrast">#30373C</color> + <color name="md_theme_outline_mediumContrast">#4D5359</color> + <color name="md_theme_outlineVariant_mediumContrast">#676E74</color> + <color name="md_theme_scrim_mediumContrast">#000000</color> + <color name="md_theme_inverseSurface_mediumContrast">#2D3135</color> + <color name="md_theme_inverseOnSurface_mediumContrast">#EEF1F6</color> + <color name="md_theme_inversePrimary_mediumContrast">#93CDF6</color> + <color name="md_theme_primaryFixed_mediumContrast">#357397</color> + <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_primaryFixedDim_mediumContrast">#135A7E</color> + <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixed_mediumContrast">#5E6F7D</color> + <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixedDim_mediumContrast">#455764</color> + <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixed_mediumContrast">#A15A46</color> + <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixedDim_mediumContrast">#844230</color> + <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceDim_mediumContrast">#C3C7CB</color> + <color name="md_theme_surfaceBright_mediumContrast">#F6FAFE</color> + <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow_mediumContrast">#F1F4F9</color> + <color name="md_theme_surfaceContainer_mediumContrast">#E5E8ED</color> + <color name="md_theme_surfaceContainerHigh_mediumContrast">#DADDE2</color> + <color name="md_theme_surfaceContainerHighest_mediumContrast">#CED2D7</color> + <color name="md_theme_primary_highContrast">#003046</color> + <color name="md_theme_onPrimary_highContrast">#FFFFFF</color> + <color name="md_theme_primaryContainer_highContrast">#004E70</color> + <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_secondary_highContrast">#1D2E3A</color> + <color name="md_theme_onSecondary_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryContainer_highContrast">#3A4B58</color> + <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_tertiary_highContrast">#501B0C</color> + <color name="md_theme_onTertiary_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryContainer_highContrast">#753725</color> + <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_error_highContrast">#600004</color> + <color name="md_theme_onError_highContrast">#FFFFFF</color> + <color name="md_theme_errorContainer_highContrast">#98000A</color> + <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color> + <color name="md_theme_background_highContrast">#F6FAFE</color> + <color name="md_theme_onBackground_highContrast">#181C20</color> + <color name="md_theme_surface_highContrast">#F6FAFE</color> + <color name="md_theme_onSurface_highContrast">#000000</color> + <color name="md_theme_surfaceVariant_highContrast">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant_highContrast">#000000</color> + <color name="md_theme_outline_highContrast">#262D32</color> + <color name="md_theme_outlineVariant_highContrast">#434A50</color> + <color name="md_theme_scrim_highContrast">#000000</color> + <color name="md_theme_inverseSurface_highContrast">#2D3135</color> + <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color> + <color name="md_theme_inversePrimary_highContrast">#93CDF6</color> + <color name="md_theme_primaryFixed_highContrast">#004E70</color> + <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_primaryFixedDim_highContrast">#00374F</color> + <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixed_highContrast">#3A4B58</color> + <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixedDim_highContrast">#233541</color> + <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixed_highContrast">#753725</color> + <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixedDim_highContrast">#592111</color> + <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceDim_highContrast">#B5B9BE</color> + <color name="md_theme_surfaceBright_highContrast">#F6FAFE</color> + <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow_highContrast">#EEF1F6</color> + <color name="md_theme_surfaceContainer_highContrast">#DFE3E7</color> + <color name="md_theme_surfaceContainerHigh_highContrast">#D1D5D9</color> + <color name="md_theme_surfaceContainerHighest_highContrast">#C3C7CB</color> +</resources> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 033a9492..f97f66f8 100755..100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -1,152 +1,34 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight"> - <item name="android:windowNoTitle">true</item> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> +<resources> + <style name="ShapeAppearanceArticleHeader"> + <item name="cornerFamily">rounded</item> + <item name="cornerSizeTopLeft">0dp</item> + <item name="cornerSizeTopRight">0dp</item> + <item name="cornerSizeBottomLeft">16dp</item> + <item name="cornerSizeBottomRight">16dp</item> </style> - <style name="AppTheme" parent="AppTheme.Base"> - <item name="windowActionModeOverlay">true</item> - - <!-- <item name="statusBarHintColor">?colorPrimary</item> --> - <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> - <item name="feedlistBackground">#e0e0e0</item> - <item name="unreadCounterColor">#909090</item> - <item name="headlinesBackground">#f0f0f0</item> - <item name="articleBackground">@android:color/white</item> - <item name="headlineSelectedBackground">#dddddd</item> - <item name="headlineHeaderBackground">#ccffffff</item> - <item name="headlineUnreadBackground">@android:color/white</item> - <item name="feedsSelectedBackground">#dddddd</item> - <item name="feedlistTextColor">@android:color/black</item> - <item name="feedlistSelectedTextColor">@android:color/black</item> - <item name="headlineUnreadTextColor">@android:color/black</item> - <item name="headlineSelectedTextColor">@android:color/black</item> - <item name="headlineExcerptTextColor">#323232</item> - <item name="headlineSecondaryTextColor">#909090</item> - <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item> - <item name="headlineSelectedExcerptTextColor">#323232</item> - <item name="headlineTitleHighScoreUnreadTextColor">#008000</item> - <item name="linkColor">?colorPrimary</item> - <item name="loadingBackground">@android:color/white</item> - <item name="articleNoteTextColor">#9a8c59</item> - <item name="articleNoteBackground">#fff7d5</item> - <item name="parentBtnBackground">#dddddd</item> - <item name="articleHeader">@android:color/transparent</item> - <item name="articleHeaderTextColor">@android:color/black</item> - <item name="articleTextColor">@android:color/black</item> - <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> --> - <item name="headlineFooterColor">?colorPrimary</item> - <item name="articleHeaderSeparator">#cccccc</item> - - <item name="colorPrimary">#257eae</item> - <item name="colorPrimaryDark">#216d96</item> - <item name="colorAccent">#F4511E</item> - - <item name="ic_rss_box">@drawable/ic_rss_box_dark</item> - <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked_dark</item> - <item name="ic_star">@drawable/ic_star_dark</item> - <item name="ic_star_outline">@drawable/ic_star_outline_dark</item> - <item name="ic_share">@drawable/ic_share_dark</item> - <item name="ic_inbox">@drawable/ic_inbox_dark</item> - <item name="ic_go_back">@drawable/ic_go_back_dark</item> - <item name="ic_settings">@drawable/ic_settings_dark</item> - <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_fresh">@drawable/ic_fresh_dark</item> - <item name="ic_restore">@drawable/ic_restore_dark</item> - <item name="ic_folder_outline">@drawable/ic_folder_outline_dark</item> - <item name="ic_dots_vertical">@drawable/ic_dots_vertical_dark</item> - <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle_dark</item> - <item name="ic_attachment">@drawable/ic_attachment_dark</item> - <item name="ic_attachment_vert">@drawable/ic_attachment_vert_dark</item> - <item name="ic_action_trending_up">@drawable/ic_action_trending_up_dark</item> - <item name="ic_action_trending_flat">@drawable/ic_action_trending_flat_dark</item> - <item name="ic_action_trending_down">@drawable/ic_action_trending_down_dark</item> - - <item name="drawer_header">@drawable/drawer_header</item> + <style name="ShapeAppearanceFeedsTablet"> + <item name="cornerFamily">rounded</item> + <item name="cornerSizeTopLeft">0dp</item> + <item name="cornerSizeTopRight">16dp</item> + <item name="cornerSizeBottomLeft">0dp</item> + <item name="cornerSizeBottomRight">16dp</item> </style> - <!-- - <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> - + <style name="ShapeAppearanceHeadlinesTablet"> + <item name="cornerFamily">rounded</item> + <item name="cornerSizeTopLeft">0dp</item> + <item name="cornerSizeTopRight">16dp</item> + <item name="cornerSizeBottomLeft">0dp</item> + <item name="cornerSizeBottomRight">0dp</item> </style> - <style name="AmberTheme" parent="DarkTheme"> - <item name="colorPrimary">#b87d2c</item> - <item name="colorPrimaryDark">#6e4b1a</item> - <item name="android:windowBackground">@color/window_background_amber</item> - <item name="drawer_header">@drawable/drawer_header_amber</item> + <!-- https://stackoverflow.com/a/73782598 --> + <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay"> + <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item> </style> - <style name="DarkTheme" parent="DarkTheme.Base"> - <item name="windowActionModeOverlay">true</item> --> - - <!-- <item name="statusBarHintColor">?colorPrimary</item> --> - <!-- <item name="unreadCounterColor">#909090</item> - <item name="feedlistTextColor">@android:color/white</item> - <item name="headlineUnreadTextColor">@android:color/white</item> - <item name="headlineSelectedTextColor">@android:color/white</item> - <item name="headlineExcerptTextColor">#bebebe</item> - <item name="headlineSecondaryTextColor">#909090</item> - <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> - <item name="headlineSelectedExcerptTextColor">#bebebe</item> - <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item> - <item name="headlineSelectedBackground">#1c1c1c</item> - <item name="headlineHeaderBackground">#99000000</item> - <item name="headlineUnreadBackground">#101010</item> - <item name="linkColor">#2d92c8</item> - <item name="loadingBackground">@android:color/black</item> - <item name="articleNoteTextColor">#bebebe</item> - <item name="articleNoteBackground">#303030</item> - <item name="parentBtnBackground">#101010</item> - <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> - <item name="feedlistBackground">#1c1d1e</item> - <item name="headlinesBackground">#1c1d1e</item> - <item name="articleBackground">@android:color/black</item> - <item name="feedsSelectedBackground">#1c1c1c</item> - <item name="feedlistSelectedTextColor">@android:color/white</item> - <item name="articleHeader">@android:color/transparent</item> - <item name="articleHeaderTextColor">@android:color/white</item> - <item name="floatingActionButtonStyle">@style/FabTheme</item> - <item name="articleTextColor">#e0e0e0</item> - <item name="headlineFooterColor">?colorPrimary</item> - <item name="articleHeaderSeparator">#303030</item> - - <item name="colorPrimary">#1e6286</item> - <item name="colorPrimaryDark">#18506e</item> - <item name="colorAccent">#D84315</item> - - <item name="ic_rss_box">@drawable/ic_rss_box</item> - <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item> - <item name="ic_star">@drawable/ic_star</item> - <item name="ic_star_outline">@drawable/ic_star_outline</item> - <item name="ic_share">@drawable/ic_share</item> - <item name="ic_inbox">@drawable/ic_inbox</item> - <item name="ic_go_back">@drawable/ic_go_back</item> - <item name="ic_settings">@drawable/ic_settings</item> - <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_fresh">@drawable/ic_fresh</item> - <item name="ic_restore">@drawable/ic_restore</item> - <item name="ic_folder_outline">@drawable/ic_folder_outline</item> - <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item> - <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item> - <item name="ic_attachment">@drawable/ic_attachment</item> - <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item> - - <item name="drawer_header">@drawable/drawer_header_dark</item> - </style> --> - - <style name="DarkDialogTheme" parent="android:Theme"></style> - - <!-- <style name="FabTheme" parent="FloatingActionButton"> - <item name="floatingActionButtonColor">?colorPrimaryDark</item> - </style> --> - + <style name="AppSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material"> + <item name="widgetLayout">@layout/preference_material_switch</item> + </style> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml new file mode 100644 index 00000000..e81f18fb --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml @@ -0,0 +1,98 @@ +<resources> + <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Light.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> + <item name="colorError">@color/md_theme_error_mediumContrast</item> + <item name="colorOnError">@color/md_theme_onError_mediumContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item> + <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item> + <item name="colorSurface">@color/md_theme_surface_mediumContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item> + <item name="colorOutline">@color/md_theme_outline_mediumContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> + </style> + <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Light.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_highContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_highContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> + <item name="colorError">@color/md_theme_error_highContrast</item> + <item name="colorOnError">@color/md_theme_onError_highContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item> + <item name="android:colorBackground">@color/md_theme_background_highContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item> + <item name="colorSurface">@color/md_theme_surface_highContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item> + <item name="colorOutline">@color/md_theme_outline_highContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml new file mode 100644 index 00000000..68a57811 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -0,0 +1,77 @@ +<resources> + + <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> + <item name="windowActionModeOverlay">true</item> + <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> + + <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> + <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> + <item name="ic_star">@drawable/baseline_star_24</item> + <item name="ic_star_outline">@drawable/baseline_star_outline_24</item> + <item name="ic_share">@drawable/baseline_share_24</item> + <item name="ic_inbox">@drawable/baseline_inbox_24</item> + <item name="ic_go_back">@drawable/baseline_arrow_back_24</item> + <item name="ic_settings">@drawable/baseline_settings_24</item> + <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item> + <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item> + <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item> + <item name="ic_archive">@drawable/baseline_archive_24</item> + <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item> + <item name="ic_restore">@drawable/baseline_restore_24</item> + <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item> + <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item> + <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item> + <item name="ic_attachment">@drawable/baseline_attachment_24</item> + <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item> + <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item> + <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item> + <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item> + + <item name="colorPrimary">@color/md_theme_primary</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_secondary</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_error</item> + <item name="colorOnError">@color/md_theme_onError</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_background</item> + <item name="colorOnBackground">@color/md_theme_onBackground</item> + <item name="colorSurface">@color/md_theme_surface</item> + <item name="colorOnSurface">@color/md_theme_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_outline</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 41d6c9ef..3c422e7e 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceCategory android:title="@string/connection" > <EditTextPreference @@ -22,12 +23,6 @@ android:title="@string/ttrss_url" > </EditTextPreference> - <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="true" - android:key="check_for_updates" - android:summary="@string/check_for_updates_summary" - android:title="@string/check_for_updates" /> - <Preference android:key="network_settings" android:title="@string/prefs_network_settings" /> @@ -43,20 +38,17 @@ android:key="theme" android:title="@string/pref_theme" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="sort_feeds_by_unread" android:title="@string/sort_feeds_by_unread" /> - <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="false" - android:key="download_feed_icons" - android:title="@string/download_feed_icons" /> --> - <org.fox.ttrss.util.LessBrokenSwitchPreference + + <SwitchPreferenceCompat android:defaultValue="false" android:key="enable_cats" android:title="@string/enable_cats" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:dependency="enable_cats" android:key="browse_cats_like_feeds" @@ -70,7 +62,7 @@ android:key="open_on_startup" android:title="@string/open_on_startup" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="force_phone_layout" android:summary="@string/force_phone_layout_summary" @@ -81,10 +73,12 @@ android:key="category_headlines" android:title="@string/headlines" > - <org.fox.ttrss.util.FontSizeDialogPreference - android:defaultValue="13" - android:key="headlines_font_size_sp" - android:dialogMessage="@string/pref_headline_font_size" + <SeekBarPreference + app:defaultValue="13" + app:min="12" + android:max="21" + app:showSeekBarValue="true" + app:key="headlines_font_size_sp_int" android:title="@string/pref_headline_font_size" /> <ListPreference @@ -95,36 +89,30 @@ android:summary="@string/prefs_headline_display_mode_long" android:title="@string/prefs_headline_display_mode" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="headline_images_wifi_only" android:summary="@string/prefs_headline_images_wifi_only_long" android:title="@string/prefs_headline_images_wifi_only" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="headlines_show_content" android:title="@string/pref_headlines_show_content" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:disableDependentsState="true" android:key="headlines_mark_read_scroll" android:title="@string/pref_headlines_mark_read_scroll" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:dependency="headlines_mark_read_scroll" android:key="headlines_swipe_to_dismiss" android:summary="@string/pref_headlines_swipe_to_dismiss_long" android:title="@string/pref_headlines_swipe_to_dismiss" /> - <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference - android:defaultValue="false" - android:key="enable_condensed_fonts" - android:summary="@string/pref_headlines_use_condensed_fonts_long" - android:title="@string/pref_headlines_use_condensed_fonts" /> --> - <ListPreference android:defaultValue="15" android:entries="@array/pref_headlines_request_values" @@ -133,20 +121,20 @@ android:summary="@string/prefs_headline_request_size_long" android:title="@string/prefs_headline_request_size" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="enable_image_downsampling" android:title="@string/prefs_enable_image_downsampling" android:summary="@string/prefs_enable_image_downsampling_long" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="always_downsample_images" android:dependency="enable_image_downsampling" android:title="@string/prefs_always_downsample_images" android:summary="@string/prefs_always_downsample_images_long" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="inline_video_player" android:summary="@string/prefs_inline_video_player" @@ -155,37 +143,39 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/reading" > - <org.fox.ttrss.util.FontSizeDialogPreference - android:defaultValue="16" - android:key="article_font_size_sp" - android:inputType="number" + <SeekBarPreference + app:defaultValue="16" + app:min="12" + android:max="32" + app:showSeekBarValue="true" + app:key="article_font_size_sp_int" android:title="@string/pref_font_size" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="justify_article_text" android:title="@string/justify_article_text" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="use_volume_keys" android:summary="@string/use_volume_keys_long" android:title="@string/use_volume_keys" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="enable_article_fab" android:summary="@string/prefs_enable_fab_long" android:title="@string/prefs_enable_fab" /> </PreferenceCategory> <PreferenceCategory android:title="@string/prefs_opening_links" > - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="enable_custom_tabs" android:summary="@string/prefs_custom_tabs_summary" android:title="@string/prefs_use_custom_tabs" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="custom_tabs_ask_always" android:title="@string/ask_me_every_time" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="always_open_uri" android:summary="@string/prefs_always_open_uri_summary" @@ -200,12 +190,12 @@ android:summary="@string/offline_articles_to_download_long" android:title="@string/offline_articles_to_download" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="offline_sort_by_feed" android:title="@string/prefs_offline_sort_by_feed" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="offline_image_cache_enabled" android:summary="@string/offline_media_cache_enabled_summary" @@ -227,7 +217,7 @@ android:key="widget_background" android:title="@string/pref_widget_background" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:key="widget_show_fresh" android:title="@string/prefs_widget_show_fresh" @@ -239,7 +229,7 @@ android:key="show_logcat" android:title="@string/logcat_title" /> - <org.fox.ttrss.util.LessBrokenSwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="transport_debugging" android:title="@string/transport_debugging" /> |
