diff options
author | Parménides GV <parmegv@sdf.org> | 2015-05-01 10:34:33 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-05-01 10:34:33 +0200 |
commit | e2e90dab0fcad09b342630617dd9da8be3d23f8c (patch) | |
tree | 18671f6716133ca2dc2a059b82ad86d45d555fa5 /app/src/main/res/layout/fragment_user_session.xml | |
parent | 834fe99739264d498e3e8c87002b0e92cf8160a0 (diff) | |
parent | 436de7afeea2cd234db8a4b70ace396101126e88 (diff) |
Merge branch 'feature/Move-log-in-button-to-the-Dashboard-6911' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863
Diffstat (limited to 'app/src/main/res/layout/fragment_user_session.xml')
-rw-r--r-- | app/src/main/res/layout/fragment_user_session.xml | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml new file mode 100644 index 00000000..5194e495 --- /dev/null +++ b/app/src/main/res/layout/fragment_user_session.xml @@ -0,0 +1,52 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginLeft="20dp" + android:layout_marginStart="20dp" + tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment"> + + <TextView + android:id="@+id/user.status.username" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:layout_marginRight="20dp" + android:layout_marginEnd="20dp" + android:textSize="20sp" + android:text="@string/default_username" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <LinearLayout + android:id="@+id/user.status.buttonAndIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <Button + android:id="@+id/user.status.button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="14sp" + /> + + <view + android:id="@+id/user.status.icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginLeft="9dp" + android:layout_marginStart="9dp" + android:background="@android:color/transparent" + android:color="@android:color/holo_blue_dark" + class="mbanje.kurt.fabbutton.FabButton" + android:layout_gravity="center" + android:visibility="visible" + android:indeterminate="true" + android:max="100" + fbb_autoStart="true" + fbb_progressColor="#ff170aff" + fbb_progressWidthRatio="0.1" + /> + + </LinearLayout> +</LinearLayout> |