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

106
app/src/main/res/layout/activity_main.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -13,81 +13,77 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/lbl_main_txt1"
android:text="@string/lbl_main_txt1"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="52dp"
android:textColor="@color/white"/>
android:gravity="center"
android:layout_marginTop="79dp"
android:layout_centerInParent="true">
<TextView
android:id="@+id/txt_main_incidents"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="38dp"
android:layout_below="@+id/lbl_main_txt1"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/lbl_main_txt1"
android:text="@string/lbl_main_txt1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="52dp"
android:textColor="#8a999999"/>
<TextView
android:id="@+id/txt_main_incidents"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_centerHorizontal="true"
android:textSize="40dp" />
<TextView
android:id="@+id/lbl_main_txt2"
android:text="@string/lbl_main_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="#8a999999"
android:layout_centerHorizontal="true" />
</LinearLayout>
<TextView
android:id="@+id/lbl_main_txt2"
android:text="@string/lbl_main_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="@color/white"
android:layout_below="@+id/txt_main_incidents"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/lbl_main_share"
android:text="@string/lbl_main_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_above="@+id/ll_01"
android:layout_centerHorizontal="true"
android:layout_marginBottom="26dp" />
<LinearLayout
android:id="@+id/ll_01"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:gravity="center"
android:background="@color/white"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="43dp">
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_main_report"
android:text="@string/btn_main_report"
android:layout_weight="1"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-map-marker"
bootstrap:bb_type="danger"
bootstrap:bb_roundedCorners="true" />
android:layout_marginRight="20dp"
bootstrap:bootstrapText="@string/btn_main_report"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_main_viewmap"
android:text="@string/btn_main_viewmap"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_weight="1"
bootstrap:bb_icon_left="fa-info"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
bootstrap:bootstrapText="@string/btn_main_viewmap"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
</LinearLayout>
</RelativeLayout>

8
app/src/main/res/layout/activity_maps.xml
View File

@@ -23,12 +23,12 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_maps_confirm_position"
android:text="@string/btn_maps_confirm_position"
bootstrap:bootstrapText="@string/btn_maps_confirm_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true"
android:layout_marginBottom="20dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>

27
app/src/main/res/layout/activity_profile.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
tools:context="org.deke.risk.riskahead.ProfileActivity">
<RelativeLayout
@@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="#cc273e"/>
android:textColor="#000000"/>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
<TextView
android:id="@+id/txt_profile_membersince"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
</TableRow>
<TableRow>
@@ -58,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
<TextView
android:id="@+id/txt_profile_points"
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
</TableRow>
<TableRow>
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
<TextView
android:id="@+id/txt_profile_ranking"
@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
</TableRow>
<TableRow>
@@ -94,7 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
<TextView
android:id="@+id/txt_profile_numberposts"
@@ -102,18 +102,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
android:textColor="#007197"/>
</TableRow>
</TableLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_viewposts"
android:text="@string/btn_profile_viewposts"
bootstrap:bootstrapText="@string/btn_profile_viewposts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_column="0"
android:layout_below="@+id/tableLayout"
android:layout_marginTop="31dp" />

50
app/src/main/res/layout/activity_report.xml
View File

@@ -3,16 +3,23 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ReportActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
@@ -126,7 +133,6 @@
android:id="@+id/input_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:ems="10"
android:layout_below="@+id/lbl_report_position"
android:layout_alignLeft="@+id/lbl_report_position"
@@ -135,31 +141,49 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_report_position"
android:text="@string/btn_report_position"
bootstrap:bootstrapText="@string/btn_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_marginTop="7dp"
android:layout_alignTop="@+id/lbl_report_position"
android:layout_alignRight="@+id/input_report_time"
android:layout_alignEnd="@+id/input_report_time" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_report_position_detail"
android:layout_below="@+id/input_report_position"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="@color/white"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_report_report"
android:text="@string/btn_main_report"
bootstrap:bootstrapText="@string/btn_main_report"
android:minWidth="300dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-map-marker"
bootstrap:bb_type="danger"
bootstrap:bb_roundedCorners="true"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"

50
app/src/main/res/layout/activity_settings.xml
View File

@@ -3,15 +3,22 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
@@ -104,34 +111,39 @@
android:ems="7"
android:layout_below="@+id/lbl_settings_password"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_change"
android:text="@string/btn_settings_change"
android:minWidth="180dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="33dp" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:text="@string/btn_settings_req_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_alignTop="@+id/lbl_settings_password"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="@color/white"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_change"
bootstrap:bootstrapText="@string/btn_settings_change"
android:minWidth="180dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"

3
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -1,9 +1,8 @@
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SubscriptionsActivity">

7
app/src/main/res/layout/fragment_facebook_button.xml
View File

@@ -9,11 +9,10 @@
android:id="@+id/btn_login_fb"
android:layout_width="225dp"
android:layout_height="50dp"
android:text="Facebook"
bootstrap:bootstrapText="{fa_facebook_f} Facebook"
android:layout_above="@+id/btn_login_fb"
bootstrap:bb_icon_left="fa-facebook-f"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
/>
</FrameLayout>

7
app/src/main/res/layout/fragment_googleplus_button.xml
View File

@@ -8,11 +8,10 @@
android:id="@+id/btn_login_gp"
android:layout_width="225dp"
android:layout_height="50dp"
android:text="Google+"
bootstrap:bootstrapText="{fa_google_plus} Google+"
android:layout_above="@+id/btn_login_gp"
bootstrap:bb_icon_left="fa-google-plus-square"
bootstrap:bb_type="danger"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true"
/>

7
app/src/main/res/layout/fragment_twitter_button.xml
View File

@@ -8,11 +8,10 @@
android:id="@+id/btn_login_twitter"
android:layout_width="225dp"
android:layout_height="50dp"
android:text="Twitter"
bootstrap:bootstrapText="{fa_twitter} Twitter"
android:layout_above="@+id/btn_login_gp"
bootstrap:bb_icon_left="fa-twitter"
bootstrap:bb_type="info"
bootstrap:bb_roundedCorners="true"
bootstrap:bootstrapBrand="info"
bootstrap:roundedCorners="true"
/>

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>