diff options
14 files changed, 19 insertions, 17 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_account_circle.png b/app/src/main/res/drawable-hdpi/ic_account_circle.png Binary files differdeleted file mode 100644 index db02b319..00000000 --- a/app/src/main/res/drawable-hdpi/ic_account_circle.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/icon_user.png b/app/src/main/res/drawable-hdpi/icon_user.png Binary files differnew file mode 100644 index 00000000..8e19c37d --- /dev/null +++ b/app/src/main/res/drawable-hdpi/icon_user.png diff --git a/app/src/main/res/drawable-mdpi/ic_account_circle.png b/app/src/main/res/drawable-mdpi/ic_account_circle.png Binary files differdeleted file mode 100644 index 2489c703..00000000 --- a/app/src/main/res/drawable-mdpi/ic_account_circle.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/icon_user.png b/app/src/main/res/drawable-mdpi/icon_user.png Binary files differnew file mode 100644 index 00000000..f64923d1 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/icon_user.png diff --git a/app/src/main/res/drawable-xhdpi/ic_account_circle.png b/app/src/main/res/drawable-xhdpi/ic_account_circle.png Binary files differdeleted file mode 100644 index 848a4fda..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_account_circle.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/icon_user.png b/app/src/main/res/drawable-xhdpi/icon_user.png Binary files differnew file mode 100644 index 00000000..81d54eaf --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/icon_user.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png Binary files differdeleted file mode 100644 index a886b553..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/icon_user.png b/app/src/main/res/drawable-xxhdpi/icon_user.png Binary files differnew file mode 100644 index 00000000..b9280300 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/icon_user.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png Binary files differdeleted file mode 100644 index c8feac66..00000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/icon_user.png b/app/src/main/res/drawable-xxxhdpi/icon_user.png Binary files differnew file mode 100644 index 00000000..81e17780 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/icon_user.png diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 2b826be2..28ac3b9a 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -8,15 +8,17 @@ <TextView android:id="@+id/eipLabel" + android:layout_centerHorizontal="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginStart="10dp" android:layout_marginTop="12dp" - android:layout_marginBottom="12dp" + android:layout_marginBottom="30dp" android:text="@string/eip_service_label" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textSize="24sp"/> + android:textSize="46sp" + android:textAppearance="?android:attr/textAppearanceMedium" + /> <LinearLayout @@ -37,8 +39,8 @@ <se.leap.bitmaskclient.userstatus.FabButton android:id="@+id/vpn_status_image" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="56dp" + android:layout_height="56dp" android:color="@android:color/holo_blue_dark" android:layout_gravity="center" android:visibility="visible" @@ -46,7 +48,7 @@ android:max="100" fbb_autoStart="true" fbb_progressColor="#ff170aff" - fbb_progressWidthRatio="0.1" + fbb_progressWidthRatio="0.2" android:layout_marginStart="24dp" android:layout_marginLeft="24dp" /> diff --git a/app/src/main/res/layout-xlarge/user_session_fragment.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml index d4729555..df72f615 100644 --- a/app/src/main/res/layout-xlarge/user_session_fragment.xml +++ b/app/src/main/res/layout-xlarge/user_session_fragment.xml @@ -1,5 +1,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" @@ -13,8 +14,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="30dp" - android:layout_marginRight="60dp" - android:layout_marginEnd="60dp" android:layout_gravity="center" android:textSize="46sp" android:text="@string/default_username" @@ -30,24 +29,25 @@ android:id="@+id/user.status.button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="24sp" + android:textSize="32sp" /> <se.leap.bitmaskclient.userstatus.FabButton android:id="@+id/user.status.icon" android:layout_width="56dp" android:layout_height="56dp" - android:layout_marginLeft="26dp" - android:layout_marginStart="26dp" - android:background="@android:color/transparent" + android:layout_marginStart="24dp" + android:layout_marginLeft="24dp" + android:shadowRadius="0" + android:src="@drawable/icon_user" android:color="@android:color/holo_blue_dark" android:layout_gravity="center" android:visibility="visible" android:indeterminate="true" android:max="100" fbb_autoStart="true" - fbb_progressColor="#ff170aff" - fbb_progressWidthRatio="0.3" + app:fbb_progressColor="@android:color/holo_green_dark" + app:fbb_progressWidthRatio="0.2" /> </LinearLayout> 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/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml index 914c8462..2d38d140 100644 --- a/app/src/main/res/layout/user_session_fragment.xml +++ b/app/src/main/res/layout/user_session_fragment.xml @@ -33,8 +33,8 @@ android:layout_marginLeft="9dp" android:layout_marginStart="9dp" android:shadowRadius="0" - android:src="@drawable/ic_account_circle" - android:color="@android:color/transparent" + 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" |
