Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit b98fbe6

Browse files
committed
UI tweaks
1 parent c4fde73 commit b98fbe6

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

blockstack-sdk/src/main/res/layout/activity_connect.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<androidx.constraintlayout.widget.ConstraintLayout
1515
android:layout_width="match_parent"
1616
android:layout_height="match_parent"
17-
android:layout_margin="8dp"
18-
android:paddingBottom="8dp">
17+
android:paddingBottom="16dp">
1918

2019
<LinearLayout
2120
android:id="@+id/connect_icons"
@@ -43,7 +42,8 @@
4342
android:layout_marginTop="8dp"
4443
android:layout_marginRight="-8dp"
4544
android:importantForAccessibility="no"
46-
android:src="@drawable/ic_link" />
45+
android:src="@drawable/ic_link"
46+
android:elevation="1dp"/>
4747

4848
<ImageView
4949
android:id="@+id/connect_connect_icon"
@@ -83,19 +83,19 @@
8383
android:layout_height="wrap_content"
8484
android:layout_marginTop="4dp"
8585
android:importantForAccessibility="no"
86-
android:paddingLeft="16dp"
87-
android:paddingRight="16dp"
86+
android:paddingStart="24dp"
8887
android:src="@drawable/ic_lock"
8988
app:layout_constraintStart_toStartOf="parent"
9089
app:layout_constraintTop_toTopOf="@id/connect_secret_key_desc_title"
91-
app:tint="?colorPrimary" />
90+
app:tint="?colorPrimary"
91+
tools:ignore="RtlSymmetry"/>
9292

9393
<TextView
9494
android:id="@+id/connect_secret_key_desc_title"
9595
android:layout_width="0dp"
9696
android:layout_height="wrap_content"
9797
android:layout_marginTop="16dp"
98-
android:layout_marginRight="16dp"
98+
android:layout_marginHorizontal="16dp"
9999
android:gravity="top"
100100
android:text="@string/connect_activity_encryption_desc"
101101
android:textAppearance="?textAppearanceBody1"
@@ -117,19 +117,19 @@
117117
android:layout_height="wrap_content"
118118
android:layout_marginTop="4dp"
119119
android:importantForAccessibility="no"
120-
android:paddingLeft="16dp"
121-
android:paddingRight="16dp"
120+
android:paddingStart="24dp"
122121
android:src="@drawable/ic_track"
123122
app:layout_constraintStart_toStartOf="parent"
124123
app:layout_constraintTop_toTopOf="@id/connect_tracking_desc_title"
125-
app:tint="?colorPrimary" />
124+
app:tint="?colorPrimary"
125+
tools:ignore="RtlSymmetry"/>
126126

127127
<TextView
128128
android:id="@+id/connect_tracking_desc_title"
129129
android:layout_width="0dp"
130130
android:layout_height="wrap_content"
131131
android:layout_marginTop="16dp"
132-
android:layout_marginEnd="16dp"
132+
android:layout_marginHorizontal="16dp"
133133
android:gravity="top"
134134
android:text="@string/connect_activity_tracking_desc"
135135
android:textAppearance="?textAppearanceBody1"
@@ -143,8 +143,8 @@
143143

144144

145145
<com.google.android.material.button.MaterialButton
146-
style="?blockstackMainButtonStyle"
147146
android:id="@+id/connect_get_secret_key"
147+
style="?blockstackMainButtonStyle"
148148
android:layout_height="56dp"
149149
android:layout_marginLeft="16dp"
150150
android:layout_marginRight="16dp"
@@ -156,9 +156,10 @@
156156
android:layout_width="match_parent"
157157
android:layout_height="wrap_content"
158158
android:orientation="horizontal">
159+
159160
<com.google.android.material.button.MaterialButton
160-
style="?blockstackBottomButtonStyle"
161161
android:id="@+id/connect_sign_in"
162+
style="?blockstackBottomButtonStyle"
162163
android:layout_height="wrap_content"
163164
android:layout_width="match_parent"
164165
android:layout_weight="1"
@@ -167,8 +168,8 @@
167168
android:text="@string/connect_dialog_restore" />
168169

169170
<com.google.android.material.button.MaterialButton
170-
style="?blockstackBottomButtonStyle"
171171
android:id="@+id/connect_how_it_works"
172+
style="?blockstackBottomButtonStyle"
172173
android:layout_height="wrap_content"
173174
android:layout_width="match_parent"
174175
android:layout_weight="1"
@@ -177,5 +178,4 @@
177178
android:text="@string/connect_dialog_help" />
178179

179180
</LinearLayout>
180-
181-
</LinearLayout>
181+
</LinearLayout>
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
7-
android:orientation="vertical"
8-
android:padding="16dp">
6+
android:orientation="vertical">
97

108
<androidx.core.widget.NestedScrollView
119
android:layout_width="match_parent"
@@ -15,20 +13,19 @@
1513
<TextView
1614
android:id="@+id/textview_help"
1715
style="?textAppearanceBody1"
16+
android:padding="16dp"
1817
android:layout_width="wrap_content"
1918
android:layout_height="wrap_content"
2019
android:text="@string/connect_help" />
2120

22-
2321
</androidx.core.widget.NestedScrollView>
2422

2523
<com.google.android.material.button.MaterialButton
26-
style="?blockstackMainButtonStyle"
2724
android:id="@+id/button_get_started"
25+
style="?blockstackMainButtonStyle"
2826
android:layout_width="match_parent"
29-
android:layout_height="wrap_content"
30-
android:layout_marginTop="8dp"
31-
android:layout_marginBottom="8dp"
27+
android:layout_height="56dp"
28+
android:layout_marginHorizontal="16dp"
3229
android:text="@string/org_blockstack_get_started"
3330
android:textAllCaps="false" />
3431

@@ -37,6 +34,7 @@
3734
android:layout_width="match_parent"
3835
android:layout_height="wrap_content"
3936
android:gravity="center"
37+
android:padding="16dp"
4038
android:orientation="horizontal">
4139

4240
<TextView
@@ -49,15 +47,16 @@
4947
android:layout_width="wrap_content"
5048
android:layout_height="wrap_content"
5149
android:layout_marginHorizontal="4dp"
52-
android:src="@drawable/org_blockstack_black_logo" />
50+
android:src="@drawable/org_blockstack_black_logo"
51+
android:importantForAccessibility="no"
52+
/>
5353

5454
<TextView
5555
style="?textAppearanceSubtitle2"
5656
android:layout_width="wrap_content"
5757
android:layout_height="wrap_content"
58-
android:text="Blockstack"
58+
android:text="@string/blockstack"
5959
tools:ignore="HardcodedText" />
6060

6161
</LinearLayout>
62-
6362
</LinearLayout>

blockstack-sdk/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
2+
<string name="blockstack" translatable="false">Blockstack</string>
23
<string name="org_blockstack_login">Get your Secret Key</string>
34
<string name="org_blockstack_get_started" tools:ignore="MissingTranslation">Get Started</string>
45
<string name="connect_dialog_title" tools:ignore="MissingTranslation">%1$s guarantees your privacy by encrypting everything</string>

0 commit comments

Comments
 (0)