mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-14 08:21:35 +00:00
Merge branch 'master' into pr/934
This commit is contained in:
Austin Huang
commit
f961c422ca
695 changed files with 26946 additions and 27591 deletions
|
|
@ -24,6 +24,8 @@
|
|||
<item translatable="false">日本語</item>
|
||||
<item translatable="false">Ελληνικά</item>
|
||||
<item translatable="false">Euskara</item>
|
||||
<item translatable="false">Svenska</item>
|
||||
<item translatable="false">한국어</item>
|
||||
</string-array>
|
||||
<string-array name="theme_presets">
|
||||
<item>Auto / Follow System</item>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<enum name="small" value="1" />
|
||||
<enum name="regular" value="2" />
|
||||
<enum name="large" value="3" />
|
||||
<enum name="smaller" value="4" />
|
||||
</attr>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="ChatMessageLayout">
|
||||
|
|
@ -20,6 +21,10 @@
|
|||
<attr name="dmWaveformProgressColor" format="reference" />
|
||||
<attr name="dmInputTextColor" format="reference" />
|
||||
|
||||
<attr name="toolbarColor" format="reference" />
|
||||
<attr name="searchInputStyle" format="reference" />
|
||||
<attr name="parentCommentHighlightColor" format="reference" />
|
||||
|
||||
<declare-styleable name="RecordView">
|
||||
<attr name="slide_to_cancel_text" format="string" />
|
||||
<attr name="slide_to_cancel_text_color" format="reference" />
|
||||
|
|
@ -34,4 +39,9 @@
|
|||
<attr name="waveformBackgroundColor" format="reference" />
|
||||
<attr name="waveformProgressColor" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="TextViewDrawableSize">
|
||||
<attr name="compoundDrawableWidth" format="dimension" />
|
||||
<attr name="compoundDrawableHeight" format="dimension" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
|
@ -19,14 +19,15 @@
|
|||
<color name="btn_lightpink_text_color">@color/text_color_light</color>
|
||||
|
||||
<color name="btn_orange_background">#FF5500</color>
|
||||
<color name="btn_orange_text_color">#FFFFFFFF</color>
|
||||
<color name="btn_orange_text_color">@color/white</color>
|
||||
<color name="btn_lightorange_background">#FFBB00</color>
|
||||
<color name="btn_lightorange_text_color">#FF000000</color>
|
||||
<color name="btn_lightorange_text_color">@color/black</color>
|
||||
|
||||
<color name="dm_profile_button_color">#efefef</color>
|
||||
|
||||
<color name="comment_selected">#888888</color>
|
||||
<color name="comment_liked">#40FF69B4</color>
|
||||
<color name="parent_comment_dark_materialdark">#FF082654</color>
|
||||
<color name="parent_comment_light_white">@color/grey_300</color>
|
||||
<!--<color name="comment_liked">#40FF69B4</color>-->
|
||||
|
||||
<color name="white">#FFFFFF</color>
|
||||
<color name="white_a50">#80FFFFFF</color>
|
||||
|
|
@ -63,6 +64,10 @@
|
|||
<color name="blue_A400">#2979FF</color>
|
||||
<color name="blue_A700">#2962FF</color>
|
||||
|
||||
<color name="light_blue_900">#01579b</color>
|
||||
|
||||
<color name="indigo_900">#1A237E</color>
|
||||
|
||||
<color name="brown_50">#EFEBE9</color>
|
||||
<color name="brown_100">#D7CCC8</color>
|
||||
<color name="brown_200">#BCAAA4</color>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<dimen name="image_size_40">40dp</dimen>
|
||||
|
||||
<dimen name="profile_pic_size_tiny">24dp</dimen>
|
||||
<dimen name="profile_pic_size_smaller">32dp</dimen>
|
||||
<dimen name="profile_pic_size_small">40dp</dimen>
|
||||
<dimen name="profile_pic_size_regular">48dp</dimen>
|
||||
<dimen name="profile_pic_size_large">90dp</dimen>
|
||||
|
|
|
|||
5
app/src/main/res/values/drawables.xml
Normal file
5
app/src/main/res/values/drawables.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!--<drawable name="exo_styled_controls_play">@drawable/ic_play_arrow_24</drawable>-->
|
||||
<!--<drawable name="exo_styled_controls_pause">@drawable/ic_pause_24</drawable>-->
|
||||
</resources>
|
||||
|
|
@ -5,4 +5,5 @@
|
|||
<item name="forward" type="id" />
|
||||
<item name="detail" type="id" />
|
||||
<item name="copy" type="id" />
|
||||
<item name="share_dm" type="id" />
|
||||
</resources>
|
||||
|
|
@ -59,6 +59,8 @@
|
|||
</plurals>
|
||||
<string name="main_posts_following">%s\nFollowing</string>
|
||||
<string name="post_viewer_autoplay_video">Autoplay videos</string>
|
||||
<string name="post_viewer_background_play">Continue videos in background</string>
|
||||
<string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
|
||||
<string name="post_viewer_muted_autoplay">Always mute videos</string>
|
||||
<string name="post_viewer_show_captions">Always show post captions</string>
|
||||
<string name="post_viewer_download_dialog_title">Select what to download</string>
|
||||
|
|
@ -124,6 +126,7 @@
|
|||
<string name="mute_posts">Mute posts</string>
|
||||
<string name="unmute_stories">Unmute stories</string>
|
||||
<string name="unmute_posts">Unmute posts</string>
|
||||
<string name="remove_follower">Remove follower</string>
|
||||
<string name="bio_copy">Copy bio</string>
|
||||
<string name="bio_translate">Translate bio</string>
|
||||
<string name="status_mutual">Mutual</string>
|
||||
|
|
@ -233,7 +236,7 @@
|
|||
<string name="request_approve">Approve request</string>
|
||||
<string name="request_reject">Reject request</string>
|
||||
<string name="share_public_post">Share this public post to…</string>
|
||||
<string name="share_private_post">This is a private post! Share to those who can view them!</string>
|
||||
<string name="share_private_post">This is a private post! Share to those who can view it.</string>
|
||||
<string name="discover_empty">This category is somehow empty…</string>
|
||||
<string name="update_available">An update is available! (%s)</string>
|
||||
<string name="update_notice">Reminder: If you downloaded from F-Droid, you must update from it! Same applies for GitHub.</string>
|
||||
|
|
@ -267,6 +270,7 @@
|
|||
<string name="skip_update_checkbox">Do not show again until next update</string>
|
||||
<string name="version">Version</string>
|
||||
<string name="pref_start_screen">Start screen</string>
|
||||
<string name="pref_search_focus_keyboard" comment="basically bring up the keyboard immediately when someone does search">Show keyboard on search</string>
|
||||
<string name="pref_category_general">General</string>
|
||||
<string name="pref_category_theme">Theme</string>
|
||||
<string name="pref_category_downloads">Downloads</string>
|
||||
|
|
@ -379,6 +383,10 @@
|
|||
<item quantity="one">%d like</item>
|
||||
<item quantity="other">%d likes</item>
|
||||
</plurals>
|
||||
<plurals name="replies_count">
|
||||
<item quantity="one">%d reply</item>
|
||||
<item quantity="other">%d replies</item>
|
||||
</plurals>
|
||||
<plurals name="comments_count">
|
||||
<item quantity="one">%d comment</item>
|
||||
<item quantity="other">%d comments</item>
|
||||
|
|
@ -484,7 +492,7 @@
|
|||
<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="not_found">Not found!</string>
|
||||
<string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
|
||||
<string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again. <a href=\"https://redd.it/msxlko\">Learn more.</a></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>
|
||||
|
|
@ -503,4 +511,14 @@
|
|||
<string name="select_a_folder">No folder selected!</string>
|
||||
<string name="dir_select_success_message">Success! Please wait. Starting app…</string>
|
||||
<string name="barinsta_folder">Barinsta folder</string>
|
||||
<string name="top">Top</string>
|
||||
<string name="recent">Recent</string>
|
||||
<string name="clear">Clear</string>
|
||||
<string name="no_external_map_app">No Map app found!</string>
|
||||
<string name="click_to_show_full">Click to show full like count</string>
|
||||
<string name="no_profile_pic_found">No profile pic found!</string>
|
||||
<string name="swipe_up_confirmation">Are you sure you want to open this link?</string>
|
||||
<string name="sending">Sending...</string>
|
||||
<string name="share_via_dm">Share via DM</string>
|
||||
<string name="share_link">Share link…</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -225,4 +225,49 @@
|
|||
<item name="android:paddingEnd">0dp</item>
|
||||
<item name="iconPadding">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.Design.Tab.RegularCaps" parent="TextAppearance.Design.Tab">
|
||||
<item name="textAllCaps">false</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MaterialComponents.TabLayout.RegularCaps" parent="Widget.MaterialComponents.TabLayout">
|
||||
<item name="tabTextAppearance">@style/TextAppearance.Design.Tab.RegularCaps</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MaterialComponents.TabLayout.Light.White" parent="Widget.MaterialComponents.TabLayout">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.App.TabLayout.Light.White</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.App.TabLayout.Light.White" parent="">
|
||||
<item name="colorPrimary">@color/black</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MaterialComponents.TabLayout.Dark.Black" parent="Widget.MaterialComponents.TabLayout">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.App.TabLayout.Dark.Black</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.App.TabLayout.Dark.Black" parent="">
|
||||
<item name="colorPrimary">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Light.Barinsta</item>
|
||||
<item name="colorPrimary">@color/black</item>
|
||||
<item name="colorOnSurface">@color/black</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Light.Barinsta" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
|
||||
<item name="colorPrimary">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dark.Black" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
|
||||
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dark.Black</item>
|
||||
<item name="hintTextColor">@color/white</item>
|
||||
<item name="boxStrokeColor">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dark.Black" parent="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox">
|
||||
<item name="colorPrimary">@color/white</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<item name="dmIncomingBgColor">@color/grey_600</item>
|
||||
<item name="dmOutgoingBgColor">@color/deep_purple_400</item>
|
||||
<item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
|
||||
<item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Light.White" parent="AppTheme.Light">
|
||||
|
|
@ -33,8 +34,11 @@
|
|||
<item name="colorSecondaryVariant">@color/white</item>
|
||||
<item name="colorOnSecondary">@color/black</item>
|
||||
<item name="colorSurface">@color/white</item>
|
||||
<item name="toolbarColor">?colorSurface</item>
|
||||
<item name="colorOnSurface">@color/black</item>
|
||||
<item name="colorAccent">@color/black</item>
|
||||
<item name="colorControlActivated">@color/black</item>
|
||||
<item name="android:colorControlActivated">@color/black</item>
|
||||
<item name="editTextColor">@color/black</item>
|
||||
<item name="android:editTextColor">@color/black</item>
|
||||
<item name="android:textColorPrimary">@color/black</item>
|
||||
|
|
@ -48,6 +52,8 @@
|
|||
<item name="dmWaveformBgColor">@color/grey_600</item>
|
||||
<item name="dmWaveformProgressColor">@color/blue_800</item>
|
||||
<item name="dmInputTextColor">@color/black</item>
|
||||
<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Light.White</item>
|
||||
<item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Light.Barinsta" parent="AppTheme.Light">
|
||||
|
|
@ -57,6 +63,7 @@
|
|||
<item name="colorSecondary">@color/barinstaColorSecondary</item>
|
||||
<item name="colorSecondaryVariant">@color/barinstaColorSecondaryDark</item>
|
||||
<item name="colorSurface">@color/grey_200</item>
|
||||
<item name="toolbarColor">?colorPrimary</item>
|
||||
<item name="colorControlHighlight">@color/barinstaColorSecondaryDark</item>
|
||||
<item name="colorAccent">@color/barinstaColorSecondaryDark</item>
|
||||
<!--<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>-->
|
||||
|
|
@ -65,6 +72,8 @@
|
|||
<item name="android:textColorPrimary">@color/barinstaPrimaryTextColor</item>
|
||||
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
|
||||
<item name="dmInputTextColor">@color/black</item>
|
||||
<item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta</item>
|
||||
<item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Light.Bibliogram" parent="AppTheme.Light">
|
||||
|
|
@ -74,6 +83,7 @@
|
|||
<item name="colorSecondary">@color/bibliogramColorSecondary</item>
|
||||
<item name="colorSecondaryVariant">@color/bibliogramColorSecondaryDark</item>
|
||||
<item name="colorSurface">@color/grey_200</item>
|
||||
<item name="toolbarColor">?colorPrimary</item>
|
||||
<item name="colorControlHighlight">@color/bibliogramColorSecondaryDark</item>
|
||||
<item name="colorAccent">@color/bibliogramColorSecondaryDark</item>
|
||||
<item name="android:windowBackground">?colorSurface</item>
|
||||
|
|
@ -81,6 +91,8 @@
|
|||
<item name="android:textColorPrimary">@color/bibliogramPrimaryTextColor</item>
|
||||
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
|
||||
<item name="dmInputTextColor">@color/black</item>
|
||||
<item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta</item>
|
||||
<item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
|
@ -103,6 +115,7 @@
|
|||
<item name="dmWaveformBgColor">@color/white</item>
|
||||
<item name="dmWaveformProgressColor">@color/blue_800</item>
|
||||
<item name="dmInputTextColor">@color/white</item>
|
||||
<item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Dark.Black" parent="AppTheme.Dark">
|
||||
|
|
@ -114,9 +127,12 @@
|
|||
<item name="colorOnSecondary">@color/white</item>
|
||||
<item name="colorSecondaryVariant">@color/black</item>
|
||||
<item name="colorSurface">@color/black</item>
|
||||
<item name="toolbarColor">?colorSurface</item>
|
||||
<item name="colorOnSurface">@color/white</item>
|
||||
<item name="colorAccent">@color/blue_A700</item>
|
||||
<item name="colorControlHighlight">@color/grey_600</item>
|
||||
<item name="colorControlActivated">@color/white</item>
|
||||
<item name="android:colorControlActivated">@color/white</item>
|
||||
<item name="android:textColorPrimary">@color/white</item>
|
||||
<item name="android:textColorSecondary">@color/white</item>
|
||||
<item name="android:textColorHint">@color/grey_500</item>
|
||||
|
|
@ -126,12 +142,15 @@
|
|||
<item name="android:dialogTheme">@style/Widget.Dialog.Dark.Black</item>
|
||||
<item name="alertDialogTheme">@style/Widget.AlertDialog.Dark.Black</item>
|
||||
<item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch.Dark.Black</item>
|
||||
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown.Dark.Black</item>
|
||||
<!--<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown.Dark.Black</item>-->
|
||||
<item name="preferenceFragmentCompatStyle">@style/PreferenceFragmentCompatStyle.Dark.Black</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
|
||||
<item name="dmIncomingBgColor">@color/grey_600</item>
|
||||
<item name="dmOutgoingBgColor">@color/deep_purple_400</item>
|
||||
<item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
|
||||
<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Dark.Black</item>
|
||||
<item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dark.Black</item>
|
||||
<item name="parentCommentHighlightColor">@color/parent_comment_dark_materialdark</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Dark.MaterialDark" parent="AppTheme.Dark">
|
||||
|
|
@ -142,6 +161,7 @@
|
|||
<item name="android:windowBackground">@color/grey_900</item>
|
||||
<item name="android:colorBackground">@color/grey_900</item>
|
||||
<item name="colorSurface">@color/grey_900</item>
|
||||
<item name="toolbarColor">?colorSurface</item>
|
||||
<item name="colorError">@color/red_200</item>
|
||||
<item name="colorOnPrimary">@color/black</item>
|
||||
<item name="colorOnSecondary">@color/black</item>
|
||||
|
|
@ -153,6 +173,7 @@
|
|||
<item name="dmIncomingBgColor">@color/grey_600</item>
|
||||
<item name="dmOutgoingBgColor">@color/deep_purple_400</item>
|
||||
<item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
|
||||
<item name="parentCommentHighlightColor">@color/parent_comment_dark_materialdark</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Launcher" parent="AppTheme.Dark">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue