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

DT @13.12.2015: TabbedWorkflow in Profile eingebaut und ReportListActivity daher gestrichen. Rearranged and Reformated Code of all XML-Files

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-13 14:38:05 +01:00
parent 14e1b1640c
commit c47e302d28
31 changed files with 1157 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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"
@@ -12,92 +11,92 @@
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:orientation="vertical">
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:padding="8dp"
android:background="@drawable/layout_bg"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:padding="8dp"
android:background="@drawable/layout_bg"
android:orientation="vertical">
<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"/>
<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" />
<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_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"/>
<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_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"/>
<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"/>
<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" />
<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" />
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_main_content_2"
@@ -108,21 +107,21 @@
android:layout_marginBottom="20dp"
android:padding="4dp"
android:background="@drawable/layout_bg"
android:orientation="vertical" >
android:orientation="vertical">
<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: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" />
<EditText
android:id="@+id/txt_settings_password"
android:inputType="textPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_password"/>
android:layout_below="@+id/lbl_settings_password" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
@@ -133,25 +132,25 @@
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_below="@+id/txt_settings_password" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
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>
<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>
@@ -160,6 +159,6 @@
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff"/>
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>