Skip to content

Commit c83301b

Browse files
meenbeesesyphyr
authored andcommitted
Improve the connect fragment UI on tablets
1 parent 36ee26e commit c83301b

File tree

2 files changed

+26
-29
lines changed

2 files changed

+26
-29
lines changed

Diff for: app/src/main/res/layout/fragment_connect.xml

+25-28
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<androidx.constraintlayout.widget.ConstraintLayout
43
xmlns:android="http://schemas.android.com/apk/res/android"
54
xmlns:app="http://schemas.android.com/apk/res-auto"
65
xmlns:tools="http://schemas.android.com/tools"
76
android:layout_width="match_parent"
87
android:layout_height="match_parent"
98
android:backgroundTint="@color/new_background">
9+
1010
<ProgressBar
11-
tools:visibility="visible"
11+
style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
1212
android:visibility="invisible"
13-
app:layout_constraintTop_toTopOf="parent"
14-
app:layout_constraintBottom_toTopOf="@id/ivStatus"
1513
android:id="@+id/progressBar"
16-
style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
17-
tools:progress="33"
1814
android:progressTint="@color/progress_bar_purple"
1915
android:layout_width="match_parent"
20-
android:layout_height="wrap_content"/>
16+
android:layout_height="wrap_content"
17+
app:layout_constraintTop_toTopOf="parent"
18+
app:layout_constraintBottom_toTopOf="@id/ivStatus"
19+
tools:visibility="visible"
20+
tools:progress="33" />
2121

2222
<ImageView
2323
android:id="@+id/ivStatus"
@@ -64,58 +64,55 @@
6464
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
6565
android:text="@string/hide_apps"
6666
android:textColor="@android:color/white"
67-
app:layout_constraintStart_toStartOf="parent"
68-
app:layout_constraintEnd_toEndOf="parent"
69-
app:layout_constraintTop_toBottomOf="@+id/tvTitle"
7067
android:gravity="center_horizontal"
7168
android:paddingLeft="@dimen/activity_horizontal_large_margin"
7269
android:paddingRight="@dimen/activity_horizontal_large_margin"
7370
android:layout_marginTop="8dp"
74-
app:layout_constraintHorizontal_bias="0.0" />
71+
app:layout_constraintStart_toStartOf="parent"
72+
app:layout_constraintEnd_toEndOf="parent"
73+
app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
7574

7675
<Button
77-
tools:enabled="false"
7876
android:background="@drawable/btn_shape_round"
7977
android:backgroundTint="@color/orbot_btn_enabled_purple"
80-
app:layout_constraintStart_toStartOf="parent"
81-
app:layout_constraintEnd_toEndOf="parent"
82-
app:layout_constraintTop_toBottomOf="@+id/tvSubtitle"
8378
android:maxLines="3"
8479
android:text="@string/btn_start_vpn"
8580
android:id="@+id/btnStart"
8681
android:layout_width="wrap_content"
8782
android:layout_height="wrap_content"
8883
android:layout_marginTop="32dp"
89-
android:paddingLeft="@dimen/button_horizontal_large_margin"
90-
android:paddingRight="@dimen/button_horizontal_large_margin"
91-
android:paddingTop="@dimen/activity_horizontal_margin"
92-
android:paddingBottom="@dimen/activity_horizontal_margin" />
84+
android:paddingStart="@dimen/button_horizontal_large_margin"
85+
android:paddingEnd="@dimen/button_horizontal_large_margin"
86+
android:paddingTop="@dimen/button_horizontal_small_margin"
87+
android:paddingBottom="@dimen/button_horizontal_small_margin"
88+
app:layout_constraintStart_toStartOf="parent"
89+
app:layout_constraintEnd_toEndOf="parent"
90+
app:layout_constraintTop_toBottomOf="@+id/tvSubtitle"
91+
tools:enabled="false" />
9392

9493
<TextView
9594
android:id="@+id/tvConfigure"
96-
app:layout_constraintStart_toStartOf="parent"
97-
app:layout_constraintEnd_toEndOf="parent"
98-
app:layout_constraintTop_toBottomOf="@id/btnStart"
9995
android:layout_width="wrap_content"
10096
android:layout_height="wrap_content"
10197
android:text="@string/btn_configure"
10298
android:layout_marginTop="24dp"
10399
android:textAllCaps="true"
104-
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
100+
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
101+
app:layout_constraintStart_toStartOf="parent"
102+
app:layout_constraintEnd_toEndOf="parent"
103+
app:layout_constraintTop_toBottomOf="@id/btnStart" />
105104

106105
<ListView
107106
android:drawSelectorOnTop="true"
108107
android:layout_marginTop="10dp"
109-
tools:visibility="gone"
110-
app:layout_constraintTop_toBottomOf="@id/tvConfigure"
111108
android:visibility="invisible"
112109
android:dividerHeight="1dp"
113110
android:layout_marginLeft="24dp"
114111
android:layout_marginRight="24dp"
115112
android:layout_width="match_parent"
116113
android:layout_height="wrap_content"
117-
android:id="@+id/lvConnected"/>
114+
android:id="@+id/lvConnected"
115+
app:layout_constraintTop_toBottomOf="@id/tvConfigure"
116+
tools:visibility="gone" />
118117

119118
</androidx.constraintlayout.widget.ConstraintLayout>
120-
121-

Diff for: app/src/main/res/values/dimens.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<dimen name="fab_margin">16dp</dimen>
77
<dimen name="alert_dialog_margin">20dp</dimen>
88
<dimen name="activity_horizontal_large_margin">32dp</dimen>
9-
9+
<dimen name="button_horizontal_small_margin">16dp</dimen>
1010
<dimen name="button_horizontal_med_margin">32dp</dimen>
1111
<dimen name="button_horizontal_large_margin">64dp</dimen>
1212

0 commit comments

Comments
 (0)