DT @10.11.2015: Layout überarbeitet, bugfixes (ranking)

This commit is contained in:
Dennis Thießen
2015-11-10 23:26:42 +01:00
parent c8551bf081
commit 49ba686b3f
58 changed files with 190 additions and 45 deletions

View File

@@ -2,8 +2,13 @@
<color name="bg_login">#26ae90</color>
<color name="bg_register">#2e3237</color>
<color name="bg_main">#428bca</color>
<color name="bg_common_2">#e1e1e1</color>
<color name="bg_common">#0461A8</color>
<color name="white">#ffffff</color>
<color name="title">#ffffff</color>
<color name="red">#ff0000</color>
<color name="my_awesome_red">#ff4400</color>
<color name="my_awesome_darker_red">#03518c</color>
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#888888</color>

View File

@@ -102,4 +102,14 @@
<string name="action_settings">Settings</string>
<string name="title_activity_view_report">View Report</string>
<string-array name="navigation_drawer_items_array">
<item>Start</item>
<item>Report</item>
<item>Incident Map</item>
<item>User Statistics</item>
<item>Account Settings</item>
<item>Subscriptions</item>
<item>Logout</item>
</string-array>
</resources>

View File

@@ -1,6 +1,7 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<!-- <item name="android:background" tools:ignore="NewApi">@color/red</item>-->
<!-- <item name="background">@color/red</item>-->
</style>
<style name="wrapping_button">
@@ -8,4 +9,26 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginRight">@dimen/micro_padding</item>
</style>
<style name="CustomActionBarTheme" parent="@style/Theme.AppCompat.Light">
<item name="android:actionBarStyle" tools:ignore="NewApi">@style/MyActionBar</item>
<item name="actionBarStyle">@style/MyActionBar</item>
<item name="actionBarTheme">@style/MyActionBarTheme</item>
<item name="colorPrimaryDark">@color/my_awesome_darker_red</item>
</style>
<style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background" tools:ignore="NewApi">@color/white</item>
<item name="titleTextStyle">@style/MyActionBar.ActionBar.TitleTextStyle</item>
<item name="background">@color/bg_common</item>
</style>
<style name="MyActionBarTheme" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="actionMenuTextColor">@color/title</item>
<item name="colorControlNormal">@color/title</item>
</style>
<style name="MyActionBar.ActionBar.TitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/title</item>
</style>
</resources>