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

DT @12.10.2015: Design changes, User Profile functions implemented

Browse Source
This commit is contained in:
Dennis Thießen
2015-10-12 14:10:58 +02:00
parent 270f24399a
commit 21a5a5f8ab
25 changed files with 264 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/values/dimens.xml
View File

@@ -4,6 +4,7 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fb_margin_override_top">13dp</dimen>
<dimen name="fb_margin_override_bottom">13dp</dimen>
<dimen name="micro_padding">4dp</dimen>
<!--The next value changes the margin between the FB icon and the left border:-->
<dimen name="fb_margin_override_lr">10dp</dimen>
<!--The next value changes the margin between the FB icon and the login text:-->

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

@@ -20,16 +20,11 @@
<string name="status_signing_in">Signing in...</string>
<string name="status_signing_out">Signing out...</string>
<string name="login_with_gp">Log in with Google+</string>
<string name="logout_with_gp">Log out from Google+</string>
<string name="login_with_fb">Log in with Facebook</string>
<string name="logout_with_fb">Log out from Facebook</string>
<string name="title_activity_start">RiskAhead</string>
<string name="title_activity_entrance">Risk Ahead</string>
<string name="btn_profile_logout">Logout</string>
<string name="btn_settings_change">Confirm changes</string>
<string name="btn_settings_change">{fa_paint_brush} Confirm changes</string>
<string name="lbl_profile_title">Welcome</string>
<string name="drawer_open">Open navigation drawer</string>
@@ -47,22 +42,22 @@
<string name="title_activity_base">Base</string>
<string name="title_activity_user_config">User Profile</string>
<string name="title_activity_maps">RiskMap</string>
<string name="title_activity_maps">Risk Map</string>
<string name="title_activity_report">Report Incident</string>
<string name="title_activity_settings">User Settings</string>
<string name="app_label">Label</string>
<string name="search_hint">Location</string>
<string name="search_settings">search settings</string>
<string name="title_activity_settings">SettingsActivity</string>
<string name="title_activity_subscriptions">SubscriptionsActivity</string>
<string name="title_activity_subscriptions">Subscriptions</string>
<string name="lbl_main_txt1">We have currently ...</string>
<string name="lbl_main_txt2">... reported incidents</string>
<string name="lbl_main_share">Contribute and share your information</string>
<string name="btn_main_report">Report</string>
<string name="btn_main_viewmap">View Map</string>
<string name="btn_main_report">{fa_map_marker} Report</string>
<string name="btn_main_viewmap">{fa_info} View Map</string>
<string name="title_activity_report">ReportActivity</string>
<string name="input_report_short_hint">short description</string>
<string name="input_report_long_hint">long descpription</string>
<string name="lbl_report_short">Title</string>
@@ -70,25 +65,30 @@
<string name="lbl_report_category">Crime Category</string>
<string name="lbl_report_time">Time (hh:mm)</string>
<string name="lbl_report_date">Date (dd-mm-yyyy) of incident</string>
<string name="lbl_settings_name">Name</string>
<string name="lbl_settings_surname">Surname</string>
<string name="lbl_settings_email">E-Mail</string>
<string name="lbl_settings_username">Username</string>
<string name="lbl_profile_stats">Profile stats</string>
<string name="lbl_profile_member_since">member since</string>
<string name="lbl_profile_points">points</string>
<string name="lbl_profile_ranking">ranking</string>
<string name="lbl_profile_numberposts">number of posts</string>
<string name="btn_profile_viewposts">View posts</string>
<string name="btn_profile_viewposts">{fa_search} View posts</string>
<string name="lbl_settings_password">Confirm Password</string>
<string name="btn_settings_req_password">Change password</string>
<string name="btn_settings_req_password">{fa_paint_brush} Change password</string>
<string name="lbl_settings_retype_password">Retype Password</string>
<string name="menu_action_about">About</string>
<string name="menu_action_help">Help</string>
<string name="menu_action_exit">Exit</string>
<string name="lbl_report_position">Position</string>
<string name="btn_report_position">Position</string>
<string name="btn_maps_confirm_position">Report this position!</string>
<string name="btn_report_position">{fa_search} Position</string>
<string name="btn_maps_confirm_position">{fa_paint_brush} Report this position!</string>
<string-array name="incident_categories">
<item>Personal</item>

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

@@ -2,4 +2,10 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
</style>
<style name="wrapping_button">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginRight">@dimen/micro_padding</item>
</style>
</resources>