Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 1504268

Browse files
msfjarvisSkrilltrax
msfjarvis
and
Skrilltrax
authored
Fix Autofill publisher changed layout (#1136)
* Fix Autofill publisher changed layout Signed-off-by: Harsh Shandilya <[email protected]> * Tweak autofill publisher UI Signed-off-by: Aditya Wasan <[email protected]> Co-authored-by: Aditya Wasan <[email protected]>
1 parent 3ddd066 commit 1504268

File tree

3 files changed

+59
-48
lines changed

3 files changed

+59
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
88

99
- Some classes of errors would be swallowed by an unhelpful 'Invalid remote: origin' message
1010
- Repositories created within APS would contain invalid `.gpg-id` files with no ability to fix them from the app
11+
- Button labels were invisible in Autofill phishing warning screen
1112

1213
### Added
1314

‎app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillPublisherChangedActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class AutofillPublisherChangedActivity : AppCompatActivity() {
6666
with(binding) {
6767
okButton.setOnClickListener { finish() }
6868
advancedButton.setOnClickListener {
69-
advancedButton.visibility = View.INVISIBLE
69+
advancedButton.visibility = View.GONE
7070
warningAppAdvancedInfo.visibility = View.VISIBLE
7171
resetButton.visibility = View.VISIBLE
7272
}

‎app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml‎

Lines changed: 57 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,69 @@
66
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
77
xmlns:app="http://schemas.android.com/apk/res-auto"
88
xmlns:tools="http://schemas.android.com/tools"
9-
android:layout_width="280dp"
9+
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
1111
android:animateLayoutChanges="true"
1212
android:elevation="2dp"
13+
android:paddingBottom="16dp"
1314
android:scrollbars="vertical"
1415
tools:context="com.zeapo.pwdstore.autofill.oreo.ui.AutofillPublisherChangedActivity">
1516

1617
<ImageView
1718
android:id="@+id/cover"
18-
android:layout_width="0dp"
19-
android:layout_height="50dp"
19+
android:layout_width="60dp"
20+
android:layout_height="60dp"
2021
android:background="@color/primary_color"
2122
android:contentDescription="@string/app_name"
2223
android:src="@mipmap/ic_launcher_foreground"
2324
app:layout_constraintBottom_toTopOf="@id/warningSign"
24-
app:layout_constraintEnd_toEndOf="parent"
25+
app:layout_constraintEnd_toStartOf="@id/app_name"
26+
app:layout_constraintHorizontal_chainStyle="packed"
2527
app:layout_constraintStart_toStartOf="parent"
26-
app:layout_constraintTop_toTopOf="parent"
27-
app:layout_constraintVertical_bias="0.0"
28-
app:layout_constraintVertical_chainStyle="packed" />
28+
app:layout_constraintTop_toTopOf="parent" />
29+
30+
<TextView
31+
android:id="@+id/app_name"
32+
android:layout_width="wrap_content"
33+
android:layout_height="wrap_content"
34+
android:text="@string/app_name"
35+
android:textSize="18sp"
36+
android:textStyle="bold"
37+
app:layout_constraintBottom_toBottomOf="@id/cover"
38+
app:layout_constraintEnd_toEndOf="parent"
39+
app:layout_constraintStart_toEndOf="@id/cover"
40+
app:layout_constraintTop_toTopOf="@id/cover" />
2941

3042
<ImageView
3143
android:id="@+id/warningSign"
32-
android:layout_width="0dp"
33-
android:layout_height="50dp"
44+
android:layout_width="40dp"
45+
android:layout_height="40dp"
46+
android:layout_marginStart="@dimen/activity_horizontal_margin"
3447
android:contentDescription="@string/oreo_autofill_warning_publisher_warning_sign_description"
3548
android:src="@drawable/ic_warning_red_24dp"
36-
app:layout_constraintBottom_toTopOf="@id/warningHeader"
37-
app:layout_constraintEnd_toEndOf="parent"
49+
app:layout_constraintTop_toTopOf="@id/warningHeader"
3850
app:layout_constraintStart_toStartOf="parent"
39-
app:layout_constraintTop_toBottomOf="@id/cover" />
51+
app:layout_constraintBottom_toBottomOf="@id/warningHeader" />
4052

4153
<TextView
4254
android:id="@+id/warningHeader"
4355
android:layout_width="0dp"
4456
android:layout_height="wrap_content"
45-
android:layout_marginStart="@dimen/activity_horizontal_margin"
57+
android:layout_marginTop="@dimen/activity_vertical_margin"
58+
android:layout_marginStart="8dp"
4659
android:layout_marginEnd="@dimen/activity_horizontal_margin"
47-
android:layout_marginBottom="@dimen/activity_vertical_margin"
4860
android:text="@string/oreo_autofill_warning_publisher_header"
4961
android:textSize="12sp"
50-
app:layout_constraintBottom_toTopOf="@id/warningAppName"
5162
app:layout_constraintEnd_toEndOf="parent"
52-
app:layout_constraintStart_toStartOf="parent"
53-
app:layout_constraintTop_toBottomOf="@id/warningSign" />
63+
app:layout_constraintStart_toEndOf="@id/warningSign"
64+
app:layout_constraintTop_toBottomOf="@id/cover" />
5465

5566
<TextView
5667
android:id="@+id/warningAppName"
5768
android:layout_width="0dp"
5869
android:layout_height="wrap_content"
5970
android:layout_marginStart="@dimen/activity_horizontal_margin"
71+
android:layout_marginTop="@dimen/activity_vertical_margin"
6072
android:layout_marginEnd="@dimen/activity_horizontal_margin"
6173
android:gravity="center_horizontal"
6274
android:textSize="12sp"
@@ -87,79 +99,77 @@
8799
android:layout_marginStart="@dimen/activity_horizontal_margin"
88100
android:layout_marginTop="@dimen/activity_vertical_margin"
89101
android:layout_marginEnd="@dimen/activity_horizontal_margin"
90-
android:layout_marginBottom="@dimen/activity_vertical_margin"
91102
android:text="@string/oreo_autofill_warning_publisher_footer"
92103
android:textSize="12sp"
93-
app:layout_constraintBottom_toTopOf="@id/okButton"
94104
app:layout_constraintEnd_toEndOf="parent"
95105
app:layout_constraintStart_toStartOf="parent"
96106
app:layout_constraintTop_toBottomOf="@id/warningAppInstallDate" />
97107

98-
<Button
108+
<com.google.android.material.button.MaterialButton
99109
android:id="@+id/okButton"
100-
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
110+
style="@style/AppTheme.OutlinedButton"
101111
android:layout_width="wrap_content"
102112
android:layout_height="wrap_content"
103113
android:layout_marginStart="@dimen/activity_horizontal_margin"
114+
android:layout_marginTop="@dimen/activity_vertical_margin"
104115
android:layout_marginEnd="@dimen/activity_horizontal_margin"
116+
android:minWidth="240dp"
105117
android:text="@string/oreo_autofill_warning_publisher_changed_disable_autofill_button"
106118
android:textSize="12sp"
107-
app:layout_constraintBottom_toTopOf="@id/advancedButton"
108119
app:layout_constraintEnd_toEndOf="parent"
109-
app:layout_constraintHorizontal_bias="1.0"
110120
app:layout_constraintStart_toStartOf="parent"
111121
app:layout_constraintTop_toBottomOf="@id/warningAppFooter" />
112122

113-
<Button
123+
<com.google.android.material.button.MaterialButton
114124
android:id="@+id/advancedButton"
115-
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
125+
style="@style/AppTheme.OutlinedButton"
116126
android:layout_width="wrap_content"
117127
android:layout_height="wrap_content"
118128
android:layout_marginStart="@dimen/activity_horizontal_margin"
119129
android:layout_marginEnd="@dimen/activity_horizontal_margin"
130+
android:minWidth="240dp"
120131
android:text="@string/oreo_autofill_warning_publisher_advanced_info_button"
121132
android:textSize="12sp"
122-
app:layout_constraintBottom_toTopOf="@id/warningAppAdvancedInfo"
123133
app:layout_constraintEnd_toEndOf="parent"
124-
app:layout_constraintHorizontal_bias="1.0"
125134
app:layout_constraintStart_toStartOf="parent"
126-
app:layout_constraintTop_toBottomOf="@id/okButton" />
135+
app:layout_constraintTop_toBottomOf="@id/okButton"
136+
tools:visibility="visible" />
127137

128-
<TextView
129-
android:id="@+id/warningAppAdvancedInfo"
130-
android:layout_width="0dp"
138+
<com.google.android.material.button.MaterialButton
139+
android:id="@+id/resetButton"
140+
style="@style/AppTheme.OutlinedButton"
141+
android:layout_width="wrap_content"
131142
android:layout_height="wrap_content"
132143
android:layout_marginStart="@dimen/activity_horizontal_margin"
133144
android:layout_marginEnd="@dimen/activity_horizontal_margin"
134-
android:fontFamily="monospace"
135-
android:gravity="center_horizontal"
136-
android:textIsSelectable="true"
137-
android:textSize="10sp"
138-
android:visibility="invisible"
139-
app:layout_constraintBottom_toTopOf="@id/resetButton"
145+
android:minWidth="240dp"
146+
android:text="@string/oreo_autofill_warning_publisher_reenable_button"
147+
android:textColor="?attr/colorOnSurface"
148+
android:textSize="12sp"
149+
android:visibility="gone"
140150
app:layout_constraintEnd_toEndOf="parent"
141151
app:layout_constraintStart_toStartOf="parent"
142152
app:layout_constraintTop_toBottomOf="@id/advancedButton"
143-
tools:ignore="SmallSp"
144-
tools:text="Package: com.example.banking\n\nHash:\n8P1sW0EPJcslw7UzRsiXL64w+O50Ed+RBICtay1g24M="
145153
tools:visibility="visible" />
146154

147-
<Button
148-
android:id="@+id/resetButton"
149-
style="@style/Widget.MaterialComponents.Button.TextButton"
150-
android:layout_width="wrap_content"
155+
<TextView
156+
android:id="@+id/warningAppAdvancedInfo"
157+
android:layout_width="0dp"
151158
android:layout_height="wrap_content"
152159
android:layout_marginStart="@dimen/activity_horizontal_margin"
160+
android:layout_marginTop="16dp"
153161
android:layout_marginEnd="@dimen/activity_horizontal_margin"
154-
android:text="@string/oreo_autofill_warning_publisher_reenable_button"
162+
android:fontFamily="monospace"
163+
android:gravity="center_horizontal"
164+
android:textIsSelectable="true"
155165
android:textSize="10sp"
156-
android:visibility="invisible"
166+
android:visibility="gone"
157167
app:layout_constraintBottom_toBottomOf="parent"
158168
app:layout_constraintEnd_toEndOf="parent"
159-
app:layout_constraintHorizontal_bias="1.0"
160169
app:layout_constraintStart_toStartOf="parent"
161-
app:layout_constraintTop_toBottomOf="@id/warningAppAdvancedInfo"
170+
app:layout_constraintTop_toBottomOf="@id/resetButton"
162171
tools:ignore="SmallSp"
172+
tools:text="Package: com.example.banking\n\nHash:\n8P1sW0EPJcslw7UzRsiXL64w+O50Ed+RBICtay1g24M="
163173
tools:visibility="visible" />
164174

165175
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)