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

DT @17.09.2015: User Profile in User Config und User Profile unterteilt. Menu angepasst.

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-17 21:06:15 +02:00
parent ea1ae90b3f
commit d4230ba969
19 changed files with 211 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,129 +17,20 @@
android:layout_marginRight="20dp"
android:orientation="vertical" >
<TextView
android:id="@+id/lbl_profile_username"
android:text="@string/lbl_profile_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"/>
<EditText
android:id="@+id/txt_profile_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_username"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_profile_name"
android:text="@string/lbl_profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_username" />
<TextView
android:id="@+id/lbl_profile_surname"
android:text="@string/lbl_profile_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/txt_profile_surname"
android:layout_alignLeft="@+id/txt_profile_surname"
android:layout_alignStart="@+id/txt_profile_surname"/>
<EditText
android:id="@+id/txt_profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_below="@+id/lbl_profile_name"
android:layout_alignLeft="@+id/lbl_profile_name"
android:layout_alignStart="@+id/lbl_profile_name"/>
<EditText
android:id="@+id/txt_profile_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/txt_profile_name"
android:layout_toRightOf="@+id/txt_profile_name"
android:layout_toEndOf="@+id/txt_profile_name"/>
<TextView
android:id="@+id/lbl_profile_email"
android:text="@string/lbl_profile_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_name"/>
<EditText
android:id="@+id/txt_profile_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_email"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_profile_password"
android:text="@string/lbl_profile_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_profile_email"/>
<EditText
android:id="@+id/txt_profile_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="7"
android:layout_below="@+id/lbl_profile_password"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_change"
android:text="@string/btn_profile_change"
android:minWidth="155dp"
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_marginTop="5dp"
android:layout_alignTop="@+id/lbl_profile_password"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
<TextView
android:id="@+id/lbl_trennlinie"
android:layout_width="fill_parent"
android:layout_height="2dip"
android:background="#cc273e"
android:layout_below="@+id/btn_profile_change"
android:layout_marginTop="20dp"/>
<TextView
android:id="@+id/lbl_profile_stats"
android:text="@string/lbl_profile_stats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="#cc273e"
android:layout_below="@+id/lbl_trennlinie"/>
android:textColor="#cc273e"/>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_stats"
android:stretchColumns="1">
android:stretchColumns="1"
android:id="@+id/tableLayout">
<TableRow>
<TextView
android:id="@+id/lbl_profile_membersince"
@@ -212,20 +103,21 @@
android:layout_height="wrap_content"
android:padding="3dip"
android:textColor="#FF0099CC"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_viewposts"
android:text="@string/btn_profile_viewposts"
android:layout_weight="1"
android:minWidth="155dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>
</TableRow>
</TableLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_viewposts"
android:text="@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"
android:layout_column="0"
android:layout_below="@+id/tableLayout"
android:layout_marginTop="31dp" />
</RelativeLayout>
<ListView

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

@@ -11,10 +11,127 @@
<RelativeLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="vertical" >
<TextView android:text="Settings Activity!" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/lbl_settings_username"
android:text="@string/lbl_settings_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"/>
<EditText
android:id="@+id/txt_settings_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_username"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_settings_name"
android:text="@string/lbl_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_username" />
<TextView
android:id="@+id/lbl_settings_surname"
android:text="@string/lbl_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/txt_settings_surname"
android:layout_alignLeft="@+id/txt_settings_surname"
android:layout_alignStart="@+id/txt_settings_surname"/>
<EditText
android:id="@+id/txt_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_below="@+id/lbl_settings_name"
android:layout_alignLeft="@+id/lbl_settings_name"
android:layout_alignStart="@+id/lbl_settings_name"/>
<EditText
android:id="@+id/txt_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/txt_settings_name"
android:layout_toRightOf="@+id/txt_settings_name"
android:layout_toEndOf="@+id/txt_settings_name"/>
<TextView
android:id="@+id/lbl_settings_email"
android:text="@string/lbl_settings_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_name"/>
<EditText
android:id="@+id/txt_settings_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_email"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_settings_password"
android:text="@string/lbl_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_email"/>
<EditText
android:id="@+id/txt_settings_password"
android:inputType="textPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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"
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_marginTop="46dp"
android:layout_below="@+id/txt_settings_retype_password"
android:layout_centerHorizontal="true" />
</RelativeLayout>