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

DT @18.12.2015: Änderungen an IncidentObject und weitere Anpassungen vervollständigt

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-18 17:19:51 +01:00
parent d37acaf39c
commit 24ec175a43
34 changed files with 789 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,128 +30,123 @@
android:layout_weight="1"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:padding="8dp"
android:orientation="vertical">
android:layout_marginBottom="20dp">
<TextView
android:id="@+id/lbl_settings_username"
android:text="@string/lbl_settings_username"
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_username"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/txt_settings_username"
android:hint="Username"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_below="@+id/til_settings_username">
<EditText
android:id="@+id/txt_settings_username"
android:text="test"
<EditText
android:id="@+id/txt_settings_name"
android:hint="@string/lbl_settings_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_username"
android:layout_toRightOf="@+id/til_settings_name"
android:layout_below="@+id/til_settings_username">
<EditText
android:id="@+id/txt_settings_surname"
android:hint="@string/lbl_settings_surname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/til_settings_name"
android:layout_toRightOf="@+id/til_settings_name"
android:layout_toEndOf="@+id/til_settings_name" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_settings_name">
<EditText
android:id="@+id/txt_settings_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/lbl_settings_email"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_password"
android:layout_marginTop="40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/til_settings_email">
<EditText
android:id="@+id/txt_settings_password"
android:hint="@string/lbl_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8" />
</android.support.design.widget.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_alignBottom="@+id/til_settings_password"
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"
android:layout_alignLeft="@+id/txt_settings_email"
android:layout_alignStart="@+id/txt_settings_email" />
<EditText
android:id="@+id/txt_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8"
android:layout_below="@+id/lbl_settings_password"
android:layout_alignLeft="@+id/lbl_settings_password"
android:layout_alignStart="@+id/lbl_settings_password" />
android:layout_alignParentEnd="true" />
</RelativeLayout>
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:background="#7fbfbfbf"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
<com.beardedhen.androidbootstrap.BootstrapButton
<Button
android:id="@+id/btn_settings_change"
bootstrap:bootstrapText="@string/btn_settings_change"
android:layout_weight="1"
android:background="#651a1111"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_settings_change" />
</LinearLayout>