From b85ed3c867f0c3a2ca0d90e4c29d54ef38c976b5 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Sun, 13 Nov 2022 01:16:27 +1100
Subject: Show the current image index in gallery in PostFragment.

---
 app/src/main/res/layout/item_post_gallery_type.xml | 28 +++++++++++++++---
 app/src/main/res/values/strings.xml                | 34 ++++++++++++----------
 2 files changed, 42 insertions(+), 20 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/item_post_gallery_type.xml b/app/src/main/res/layout/item_post_gallery_type.xml
index 4ea4579c..a817cd40 100644
--- a/app/src/main/res/layout/item_post_gallery_type.xml
+++ b/app/src/main/res/layout/item_post_gallery_type.xml
@@ -196,11 +196,31 @@
 
         </com.nex3z.flowlayout.FlowLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/gallery_recycler_view_item_post_gallery_type"
-            android:layout_width="match_parent"
+        <FrameLayout
+            android:id="@+id/gallery_frame_layout_item_post_gallery_type"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" />
+            android:visibility="gone">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/gallery_recycler_view_item_post_gallery_type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" />
+
+            <com.libRG.CustomTextView
+                android:id="@+id/image_index_text_view_item_post_gallery_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="16dp"
+                android:textSize="?attr/font_12"
+                android:fontFamily="?attr/font_family"
+                android:padding="4dp"
+                app:lib_setRadius="6dp"
+                app:lib_setRoundedView="true"
+                app:lib_setShape="rectangle" />
+
+        </FrameLayout>
 
         <ImageView
             android:id="@+id/no_preview_image_view_item_post_gallery_type"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7bb044b..bdcba30e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,12 +25,12 @@
     <string name="edit_multi_reddit_activity_label">Edit Multireddit</string>
     <string name="selected_subeddits_activity_label">Selected Subreddits</string>
     <string name="report_activity_label">Report</string>
-    <string name="view_imgur_media_activity_image_label">Image %1$,d/%2$d</string>
-    <string name="view_imgur_media_activity_video_label">Video %1$,d/%2$d</string>
+    <string name="view_imgur_media_activity_image_label">Image %1$d/%2$d</string>
+    <string name="view_imgur_media_activity_video_label">Video %1$d/%2$d</string>
     <string name="send_private_message_activity_label">Send PM</string>
-    <string name="view_reddit_gallery_activity_image_label">Image %1$,d/%2$d</string>
-    <string name="view_reddit_gallery_activity_gif_label">Gif %1$,d/%2$d</string>
-    <string name="view_reddit_gallery_activity_video_label">Video %1$,d/%2$d</string>
+    <string name="view_reddit_gallery_activity_image_label">Image %1$d/%2$d</string>
+    <string name="view_reddit_gallery_activity_gif_label">Gif %1$d/%2$d</string>
+    <string name="view_reddit_gallery_activity_video_label">Video %1$d/%2$d</string>
     <string name="submit_crosspost_activity_label">Crosspost</string>
     <string name="give_award_activity_label">Give Award</string>
     <string name="subreddit_filter_popular_and_all_activity_label">r/all and r/popular</string>
@@ -201,7 +201,7 @@
     <string name="title_required">The post needs a good title</string>
     <string name="link_required">Hey where is the link?</string>
     <string name="select_an_image">Please select an image first</string>
-    <string name="voting_length">Voting length: %1$,d days</string>
+    <string name="voting_length">Voting length: %1$d days</string>
     <string name="posting">Posting</string>
     <string name="post_failed">Could not post it</string>
     <string name="error_processing_image">Error processing image</string>
@@ -358,7 +358,7 @@
     <string name="notification_summary_message">New Message</string>
     <string name="notification_summary_subreddit">Subreddit</string>
     <string name="notification_summary_award">Award</string>
-    <string name="notification_new_messages">%1$,d New Messages</string>
+    <string name="notification_new_messages">%1$d New Messages</string>
 
     <string name="label_account">Account</string>
     <string name="label_reddit">Reddit</string>
