Skip to content

Commit 71e24ba

Browse files
committed
Make the settings page scrollable
1 parent 86e759f commit 71e24ba

1 file changed

Lines changed: 160 additions & 154 deletions

File tree

android/app/src/main/res/layout/activity_settings.xml

Lines changed: 160 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -27,173 +27,179 @@
2727
app:title="App Settings" />
2828
</com.google.android.material.appbar.AppBarLayout>
2929

30-
<LinearLayout
31-
android:id="@+id/linearLayout2"
30+
31+
<ScrollView
3232
android:layout_width="match_parent"
33-
android:layout_height="wrap_content"
34-
android:layout_marginTop="16dp"
35-
android:orientation="vertical"
36-
android:paddingLeft="16dp"
37-
android:paddingRight="16dp"
38-
app:layout_constraintTop_toBottomOf="@+id/settings_app_bar_layout">
39-
40-
<com.google.android.material.textfield.TextInputLayout
41-
android:id="@+id/settingsSIM1"
42-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
33+
android:layout_height="match_parent"
34+
android:fillViewport="true">
35+
36+
<LinearLayout
37+
android:id="@+id/linearLayout2"
4338
android:layout_width="match_parent"
4439
android:layout_height="wrap_content"
45-
android:hint="@string/settings_sim1"
46-
app:errorEnabled="true"
47-
app:layout_constraintTop_toTopOf="parent"
48-
tools:layout_editor_absoluteX="16dp">
49-
50-
<com.google.android.material.textfield.TextInputEditText
51-
android:id="@+id/settingsSIM1Input"
40+
android:layout_marginTop="16dp"
41+
android:orientation="vertical"
42+
android:paddingLeft="16dp"
43+
android:paddingRight="16dp"
44+
app:layout_constraintTop_toBottomOf="@+id/settings_app_bar_layout">
45+
46+
<com.google.android.material.textfield.TextInputLayout
47+
android:id="@+id/settingsSIM1"
48+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
5249
android:layout_width="match_parent"
5350
android:layout_height="wrap_content"
54-
android:inputType="textMultiLine"
55-
tools:ignore="TextContrastCheck" />
56-
57-
</com.google.android.material.textfield.TextInputLayout>
58-
59-
<com.google.android.material.switchmaterial.SwitchMaterial
60-
android:id="@+id/settings_sim1_outgoing_messages"
61-
android:layout_width="match_parent"
62-
android:layout_height="wrap_content"
63-
android:layout_marginBottom="16dp"
64-
android:minHeight="48dp"
65-
android:text="@string/settings_outgoing_messages_sim1"
66-
android:textSize="18sp"
67-
tools:ignore="TouchTargetSizeCheck" />
68-
69-
<com.google.android.material.switchmaterial.SwitchMaterial
70-
android:id="@+id/settings_sim1_incoming_messages"
71-
android:layout_width="match_parent"
72-
android:layout_height="wrap_content"
73-
android:layout_marginBottom="16dp"
74-
android:minHeight="48dp"
75-
android:text="@string/settings_incoming_messages_sim1"
76-
android:textSize="18sp"
77-
tools:ignore="TouchTargetSizeCheck" />
78-
51+
android:hint="@string/settings_sim1"
52+
app:errorEnabled="true"
53+
android:layout_marginTop="48dp"
54+
app:layout_constraintTop_toTopOf="parent"
55+
tools:layout_editor_absoluteX="16dp">
56+
57+
<com.google.android.material.textfield.TextInputEditText
58+
android:id="@+id/settingsSIM1Input"
59+
android:layout_width="match_parent"
60+
android:layout_height="wrap_content"
61+
android:inputType="textMultiLine"
62+
tools:ignore="TextContrastCheck" />
63+
64+
</com.google.android.material.textfield.TextInputLayout>
65+
66+
<com.google.android.material.switchmaterial.SwitchMaterial
67+
android:id="@+id/settings_sim1_outgoing_messages"
68+
android:layout_width="match_parent"
69+
android:layout_height="wrap_content"
70+
android:layout_marginBottom="16dp"
71+
android:minHeight="48dp"
72+
android:text="@string/settings_outgoing_messages_sim1"
73+
android:textSize="18sp"
74+
tools:ignore="TouchTargetSizeCheck" />
75+
76+
<com.google.android.material.switchmaterial.SwitchMaterial
77+
android:id="@+id/settings_sim1_incoming_messages"
78+
android:layout_width="match_parent"
79+
android:layout_height="wrap_content"
80+
android:layout_marginBottom="16dp"
81+
android:minHeight="48dp"
82+
android:text="@string/settings_incoming_messages_sim1"
83+
android:textSize="18sp"
84+
tools:ignore="TouchTargetSizeCheck" />
7985

