fix missing banner icons and wrong strings

closes #805
sk22 · Sep 8, 2023 · fdf0414 · fdf0414
1 parent cc699a3
commit fdf0414
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
@@ -10,6 +10,7 @@
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.util.EnumSet;
 
@@ -44,7 +45,7 @@ public void maybeAddBanner(RecyclerView list, MergeRecyclerAdapter adapter){
 			banner=((Activity)list.getContext()).getLayoutInflater().inflate(R.layout.discover_info_banner, list, false);
 			TextView text=banner.findViewById(R.id.banner_text);
 			text.setText(switch(type){
-				case TRENDING_POSTS -> list.getResources().getString(R.string.trending_posts_info_banner);
+				case TRENDING_POSTS -> list.getResources().getString(R.string.sk_trending_posts_info_banner);
 				case TRENDING_LINKS -> list.getResources().getString(R.string.trending_links_info_banner);
 				case FEDERATED_TIMELINE -> list.getResources().getString(R.string.sk_federated_timeline_info_banner);
 				case POST_NOTIFICATIONS -> list.getResources().getString(R.string.sk_notify_posts_info_banner);
@@ -57,8 +58,10 @@ public void maybeAddBanner(RecyclerView list, MergeRecyclerAdapter adapter){
 				case TRENDING_POSTS -> R.drawable.ic_fluent_arrow_trending_24_regular;
 				case TRENDING_LINKS -> R.drawable.ic_fluent_news_24_regular;
 				case ACCOUNTS -> R.drawable.ic_fluent_people_add_24_regular;
-				// no icon because those are displayed as timelines - with icon in top left
-				case LOCAL_TIMELINE, FEDERATED_TIMELINE, BUBBLE_TIMELINE, POST_NOTIFICATIONS -> 0;
+				case LOCAL_TIMELINE -> TimelineDefinition.LOCAL_TIMELINE.getDefaultIcon().iconRes;
+				case FEDERATED_TIMELINE -> TimelineDefinition.FEDERATED_TIMELINE.getDefaultIcon().iconRes;
+				case BUBBLE_TIMELINE -> TimelineDefinition.BUBBLE_TIMELINE.getDefaultIcon().iconRes;
+				case POST_NOTIFICATIONS -> TimelineDefinition.POSTS_TIMELINE.getDefaultIcon().iconRes;
 			});
 			adapter.addAdapter(new SingleViewRecyclerAdapter(banner));
 		}

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
@@ -33,7 +33,9 @@
     <string name="sk_federated_timeline">Federation</string>
     <string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
     <string name="sk_bubble_timeline_info_banner">These are the most recent posts from the network curated by your instance admins.</string>
-    <string name="sk_update_available">Megalodon %s is ready to download.</string>
+	<string name="sk_trending_posts_info_banner">These are the posts gaining traction on your server.</string>
+	<string name="sk_trending_links_info_banner">These are the news stories getting talked about on your server.</string>
+	<string name="sk_update_available">Megalodon %s is ready to download.</string>
     <string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
     <string name="sk_check_for_update">Check for update</string>
     <string name="sk_no_update_available">No update available</string>