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

DT @10.01.2016: Icons verändert, Subscription hinzugefügt, Profile von anderen Usern einsehbar. Release 1.3

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-10 22:26:32 +01:00
parent bdcef68772
commit f44042efa8
125 changed files with 1384 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -53,7 +51,7 @@
android:textColorHint="@color/input_login_hint" />
<Button
android:id="@+id/btn_register"
android:id="@+id/btn_login"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -66,16 +64,32 @@
android:text="@string/btn_start_login"
android:textColor="@color/white" />
<TextView
android:id="@+id/lbl_login_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/lbl_login_resendPW"
android:gravity="end"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="match_parent"
android:layout_below="@+id/btn_login"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="0dp"
android:ellipsize="end"
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:layout_weight=".5"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/lbl_login_policy"
android:ellipsize="end"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_weight=".45"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView
android:id="@+id/lbl_login_usesocialnet"
@@ -117,14 +131,6 @@
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_facebook_button" />
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/btn_register"
android:text="@string/lbl_login_resendPW"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>