80-
<com.google.android.material.switchmaterial.SwitchMaterial
81-
android:id="@+id/settingsSim1EnableIncomingCallEvents"
82-
android:layout_width="match_parent"
83-
android:layout_height="wrap_content"
84-
android:layout_marginBottom="16dp"
85-
android:minHeight="48dp"
86-
android:text="@string/enable_incoming_call_events_sim1"
87-
android:textSize="18sp"
88-
tools:ignore="TouchTargetSizeCheck" />
89-
90-
<com.google.android.material.textfield.TextInputLayout
91-
android:id="@+id/settingsSIM2Layout"
92-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
93-
android:layout_width="match_parent"
94-
android:layout_height="wrap_content"
95-
android:hint="@string/settings_sim_2"
96-
app:errorEnabled="true"
97-
app:layout_constraintTop_toTopOf="parent"
98-
tools:layout_editor_absoluteX="16dp">
9986

100-
<com.google.android.material.textfield.TextInputEditText
101-
android:id="@+id/settingsSIM2InputEdit"
87+
<com.google.android.material.switchmaterial.SwitchMaterial
88+
android:id="@+id/settingsSim1EnableIncomingCallEvents"
10289
android:layout_width="match_parent"
10390
android:layout_height="wrap_content"
104-
android:inputType="textMultiLine"
105-
tools:ignore="TextContrastCheck" />
106-
107-
</com.google.android.material.textfield.TextInputLayout>
91+
android:layout_marginBottom="16dp"
92+
android:minHeight="48dp"
93+
android:text="@string/enable_incoming_call_events_sim1"
94+
android:textSize="18sp"
95+
tools:ignore="TouchTargetSizeCheck" />
96+
97+
<com.google.android.material.textfield.TextInputLayout
98+
android:id="@+id/settingsSIM2Layout"
99+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
100+
android:layout_width="match_parent"
101+
android:layout_height="wrap_content"
102+
android:hint="@string/settings_sim_2"
103+
app:errorEnabled="true"
104+
app:layout_constraintTop_toTopOf="parent"
105+
tools:layout_editor_absoluteX="16dp">
106+
107+
<com.google.android.material.textfield.TextInputEditText
108+
android:id="@+id/settingsSIM2InputEdit"
109+
android:layout_width="match_parent"
110+
android:layout_height="wrap_content"
111+
android:inputType="textMultiLine"
112+
tools:ignore="TextContrastCheck" />
113+
114+
</com.google.android.material.textfield.TextInputLayout>
115+
116+
<com.google.android.material.switchmaterial.SwitchMaterial
117+
android:id="@+id/settings_sim2_outgoing_messages"
118+
android:layout_width="match_parent"
119+
android:layout_height="wrap_content"
120+
android:layout_marginBottom="16dp"
121+
android:minHeight="48dp"
122+
android:text="@string/settings_outgoing_messages_sim2"
123+
android:textSize="18sp"
124+
tools:ignore="TouchTargetSizeCheck" />
125+
126+
<com.google.android.material.switchmaterial.SwitchMaterial
127+
android:id="@+id/settings_sim2_incoming_messages"
128+
android:layout_width="match_parent"
129+
android:layout_height="wrap_content"
130+
android:layout_marginBottom="16dp"
131+
android:minHeight="48dp"
132+
android:text="@string/settings_incoming_messages_sim2"
133+
android:textSize="18sp"
134+
tools:ignore="TouchTargetSizeCheck" />
135+
136+
<com.google.android.material.switchmaterial.SwitchMaterial
137+
android:id="@+id/settingsSim2EnableIncomingCallEvents"
138+
android:layout_width="match_parent"
139+
android:layout_height="wrap_content"
140+
android:layout_marginBottom="16dp"
141+
android:minHeight="48dp"
142+
android:text="@string/enable_sim2_incoming_call_events"
143+
android:textSize="18sp"
144+
tools:ignore="TouchTargetSizeCheck" />
145+
146+
<com.google.android.material.textfield.TextInputLayout
147+
android:id="@+id/settingsEncryptionKeyLayout"
148+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
149+
android:layout_width="match_parent"
150+
android:layout_height="wrap_content"
151+
android:hint="@string/encryption_key"
152+
app:errorEnabled="true"
153+
app:layout_constraintTop_toTopOf="parent"
154+
tools:layout_editor_absoluteX="16dp">
155+
156+
<com.google.android.material.textfield.TextInputEditText
157+
android:id="@+id/settingsEncryptionKeyInputEdit"
158+
android:layout_width="match_parent"
159+
android:layout_height="wrap_content"
160+
android:inputType="textMultiLine"
161+
tools:ignore="TextContrastCheck" />
162+
163+
</com.google.android.material.textfield.TextInputLayout>
164+
165+
<com.google.android.material.switchmaterial.SwitchMaterial
166+
android:id="@+id/settingsEncryptReceivedMessages"
167+
android:layout_width="match_parent"
168+
android:layout_height="wrap_content"
169+
android:layout_marginBottom="16dp"
170+
android:minHeight="48dp"
171+
android:text="@string/encrypt_received_messages"
172+
android:textSize="18sp"
173+
tools:ignore="TouchTargetSizeCheck" />
174+
175+
<com.google.android.material.switchmaterial.SwitchMaterial
176+
android:id="@+id/settingEnableDebugLogs"
177+
android:layout_width="match_parent"
178+
android:layout_height="wrap_content"
179+
android:layout_marginBottom="16dp"
180+
android:minHeight="48dp"
181+
android:text="@string/enable_debug_logs"
182+
android:textSize="18sp"
183+
tools:ignore="TouchTargetSizeCheck" />
108184

