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

DT @24.09.2015: Report button implemented, settings change password added

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-24 22:02:10 +02:00
parent 2e74a4a5a3
commit a1fd5c6ac6
7 changed files with 206 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
<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:layout_width="match_parent"
android:layout_height="match_parent"
@@ -17,7 +18,19 @@
android:layout_height="match_parent"
android:id="@+id/frag_maps_map"
tools:context=".MapsActivity"
android:name="com.google.android.gms.maps.SupportMapFragment" />
android:name="com.google.android.gms.maps.SupportMapFragment"
/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_maps_confirm_position"
android:text="@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"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>
<ListView

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

@@ -104,21 +104,6 @@
android:ems="7"
android:layout_below="@+id/lbl_settings_password"/>
<TextView
android:id="@+id/lbl_settings_retype_password"
android:text="@string/lbl_settings_retype_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_password"/>
<EditText
android:id="@+id/txt_settings_retype_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="7"
android:layout_below="@+id/lbl_settings_retype_password"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_change"
@@ -129,9 +114,21 @@
bootstrap:bb_icon_left="fa-paint-brush"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_marginTop="46dp"
android:layout_below="@+id/txt_settings_retype_password"
android:layout_centerHorizontal="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"
android:layout_alignTop="@+id/lbl_settings_password"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>

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

@@ -80,13 +80,15 @@
<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="lbl_settings_password">Password</string>
<string name="lbl_settings_password">Confirm Password</string>
<string name="btn_settings_req_password">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-array name="incident_categories">
<item>Personal</item>