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

Merge branch 'master' into pr/850

This commit is contained in:
Austin Huang 2021-03-26 22:27:47 -04:00
commit dc1119c604
No known key found for this signature in database
GPG key ID: 84C23AA04587A91F
41 changed files with 518 additions and 200 deletions

View file

@ -16,6 +16,9 @@
<attr name="dmIncomingBgColor" format="reference" />
<attr name="dmOutgoingBgColor" format="reference" />
<attr name="dmDateHeaderBgColor" format="reference" />
<attr name="dmWaveformBgColor" format="reference" />
<attr name="dmWaveformProgressColor" format="reference" />
<attr name="dmInputTextColor" format="reference" />
<declare-styleable name="RecordView">
<attr name="slide_to_cancel_text" format="string" />
@ -26,4 +29,9 @@
<attr name="slide_to_cancel_arrow_color" format="reference" />
<attr name="counter_time_color" format="reference" />
</declare-styleable>
<declare-styleable name="WaveformSeekBar">
<attr name="waveformBackgroundColor" format="reference" />
<attr name="waveformProgressColor" format="reference" />
</declare-styleable>
</resources>

View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="profile_info_container_bottom_space">8dp</dimen>
<dimen name="private_page_margins">@dimen/profile_picture_size</dimen>
<dimen name="private_page_margins">30dp</dimen>
<dimen name="private_page_size">90dp</dimen>
<dimen name="profile_picture_size">90dp</dimen>
<dimen name="profile_chip_size">40dp</dimen>

View file

@ -20,6 +20,9 @@
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
<!--<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>-->
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Light</item>
<item name="dmIncomingBgColor">@color/grey_600</item>
<item name="dmOutgoingBgColor">@color/deep_purple_400</item>
<item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
</style>
<style name="AppTheme.Light.White" parent="AppTheme.Light">
@ -39,6 +42,12 @@
<item name="bottomNavigationStyle">@style/Widget.BottomNavigationView.Light.White</item>
<item name="materialButtonStyle">@style/Widget.MaterialComponents.Button.Light.White</item>
<item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.White</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="dmWaveformBgColor">@color/grey_600</item>
<item name="dmWaveformProgressColor">@color/blue_800</item>
<item name="dmInputTextColor">@color/black</item>
</style>
<style name="AppTheme.Light.Barinsta" parent="AppTheme.Light">
@ -89,6 +98,9 @@
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
<!--<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>-->
<item name="dmWaveformBgColor">@color/white</item>
<item name="dmWaveformProgressColor">@color/blue_800</item>
<item name="dmInputTextColor">@color/white</item>
</style>
<style name="AppTheme.Dark.Black" parent="AppTheme.Dark">