109-
<com.google.android.material.switchmaterial.SwitchMaterial
110-
android:id="@+id/settings_sim2_outgoing_messages"
111-
android:layout_width="match_parent"
112-
android:layout_height="wrap_content"
113-
android:layout_marginBottom="16dp"
114-
android:minHeight="48dp"
115-
android:text="@string/settings_outgoing_messages_sim2"
116-
android:textSize="18sp"
117-
tools:ignore="TouchTargetSizeCheck" />
118-
119-
<com.google.android.material.switchmaterial.SwitchMaterial
120-
android:id="@+id/settings_sim2_incoming_messages"
121-
android:layout_width="match_parent"
122-
android:layout_height="wrap_content"
123-
android:layout_marginBottom="16dp"
124-
android:minHeight="48dp"
125-
android:text="@string/settings_incoming_messages_sim2"
126-
android:textSize="18sp"
127-
tools:ignore="TouchTargetSizeCheck" />
128-
129-
<com.google.android.material.switchmaterial.SwitchMaterial
130-
android:id="@+id/settingsSim2EnableIncomingCallEvents"
131-
android:layout_width="match_parent"
132-
android:layout_height="wrap_content"
133-
android:layout_marginBottom="16dp"
134-
android:minHeight="48dp"
135-
android:text="@string/enable_sim2_incoming_call_events"
136-
android:textSize="18sp"
137-
tools:ignore="TouchTargetSizeCheck" />
138-
139-
<com.google.android.material.textfield.TextInputLayout
140-
android:id="@+id/settingsEncryptionKeyLayout"
141-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
142-
android:layout_width="match_parent"
143-
android:layout_height="wrap_content"
144-
android:hint="@string/encryption_key"
145-
app:errorEnabled="true"
146-
app:layout_constraintTop_toTopOf="parent"
147-
tools:layout_editor_absoluteX="16dp">
148185

149-
<com.google.android.material.textfield.TextInputEditText
150-
android:id="@+id/settingsEncryptionKeyInputEdit"
186+
<com.google.android.material.button.MaterialButton
187+
android:id="@+id/settingsLogoutButton"
188+
style="@style/Widget.MaterialComponents.Button.Icon"
151189
android:layout_width="match_parent"
152190
android:layout_height="wrap_content"
153-
android:inputType="textMultiLine"
191+
android:layout_marginBottom="24dp"
192+
android:backgroundTint="@color/black"
193+
android:drawableTint="@color/white"
194+
android:padding="10dp"
195+
android:text="@string/main_log_out"
196+
android:textColor="@color/white"
197+
android:textSize="16sp"
198+
app:iconTint="@color/white"
199+
app:layout_constraintEnd_toEndOf="parent"
200+
app:layout_constraintStart_toStartOf="parent"
154201
tools:ignore="TextContrastCheck" />
202+
</LinearLayout>
203+
</ScrollView>
155204

156-
</com.google.android.material.textfield.TextInputLayout>
157-
158-
<com.google.android.material.switchmaterial.SwitchMaterial
159-
android:id="@+id/settingsEncryptReceivedMessages"
160-
android:layout_width="match_parent"
161-
android:layout_height="wrap_content"
162-
android:layout_marginBottom="16dp"
163-
android:minHeight="48dp"
164-
android:text="@string/encrypt_received_messages"
165-
android:textSize="18sp"
166-
tools:ignore="TouchTargetSizeCheck" />
167-
168-
<com.google.android.material.switchmaterial.SwitchMaterial
169-
android:id="@+id/settingEnableDebugLogs"
170-
android:layout_width="match_parent"
171-
android:layout_height="wrap_content"
172-
android:layout_marginBottom="16dp"
173-
android:minHeight="48dp"
174-
android:text="@string/enable_debug_logs"
175-
android:textSize="18sp"
176-
tools:ignore="TouchTargetSizeCheck" />
177-
</LinearLayout>
178-
179-
<com.google.android.material.button.MaterialButton
180-
android:id="@+id/settingsLogoutButton"
181-
style="@style/Widget.MaterialComponents.Button.Icon"
182-
android:layout_width="wrap_content"
183-
android:layout_height="wrap_content"
184-
android:backgroundTint="@color/black"
185-
android:drawableTint="@color/white"
186-
android:padding="10dp"
187-
android:text="@string/main_log_out"
188-
android:textColor="@color/white"
189-
android:textSize="16sp"
190-
android:layout_marginTop="16dp"
191-
android:layout_marginLeft="16dp"
192-
android:layout_marginRight="16dp"
193-
app:icon="@drawable/ic_login"
194-
app:iconTint="@color/white"
195-
app:layout_constraintEnd_toEndOf="parent"
196-
app:layout_constraintStart_toStartOf="parent"
197-
app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
198-
tools:ignore="TextContrastCheck" />
199205
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)