1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2026-03-14 08:21:35 +00:00

Merge branch 'master' into bottombar_redesign

This commit is contained in:
Austin Huang 2021-04-02 09:35:25 -04:00 committed by GitHub
commit 1774ce8af0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 514 additions and 139 deletions

View file

@ -162,7 +162,7 @@
<color name="barinstaColorSecondaryLight">#ffddac</color>
<color name="barinstaColorSecondaryDark">#a17c4f</color>
<color name="barinstaPrimaryTextColor">#616161</color>
<color name="barinstaSecondaryTextColor">@color/white</color>
<!-- <color name="barinstaSecondaryTextColor">@color/white</color> unused -->
<!-- Bibliogram Theme colors -->
<color name="bibliogramColorPrimary">#d63f44</color>
@ -172,5 +172,5 @@
<color name="bibliogramColorSecondaryLight">#fff4e8</color>
<color name="bibliogramColorSecondaryDark">#8e2929</color>
<color name="bibliogramPrimaryTextColor">#000000</color>
<color name="bibliogramSecondaryTextColor">@color/white</color>
<!-- <color name="bibliogramSecondaryTextColor">@color/white</color> unused -->
</resources>

View file

@ -4,4 +4,5 @@
<item name="unsend" type="id" />
<item name="forward" type="id" />
<item name="detail" type="id" />
<item name="copy" type="id" />
</resources>

View file

@ -479,4 +479,6 @@
<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>

View file

@ -64,6 +64,7 @@
<item name="bottomNavigationStyle">@style/Widget.BottomNavigationView.Light.Barinsta</item>
<item name="android:textColorPrimary">@color/barinstaPrimaryTextColor</item>
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
<item name="dmInputTextColor">@color/black</item>
</style>
<style name="AppTheme.Light.Bibliogram" parent="AppTheme.Light">
@ -79,6 +80,7 @@
<item name="bottomNavigationStyle">@style/Widget.BottomNavigationView.Light.Barinsta</item>
<item name="android:textColorPrimary">@color/bibliogramPrimaryTextColor</item>
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
<item name="dmInputTextColor">@color/black</item>
</style>