agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge branch 'develop' of github.com:Agorise/bitsy-wallet into develop

Browse source
This commit is contained in:
Nelson R. Perez 2019-11-06 16:53:51 -05:00
commit 5e4a82a7f6
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/menu/menu_home.xml
View file

@ -12,7 +12,7 @@
android:id="@+id/merchants_dest" android:id="@+id/merchants_dest"
android:icon="@drawable/ic_merchants" android:icon="@drawable/ic_merchants"
android:title="@string/title_merchants_and_tellers" android:title="@string/title_merchants_and_tellers"
app:showAsAction="always"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/settings_dest" android:id="@+id/settings_dest"

10
app/src/main/res/values/styles.xml
View file

@ -7,6 +7,7 @@
<item name="colorPrimaryVariant">@color/colorPrimaryVariant</item> <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
<item name="colorSecondary">@color/colorSecondary</item> <item name="colorSecondary">@color/colorSecondary</item>
<item name="colorOnSecondary">#fff</item> <item name="colorOnSecondary">#fff</item>
<item name="android:itemTextAppearance">@style/MenuItemTextStyle</item>
<!--Custom attributes --> <!--Custom attributes -->
<item name="android:fontFamily">@font/p_f_beau_sans_pro</item> <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
<item name="themedColorBackgroundFloating">@android:color/white</item> <item name="themedColorBackgroundFloating">@android:color/white</item>
@ -21,6 +22,7 @@
<item name="colorPrimaryVariant">@color/colorPrimaryVariant</item> <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
<item name="colorSecondary">@color/colorSecondary</item> <item name="colorSecondary">@color/colorSecondary</item>
<item name="colorOnSecondary">#fff</item> <item name="colorOnSecondary">#fff</item>
<item name="android:itemTextAppearance">@style/MenuItemTextStyle.Dark</item>
<!--Custom attributes --> <!--Custom attributes -->
<item name="android:fontFamily">@font/p_f_beau_sans_pro</item> <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
<item name="themedColorBackgroundFloating">@color/colorBackgroundFloating</item> <item name="themedColorBackgroundFloating">@color/colorBackgroundFloating</item>
@ -33,6 +35,14 @@
<item name="android:windowBackground">@drawable/splash_screen</item> <item name="android:windowBackground">@drawable/splash_screen</item>
</style> </style>
<style name="MenuItemTextStyle" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
<item name="android:textColor">@color/black</item>
</style>
<style name="MenuItemTextStyle.Dark" >
<item name="android:textColor">@color/white</item>
</style>
<style name="Widget.Bitsy.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" /> <style name="Widget.Bitsy.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
<style name="Widget.Bitsy.Button" parent="Widget.MaterialComponents.Button"> <style name="Widget.Bitsy.Button" parent="Widget.MaterialComponents.Button">