mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-14 08:21:35 +00:00
Merge branch 'master' into feature/option_prepend_username
This commit is contained in:
commit
5623f6d266
54 changed files with 1573 additions and 447 deletions
|
|
@ -88,24 +88,61 @@
|
|||
<item>HH:mm:ss</item>
|
||||
<item>H:mm:ss</item>
|
||||
</string-array>
|
||||
<array name="main_nav_ids">
|
||||
<array name="main_nav_graph_root_ids">
|
||||
<item>@id/direct_messages_nav_graph</item>
|
||||
<item>@id/feed_nav_graph</item>
|
||||
<item>@id/profile_nav_graph</item>
|
||||
<item>@id/discover_nav_graph</item>
|
||||
<item>@id/more_nav_graph</item>
|
||||
<!-- New graphs should go below -->
|
||||
<item>@id/favorites_nav_graph</item>
|
||||
<item>@id/notification_viewer_nav_graph</item>
|
||||
</array>
|
||||
<!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
|
||||
<array name="main_nav_graphs">
|
||||
<item>@navigation/direct_messages_nav_graph</item>
|
||||
<item>@navigation/feed_nav_graph</item>
|
||||
<item>@navigation/profile_nav_graph</item>
|
||||
<item>@navigation/discover_nav_graph</item>
|
||||
<item>@navigation/more_nav_graph</item>
|
||||
<item>@navigation/favorites_nav_graph</item>
|
||||
<item>@navigation/notification_viewer_nav_graph</item>
|
||||
</array>
|
||||
<string-array name="main_nav_ids_values" translatable="false">
|
||||
<!-- Titles should correspond 1-to-1 with the above nav graphs -->
|
||||
<string-array name="main_nav_titles" translatable="false">
|
||||
<item>@string/title_dm</item>
|
||||
<item>@string/feed</item>
|
||||
<item>@string/profile</item>
|
||||
<item>@string/title_discover</item>
|
||||
<item>@string/more</item>
|
||||
<item>@string/title_favorites</item>
|
||||
<item>@string/title_notifications</item>
|
||||
</string-array>
|
||||
<array name="logged_out_main_nav_ids">
|
||||
<item>@navigation/profile_nav_graph</item>
|
||||
<item>@navigation/more_nav_graph</item>
|
||||
<!-- Drawable should correspond 1-to-1 with the above titles -->
|
||||
<array name="main_nav_drawables" translatable="false">
|
||||
<item>@drawable/ic_message_24</item>
|
||||
<item>@drawable/ic_home_24</item>
|
||||
<item>@drawable/ic_person_24</item>
|
||||
<item>@drawable/ic_explore_24</item>
|
||||
<item>@drawable/ic_more_horiz_24</item>
|
||||
<item>@drawable/ic_star_24</item>
|
||||
<item>@drawable/ic_not_liked</item>
|
||||
</array>
|
||||
<!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
|
||||
<!-- these are the start destination of the corresponding nav graphs -->
|
||||
<array name="main_nav_start_dest_frag_ids" translatable="false">
|
||||
<item>@id/directMessagesInboxFragment</item>
|
||||
<item>@id/feedFragment</item>
|
||||
<item>@id/profileFragment</item>
|
||||
<item>@id/discoverFragment</item>
|
||||
<item>@id/morePreferencesFragment</item>
|
||||
<item>@id/favoritesFragment</item>
|
||||
<item>@id/notificationsViewer</item>
|
||||
</array>
|
||||
<!--<array name="logged_out_main_nav_graphs">-->
|
||||
<!-- <item>@navigation/profile_nav_graph</item>-->
|
||||
<!-- <item>@navigation/more_nav_graph</item>-->
|
||||
<!--</array>-->
|
||||
<string-array name="light_themes" translatable="false">
|
||||
<item>@string/light_white_theme</item>
|
||||
<item>@string/light_barinsta_theme</item>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
<string name="download_prepend_username">Prepend Username to Filename</string>
|
||||
<string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
|
||||
<string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
|
||||
<string name="hide_muted_reels_setting">Hide muted stories from feed</string>
|
||||
<string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>
|
||||
<string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
|
||||
<string name="activity_setting">Enable activity notifications</string>
|
||||
|
|
@ -476,6 +477,12 @@
|
|||
<string name="delete_unsuccessful">Delete unsuccessful</string>
|
||||
<string name="crash_report_subject">Barinsta Crash Report</string>
|
||||
<string name="crash_report_title">Select an email app to send crash logs</string>
|
||||
<string name="skip_update">Skip this update</string>
|
||||
<string name="on_latest_version">You\'re already on the latest version</string>
|
||||
<string name="tab_order">Screen order</string>
|
||||
<string name="other_tabs">Other tabs</string>
|
||||
<string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
|
||||
<string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
|
||||
<string name="copy_caption">Copy caption</string>
|
||||
<string name="copy_reply">Copy reply</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue