1
0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-12-22 21:16:57 +00:00

Fix styles

This commit is contained in:
Ammar Githam 2021-04-15 23:33:00 +09:00
parent 1ee12f71f4
commit 81a55151c1
4 changed files with 46 additions and 2 deletions

View File

@ -29,14 +29,14 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorSurface"
android:background="?attr/toolbarColor"
app:layout_collapseMode="pin"
app:title="@string/app_name"
tools:menu="@menu/main_menu">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/search_input_layout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
style="?searchInputStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"

View File

@ -20,6 +20,9 @@
<attr name="dmWaveformProgressColor" format="reference" />
<attr name="dmInputTextColor" format="reference" />
<attr name="toolbarColor" format="reference" />
<attr name="searchInputStyle" format="reference" />
<declare-styleable name="RecordView">
<attr name="slide_to_cancel_text" format="string" />
<attr name="slide_to_cancel_text_color" format="reference" />

View File

@ -234,4 +234,30 @@
<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>
</resources>

View File

@ -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,7 @@
<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>
</style>
<style name="AppTheme.Light.Barinsta" parent="AppTheme.Light">
@ -57,6 +62,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 +71,7 @@
<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>
</style>
<style name="AppTheme.Light.Bibliogram" parent="AppTheme.Light">
@ -74,6 +81,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 +89,7 @@
<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>
</style>
@ -103,6 +112,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 +124,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>
@ -132,6 +145,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="tabStyle">@style/Widget.MaterialComponents.TabLayout.Dark.Black</item>
</style>
<style name="AppTheme.Dark.MaterialDark" parent="AppTheme.Dark">
@ -142,6 +156,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>