diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 16:05:39 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 16:05:39 +0100 |
| commit | 0fac81767d2d48a5fe28c29e4ca6c4742fe62637 (patch) | |
| tree | 4fcc47118f63bd5d5dcde5803fd3703df55c1bfc /app/src/main/res | |
| parent | 0bf176d8e925c71be7853c67f7c8b57d58df0ce3 (diff) | |
| parent | 45065d30e0f2c61ca654587bab765959fdf4931f (diff) | |
Merge branch '0xacab_0.9.8' into 8865_cancel_without_internet
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/menu/configuration_wizard_activity.xml | 15 |
3 files changed, 12 insertions, 21 deletions
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 b7af5797..c09bda2d 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -54,7 +54,7 @@ app:srcCompat="@drawable/ic_colorsquare" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -65,6 +65,7 @@ android:layout_marginRight="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -97,7 +98,7 @@ style="@style/BitmaskButtonBlack" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -107,12 +108,13 @@ android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" android:text="@string/vpn_securely_routed" + android:gravity="center" android:visibility="visible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/eipLabel" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -120,6 +122,7 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" + android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/routed_text" /> diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 814ec310..30b94de9 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -52,7 +52,7 @@ app:srcCompat="@drawable/ic_colorsquare" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -63,6 +63,7 @@ android:layout_marginRight="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -97,7 +98,7 @@ style="@style/BitmaskButtonBlack" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -107,12 +108,13 @@ android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" android:text="@string/vpn_securely_routed" + android:gravity="center" android:visibility="visible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/eipLabel" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -120,6 +122,7 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginLeft="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" + android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/routed_text" /> diff --git a/app/src/main/res/menu/configuration_wizard_activity.xml b/app/src/main/res/menu/configuration_wizard_activity.xml deleted file mode 100644 index 21591547..00000000 --- a/app/src/main/res/menu/configuration_wizard_activity.xml +++ /dev/null @@ -1,15 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/about_leap" - android:orderInCategory="110" - android:title="@string/about"/> - - <item - android:id="@+id/new_provider" - android:orderInCategory="210" - android:title="@string/add_provider" - android:showAsAction="ifRoom|withText" - android:icon="@drawable/ic_menu_add" - /> -</menu>
\ No newline at end of file |