diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:46:53 +0200 |
commit | 03973cf7f9b0f8635b6835c548b192eb53a2be35 (patch) | |
tree | 6af11a281ce9fd4c8e70863d10093d910751bf66 /app/src/main/res/layout/user_session_fragment.xml | |
parent | ff679b7f20700cec2c08cb8026c585b47df3612f (diff) | |
parent | 4560bda1f5c6e5974973f0f3f815e7d6fcf9afb2 (diff) |
Merge branch 'feature/simplify-user-session-layout-and-update-dependencies' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863
Diffstat (limited to 'app/src/main/res/layout/user_session_fragment.xml')
-rw-r--r-- | app/src/main/res/layout/user_session_fragment.xml | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml new file mode 100644 index 00000000..30068381 --- /dev/null +++ b/app/src/main/res/layout/user_session_fragment.xml @@ -0,0 +1,43 @@ +<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="15dp" + android:layout_marginEnd="20dp" + android:textSize="20sp" + android:text="@string/default_username" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <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="50dp" + android:layout_height="50dp" + android:layout_marginLeft="9dp" + android:layout_marginStart="9dp" + android:shadowRadius="0" + android:src="@drawable/ic_account_circle" + android:color="@android:color/transparent" + class="se.leap.bitmaskclient.userstatus.FabButton" + android:indeterminate="true" + fbb_progressColor="@android:color/holo_blue_dark" + fbb_progressWidthRatio="0.1" + /> + +</LinearLayout> |