dennisthiessen/RiskAhead-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DT @17.12.2015: Sehr viele Design-Changes.. ProfileActivityFragments ebenfalls übearbeitet

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-17 13:41:34 +01:00
parent c47e302d28
commit 805d75b15b
101 changed files with 1147 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/values/strings.xml
View File

@@ -50,7 +50,7 @@
<string name="lbl_main_txt1">We have currently ...</string>
<string name="lbl_main_txt2">... reported incidents</string>
<string name="btn_main_report">{fa_map_marker} Report</string>
<string name="btn_main_viewmap">{fa_info} View Map</string>
<string name="btn_main_viewmap">{fa_map} View Map</string>
<string name="input_report_short_hint">Short Description</string>
<string name="input_report_long_hint">Long Descpription</string>
@@ -78,17 +78,17 @@
<string name="lbl_profile_top10">Top 10</string>
<string name="lbl_settings_password">Confirm Password</string>
<string name="btn_settings_req_password">{fa_envelope} Request New Password</string>
<string name="btn_settings_req_password">{fa_envelope} Reset Password</string>
<string name="lbl_settings_retype_password">Retype Password</string>
<string name="btn_maps_confirm_position">{fa_paint_brush} Report this position!</string>
<string name="navigation_start">Start</string>
<string name="navigation_report">Report</string>
<string name="navigation_start">Home</string>
<string name="navigation_report">Incident Report</string>
<string name="navigation_incident_map">Incident Map</string>
<string name="navigation_user_stats">User Statistics</string>
<string name="navigation_acc_settings">Account Settings</string>
<string name="navigation_settings">Settings</string>
<string name="navigation_subscriptions">Subscriptions</string>
<string name="navigation_logout">Logout</string>
<string name="share_item_text">I recommend RiskAhead!</string>

45
app/src/main/res/values/styles.xml
View File

@@ -5,16 +5,51 @@
<item name="android:layout_marginRight">@dimen/micro_padding</item>
</style>
<style name="MyRiskAheadTheme" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/bg_common</item>
<item name="android:textColorPrimary">@color/actionbar_text</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<item name="android:textColor">@color/common_text</item>
<style name="MyRiskAheadTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:textViewStyle">@style/App_TextViewStyle</item>
<item name="android:editTextStyle">@style/App_EditTextStyle</item>
<!-- ...and here we setting appcompat’s color theme attrs -->
<item name="colorPrimary">@color/bg_common</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<item name="colorAccent">#02A8F3</item>
</style>
<style name="MyRiskAheadToolbar" parent="Theme.AppCompat.NoActionBar">
<!-- android:textColorPrimary is the color of the title text
in the Toolbar, in the Theme.AppCompat theme: -->
<item name="android:textColorPrimary">@color/actionbar_text</item>
<item name="colorPrimary">@color/bg_common</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<!-- android:textColorPrimaryInverse is the color of the title
text in the Toolbar, in the Theme.AppCompat.Light theme: -->
<!-- <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> -->
<!-- android:actionMenuTextColor is the color of the text of
action (menu) items in the Toolbar, at least in the
Theme.AppCompat theme.
For some reason, they already get the textColorPrimary
when running on API 21, but not on older versions of
Android, so this is only necessary to support older
Android versions.-->
<item name="actionMenuTextColor">@color/abc_primary_text_material_light</item>
<!-- android:textColorSecondary is the color of the menu
overflow icon (three vertical dots) -->
<item name="android:textColorSecondary">@color/actionbar_text</item>
<!-- This would set the toolbar's background color,
but setting this also changes the popup menu's background,
even if we define popupTheme for our <Toolbar> -->
<!-- <item name="android:background">@color/color_primary</item> -->
</style>
<style name="App_EditTextStyle" parent="@android:style/Widget.EditText">
<item name="android:textColor">@color/common_text</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
</style>
<style name="App_TextViewStyle" parent="@android:style/Widget.TextView">
<item name="android:textColor">@color/common_text</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
</style>
</resources>