diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/dashboard.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_user_session.xml | 63 |
3 files changed, 40 insertions, 26 deletions
diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml index 95445d63..6a9bbe97 100644 --- a/app/src/main/res/layout/dashboard.xml +++ b/app/src/main/res/layout/dashboard.xml @@ -20,7 +20,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> <LinearLayout - android:id="@+id/user_session_fragment" + android:id="@+id/user.status.fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"/> diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 1360b8e0..06b514d3 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -40,7 +40,6 @@ class="mbanje.kurt.fabbutton.FabButton" android:layout_gravity="center" android:visibility="visible" - android:layout_centerInParent="true" android:indeterminate="true" android:max="100" fbb_autoStart="true" diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml index 0d2a1840..81e68199 100644 --- a/app/src/main/res/layout/fragment_user_session.xml +++ b/app/src/main/res/layout/fragment_user_session.xml @@ -1,36 +1,51 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout 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:orientation="horizontal" - tools:context="se.leap.bitmaskclient.userstatus.UserSessionFragment"> + android:layout_marginTop="10dp" + 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:textSize="18sp" + android:layout_marginLeft="10dp" + android:layout_marginStart="10dp" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" + android:layout_centerHorizontal="true" + android:text="@string/default_username" + android:textAppearance="?android:attr/textAppearanceMedium" /> <LinearLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_below="@id/user.status.username" + android:layout_centerInParent="true"> - <ProgressBar - android:id="@+id/user_session_status_progress" + <Button + android:id="@+id/user.status.button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:indeterminate="true"/> + /> - <TextView - android:id="@+id/user_session_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:layout_marginLeft="10dp" - android:layout_marginStart="10dp" - android:ellipsize="marquee" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <view + android:id="@+id/user.status.icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginLeft="3dp" + android:layout_marginStart="3dp" + 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> - - <Button - android:id="@+id/user_session_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> -</LinearLayout> +</RelativeLayout> |