diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/about.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/dashboard.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/logwindow.xml | 17 | ||||
-rw-r--r-- | app/src/main/res/layout/user_session_fragment.xml | 7 |
5 files changed, 7 insertions, 24 deletions
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 3188d16f..62e858cb 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -15,7 +15,8 @@ <TextView android:id="@+id/version" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" /> <Space android:layout_width="match_parent" diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml index 6a9bbe97..1b294fb1 100644 --- a/app/src/main/res/layout/dashboard.xml +++ b/app/src/main/res/layout/dashboard.xml @@ -15,7 +15,7 @@ android:textSize="26sp" android:ellipsize="marquee" android:gravity="center_vertical" - android:singleLine="true" + android:maxLines="1" android:text="@string/provider_label_none" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index c8370cf1..cef01c18 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -30,7 +30,7 @@ android:textSize="12sp" /> - <mbanje.kurt.fabbutton.FabButton + <se.leap.bitmaskclient.userstatus.FabButton android:id="@+id/vpn_status_image" android:layout_width="32dp" android:layout_height="32dp" diff --git a/app/src/main/res/layout/logwindow.xml b/app/src/main/res/layout/logwindow.xml deleted file mode 100644 index 4051c92c..00000000 --- a/app/src/main/res/layout/logwindow.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <TextView android:text="@string/speed_waiting" - android:singleLine="true" - android:id="@+id/speed" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - <ListView - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml index d33f9b9a..2d38d140 100644 --- a/app/src/main/res/layout/user_session_fragment.xml +++ b/app/src/main/res/layout/user_session_fragment.xml @@ -26,16 +26,15 @@ android:textSize="14sp" /> - <view + <se.leap.bitmaskclient.userstatus.FabButton android:id="@+id/user.status.icon" android:layout_width="32dp" android:layout_height="32dp" 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:src="@drawable/icon_user" + android:color="@android:color/holo_blue_dark" android:layout_gravity="center" android:indeterminate="true" app:fbb_progressColor="@android:color/holo_green_dark" |