@@ -382,9 +382,9 @@
     <string name="settings_mute_autoplaying_videos_title">Mute Autoplaying Videos</string>
     <string name="settings_autoplay_nsfw_videos_title">Autoplay NSFW Videos</string>
     <string name="settings_start_autoplay_visible_area_offset_portrait_title">Autoplay Videos Visible Area Offset (Portrait)</string>
-    <string name="settings_start_autoplay_visible_area_offset_portrait_summary">Start autoplaying videos when %1$,d%% of them are visible</string>
+    <string name="settings_start_autoplay_visible_area_offset_portrait_summary">Start autoplaying videos when %1$d%% of them are visible</string>
     <string name="settings_start_autoplay_visible_area_offset_landscape_title">Autoplay Videos Visible Area Offset (Landscape)</string>
-    <string name="settings_start_autoplay_visible_area_offset_landscape_summary">Start autoplaying videos when %1$,d%% of them are visible</string>
+    <string name="settings_start_autoplay_visible_area_offset_landscape_summary">Start autoplaying videos when %1$d%% of them are visible</string>
     <string name="settings_immersive_interface_title">Immersive Interface</string>
     <string name="settings_immersive_interface_summary">Does Not Apply to All Pages</string>
     <string name="settings_immersive_interface_ignore_nav_bar_title">Ignore Navigation Bar in Immersive Interface</string>
@@ -636,7 +636,7 @@
     <string name="settings_hide_text_post_content">Hide Text Post Content</string>
     <string name="settings_hide_comment_awards_title">Hide Comment Awards</string>
     <string name="settings_show_fewer_toolbar_options_threshold_title">Show Fewer Toolbar Options Starting From</string>
-    <string name="settings_show_fewer_toolbar_options_threshold_summary">Level %1$,d</string>
+    <string name="settings_show_fewer_toolbar_options_threshold_summary">Level %1$d</string>
     <string name="settings_show_author_avatar_title">Show Author Avatar</string>
     <string name="settings_reddit_user_agreement_title">Reddit User Agreement</string>
     <string name="settings_always_show_child_comment_count_title">Always Show the Number of Child Comments</string>
@@ -688,15 +688,15 @@
 
     <string name="elapsed_time_just_now">Just Now</string>
     <string name="elapsed_time_a_minute_ago">1 Minute</string>
-    <string name="elapsed_time_minutes_ago">%1$,d Minutes</string>
+    <string name="elapsed_time_minutes_ago">%1$d Minutes</string>
     <string name="elapsed_time_an_hour_ago">1 Hour</string>
-    <string name="elapsed_time_hours_ago">%1$,d Hours</string>
+    <string name="elapsed_time_hours_ago">%1$d Hours</string>
     <string name="elapsed_time_yesterday">Yesterday</string>
-    <string name="elapsed_time_days_ago">%1$,d Days</string>
+    <string name="elapsed_time_days_ago">%1$d Days</string>
     <string name="elapsed_time_a_month_ago">1 Month</string>
-    <string name="elapsed_time_months_ago">%1$,d Months</string>
+    <string name="elapsed_time_months_ago">%1$d Months</string>
     <string name="elapsed_time_a_year_ago">1 Year</string>
-    <string name="elapsed_time_years_ago">%1$,d Years</string>
+    <string name="elapsed_time_years_ago">%1$d Years</string>
 
     <string name="error_getting_multi_reddit_data">Error getting multireddit data</string>
     <string name="error_loading_multi_reddit_list">Cannot sync multireddits</string>
@@ -1077,7 +1077,7 @@
 
     <string name="give_award_dialog_title">Give Award?</string>
     <string name="anonymous">Anonymous</string>
-    <string name="give_award_error_message">Code: %1$,d/\n Message: %2$s</string>
+    <string name="give_award_error_message">Code: %1$d/\n Message: %2$s</string>
     <string name="give_award_success">Award given</string>
     <string name="give_award_failed">Failed</string>
 
@@ -1315,4 +1315,6 @@
     <string name="load_more_posts_failed">Failed to load more posts.\nTap to retry.</string>
     <string name="no_more_posts">No more posts</string>
 
+    <string name="image_index_in_gallery">%1$d/%2$d</string>
+
 </resources>
-- 
cgit v1.2.3