diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java/org/fox')
8 files changed, 32 insertions, 35 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index f0416353..ec1ddb9d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -468,7 +468,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), CommonActivity.PENDING_INTENT_CHROME_SHARE, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - builder.setActionButton(BitmapFactory.decodeResource(getResources(), R.drawable.ic_share), + builder.setActionButton(BitmapFactory.decodeResource(getResources(), R.drawable.baseline_share_24), getString(R.string.share_article), pendingIntent); CustomTabsIntent intent = builder.build(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index f1546080..ef2e23a6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1679,13 +1679,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { private void adjustVideoKindView(ArticleViewHolder holder, Article article) { if (article.flavorImage != null) { if (article.flavor_kind == Article.FLAVOR_KIND_YOUTUBE || "iframe".equals(article.flavorImage.tagName().toLowerCase())) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_youtube_play); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_outline_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (article.flavor_kind == Article.FLAVOR_KIND_VIDEO || "video".equals(article.flavorImage.tagName().toLowerCase())) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (article.flavor_kind == Article.FLAVOR_KIND_ALBUM ||article.mediaList.size() > 1) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { holder.flavorVideoKindView.setVisibility(View.INVISIBLE); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 9bac8849..d9550ef8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -1403,14 +1403,14 @@ public class OnlineActivity extends CommonActivity { Article article = ap.getSelectedArticle(); if (article != null) { - m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_star : - R.drawable.ic_star_outline); + m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.baseline_star_24 : + R.drawable.baseline_star_outline_24); - m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_checkbox_marked : - R.drawable.ic_rss_box); + m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.baseline_check_box_24 : + R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.ic_email : - R.drawable.ic_email_open); + m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_email_24 : + R.drawable.baseline_mark_as_unread_24); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 4c2e92a7..f2320a00 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -605,14 +605,14 @@ public class OfflineActivity extends CommonActivity { boolean marked = article.getInt(article.getColumnIndex("marked")) == 1; boolean published = article.getInt(article.getColumnIndex("published")) == 1; - m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_star : - R.drawable.ic_star_outline); + m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.baseline_star_24 : + R.drawable.baseline_star_outline_24); - m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_checkbox_marked : - R.drawable.ic_rss_box); + m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.baseline_check_box_24 : + R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.ic_email : - R.drawable.ic_email_open); + m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_email_24 : + R.drawable.baseline_mark_as_unread_24); article.close(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java index 933fbc03..c3c31133 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java @@ -116,7 +116,7 @@ public class OfflineDownloadService extends Service { .setContentTitle(getString(R.string.notify_downloading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_download) + .setSmallIcon(R.drawable.baseline_cloud_download_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(!isError) @@ -124,20 +124,17 @@ public class OfflineDownloadService extends Service { if (showProgress) builder.setProgress(max, progress, max == 0); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + intent = new Intent(this, OnlineActivity.class); + intent.setAction(INTENT_ACTION_CANCEL); - intent = new Intent(this, OnlineActivity.class); - intent.setAction(INTENT_ACTION_CANCEL); + PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE); - PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE); - - builder.setCategory(Notification.CATEGORY_PROGRESS) - .setVibrate(new long[0]) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setColor(0x88b0f0) - .setGroup("org.fox.ttrss") - .addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent); - } + builder.setCategory(Notification.CATEGORY_PROGRESS) + .setVibrate(new long[0]) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) + .setColor(0x88b0f0) + .setGroup("org.fox.ttrss") + .addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { builder.setChannelId(CommonActivity.NOTIFICATION_CHANNEL_NORMAL); @@ -182,7 +179,7 @@ public class OfflineDownloadService extends Service { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setCategory(Notification.CATEGORY_MESSAGE) .setVibrate(new long[0]) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setColor(0x88b0f0) .setGroup("org.fox.ttrss"); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 258a1ddd..368ec95c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -1085,10 +1085,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis private void adjustVideoKindView(ArticleViewHolder holder, ArticleFlavorInfo afi) { if (afi.flavorImageUri != null) { if (afi.flavorStreamUri != null) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (afi.mediaList.size() > 1) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { holder.flavorVideoKindView.setVisibility(View.INVISIBLE); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java index cce355a1..efbeef2c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java @@ -68,7 +68,7 @@ public class OfflineUploadService extends IntentService { .setContentTitle(getString(R.string.notify_uploading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_upload) + .setSmallIcon(R.drawable.baseline_cloud_upload_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(!isError) @@ -79,7 +79,7 @@ public class OfflineUploadService extends IntentService { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setCategory(Notification.CATEGORY_PROGRESS) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setColor(0x88b0f0) .setGroup("org.fox.ttrss") .addAction(R.drawable.ic_launcher, getString(R.string.offline_sync_try_again), contentIntent); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java index ae8e7a4c..b2ae08f7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java @@ -204,7 +204,7 @@ public class ImageCacheService extends IntentService { .setContentTitle(getString(R.string.notify_downloading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_download) + .setSmallIcon(R.drawable.baseline_cloud_download_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(true) |