Merge pull request #1645 from Andries-Smit/chore/remove-redundant-style
Chore: remove redundant style
This commit is contained in:
commit
d38ef69e9a
|
@ -91,15 +91,10 @@
|
|||
<item name="ribbonCriticalColor">@color/ribbonCritical</item>
|
||||
<item name="ribbonTextDefaultColor">@color/ribbonTextDefault</item>
|
||||
<item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
|
||||
<!---Main Activity Tab -->
|
||||
<item name="tabSelectedTextColor">@color/tabSelectedText</item>
|
||||
<item name="tabTextColor">@color/tabText</item>
|
||||
<!---Background -->
|
||||
<item name="defaultbackground">@color/defaultbackground</item>
|
||||
<!---Toast -->
|
||||
<item name="toastBaseTextColor">@color/toastBase</item>
|
||||
<!---Input -->
|
||||
<item name="boxStrokeColor">@color/white_alpha_20</item>
|
||||
<!---Dialog Helper -->
|
||||
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="android:alertDialogTheme">@style/DialogTheme</item>
|
||||
|
@ -371,8 +366,6 @@
|
|||
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
|
||||
<style name="AppTheme.Launcher" parent="AppTheme.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/launch_screen</item>
|
||||
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
|
||||
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
|
||||
</style>
|
||||
|
||||
<style name="section_header_label">
|
||||
|
|
|
@ -61,15 +61,10 @@
|
|||
<attr name="ribbonCriticalColor" format="reference|color" />
|
||||
<attr name="ribbonTextDefaultColor" format="reference|color" />
|
||||
<attr name="ribbonTextWarningColor" format="reference|color" />
|
||||
<!---Main Activity Tab -->
|
||||
<attr name="tabSelectedTextColor" format="reference|color" />
|
||||
<attr name="tabTextColor" format="reference|color" />
|
||||
<!---Background -->
|
||||
<attr name="defaultbackground" format="reference|color" />
|
||||
<!---Toast -->
|
||||
<attr name="toastBaseTextColor" format="reference|color" />
|
||||
<!---Input -->
|
||||
<attr name="boxStrokeColor" format="reference|color" />
|
||||
<declare-styleable name="NumberPicker">
|
||||
<attr name="customContentDescription" format="string" />
|
||||
</declare-styleable>
|
||||
|
|
|
@ -96,15 +96,10 @@
|
|||
<item name="ribbonCriticalColor">@color/ribbonCritical</item>
|
||||
<item name="ribbonTextDefaultColor">@color/ribbonTextDefault</item>
|
||||
<item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
|
||||
<!---Main Activity Tab -->
|
||||
<item name="tabSelectedTextColor">@color/tabSelectedText</item>
|
||||
<item name="tabTextColor">@color/tabText</item>
|
||||
<!---Background -->
|
||||
<item name="defaultbackground">@color/white</item>
|
||||
<!---Toast -->
|
||||
<item name="toastBaseTextColor">@color/toastBase</item>
|
||||
<!---Input -->
|
||||
<item name="boxStrokeColor">@color/white</item>
|
||||
<!---Dialog Helper -->
|
||||
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
|
||||
<item name="android:alertDialogTheme">@style/DialogTheme</item>
|
||||
|
@ -383,8 +378,6 @@
|
|||
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
|
||||
<style name="AppTheme.Launcher" parent="AppTheme.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/launch_screen</item>
|
||||
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
|
||||
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
|
||||
</style>
|
||||
|
||||
<style name="section_header_label">
|
||||
|
|
|
@ -14,9 +14,7 @@
|
|||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/rileylink_settings_tabs"
|
||||
app:tabIndicatorColor="?attr/tabSelectedTextColor"
|
||||
app:tabTextColor="?attr/tabTextColor"
|
||||
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
|
|
Loading…
Reference in a new issue