diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
| commit | a643da6ff368c56186a92b135988d52d5f0bff63 (patch) | |
| tree | 87ba3d12270cb08137f169ad84a50ee7745832eb /app/src/main/res | |
| parent | 03c1d39eccca1368fb160d6495f385846def5818 (diff) | |
| parent | 6a683c605aa5bb5ce72f8ea46a4b6bcae0f9e98a (diff) | |
Merge branch '8868_ui_lollipop' into 0xacab_0.9.8
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
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 |
2 files changed, 12 insertions, 6 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" /> |