Skip to content

Commit d9d1743

Browse files
pshpsh
committed
Initial pass to use standard margins/padding (in dimens.xml)
1 parent ed42194 commit d9d1743

31 files changed

+349
-349
lines changed

‎app/src/main/res/layout-land/activity_login.xml

+50-61
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
android:layout_width="400sp"
99
android:layout_height="wrap_content"
1010
android:layout_gravity="center"
11-
android:layout_marginTop="8dp">
11+
android:layout_marginTop="@dimen/small_gap">
1212

1313
<android.support.v7.widget.CardView
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_marginTop="32dp"
17-
android:layout_marginBottom="16dp"
18-
android:layout_marginEnd="16dp"
19-
android:layout_marginLeft="16dp"
20-
android:layout_marginRight="16dp"
21-
android:layout_marginStart="16dp"
16+
android:layout_marginTop="@dimen/large_gap"
17+
android:layout_marginBottom="@dimen/standard_gap"
18+
android:layout_marginEnd="@dimen/standard_gap"
19+
android:layout_marginLeft="@dimen/standard_gap"
20+
android:layout_marginRight="@dimen/standard_gap"
21+
android:layout_marginStart="@dimen/standard_gap"
2222
app:cardCornerRadius="4dp"
2323
app:cardElevation="4dp">
2424

@@ -34,11 +34,11 @@
3434
android:layout_height="wrap_content"
3535
android:background="@color/primaryColor"
3636
android:gravity="center"
37-
android:paddingBottom="32dp"
38-
android:paddingTop="32dp"
37+
android:paddingBottom="@dimen/large_gap"
38+
android:paddingTop="@dimen/large_gap"
3939
android:text="@string/login_to_your_account"
4040
android:textColor="@android:color/white"
41-
android:textSize="24sp" />
41+
android:textSize="@dimen/heading_text_size" />
4242

4343
<FrameLayout
4444
android:id="@+id/error_message_container"
@@ -52,12 +52,12 @@
5252
android:id="@+id/error_message"
5353
android:layout_width="match_parent"
5454
android:layout_height="wrap_content"
55-
android:layout_marginEnd="16dp"
56-
android:layout_marginLeft="16dp"
57-
android:layout_marginRight="16dp"
58-
android:layout_marginStart="16dp"
59-
android:paddingBottom="8dp"
60-
android:paddingTop="8dp"
55+
android:layout_marginEnd="@dimen/standard_gap"
56+
android:layout_marginLeft="@dimen/standard_gap"
57+
android:layout_marginRight="@dimen/standard_gap"
58+
android:layout_marginStart="@dimen/standard_gap"
59+
android:paddingBottom="@dimen/small_gap"
60+
android:paddingTop="@dimen/small_gap"
6161
android:textColor="@color/secondaryDarkColor"
6262
tools:text="Check your password, something doesnt look right" />
6363
</FrameLayout>
@@ -67,12 +67,12 @@
6767
android:layout_width="match_parent"
6868
android:layout_height="wrap_content"
6969
android:layout_below="@id/error_message_container"
70-
android:layout_marginBottom="16dp"
71-
android:layout_marginEnd="16dp"
72-
android:layout_marginLeft="16dp"
73-
android:layout_marginRight="16dp"
74-
android:layout_marginStart="16dp"
75-
android:layout_marginTop="16dp">
70+
android:layout_marginBottom="@dimen/standard_gap"
71+
android:layout_marginEnd="@dimen/standard_gap"
72+
android:layout_marginLeft="@dimen/standard_gap"
73+
android:layout_marginRight="@dimen/standard_gap"
74+
android:layout_marginStart="@dimen/standard_gap"
75+
android:layout_marginTop="@dimen/standard_gap">
7676

7777
<android.support.design.widget.TextInputEditText
7878
android:id="@+id/loginUsername"
@@ -93,11 +93,11 @@
9393
android:layout_width="match_parent"
9494
android:layout_height="wrap_content"
9595
android:layout_below="@id/username_container"
96-
android:layout_marginBottom="16dp"
97-
android:layout_marginEnd="16dp"
98-
android:layout_marginLeft="16dp"
99-
android:layout_marginRight="16dp"
100-
android:layout_marginStart="16dp"
96+
android:layout_marginBottom="@dimen/standard_gap"
97+
android:layout_marginEnd="@dimen/standard_gap"
98+
android:layout_marginLeft="@dimen/standard_gap"
99+
android:layout_marginRight="@dimen/standard_gap"
100+
android:layout_marginStart="@dimen/standard_gap"
101101
app:passwordToggleEnabled="false">
102102

103103
<android.support.design.widget.TextInputEditText
@@ -115,11 +115,11 @@
115115
android:layout_width="match_parent"
116116
android:layout_height="wrap_content"
117117
android:layout_below="@id/password_container"
118-
android:layout_marginBottom="16dp"
119-
android:layout_marginEnd="16dp"
120-
android:layout_marginLeft="16dp"
121-
android:layout_marginRight="16dp"
122-
android:layout_marginStart="16dp"
118+
android:layout_marginBottom="@dimen/standard_gap"
119+
android:layout_marginEnd="@dimen/standard_gap"
120+
android:layout_marginLeft="@dimen/standard_gap"
121+
android:layout_marginRight="@dimen/standard_gap"
122+
android:layout_marginStart="@dimen/standard_gap"
123123
android:visibility="gone"
124124
app:passwordToggleEnabled="false"
125125
tools:visibility="visible">
@@ -141,20 +141,20 @@
141141
android:layout_width="match_parent"
142142
android:layout_height="wrap_content"
143143
android:layout_below="@id/two_factor_container"
144-
android:layout_marginBottom="16dp"
145-
android:layout_marginEnd="16dp"
146-
android:layout_marginLeft="16dp"
147-
android:layout_marginRight="16dp"
148-
android:layout_marginStart="16dp">
144+
android:layout_marginBottom="@dimen/standard_gap"
145+
android:layout_marginEnd="@dimen/standard_gap"
146+
android:layout_marginLeft="@dimen/standard_gap"
147+
android:layout_marginRight="@dimen/standard_gap"
148+
android:layout_marginStart="@dimen/standard_gap">
149149

150150
<Button
151151
android:id="@+id/signupButton"
152152
android:layout_width="0dp"
153153
style="@style/Widget.AppCompat.Button.Borderless.Colored"
154154
android:layout_height="wrap_content"
155155
android:layout_gravity="center_horizontal"
156-
android:layout_marginEnd="8dp"
157-
android:layout_marginRight="8dp"
156+
android:layout_marginEnd="@dimen/small_gap"
157+
android:layout_marginRight="@dimen/small_gap"
158158
android:layout_weight="1"
159159
android:text="@string/signup" />
160160

@@ -163,35 +163,24 @@
163163
android:layout_width="0dp"
164164
style="@style/Widget.AppCompat.Button.Colored"
165165
android:layout_height="wrap_content"
166-
android:layout_marginLeft="8dp"
167-
android:layout_marginStart="8dp"
166+
android:layout_marginLeft="@dimen/small_gap"
167+
android:layout_marginStart="@dimen/small_gap"
168168
android:layout_weight="1"
169169
android:enabled="false"
170170
android:text="@string/login" />
171171

172172
</LinearLayout>
173173

174-
<RelativeLayout
175-
android:layout_width="match_parent"
176-
android:layout_height="wrap_content"
174+
<fr.free.nrw.commons.ui.widget.HtmlTextView
175+
android:id="@+id/about_privacy_policy"
176+
style="?android:textAppearanceSmall"
177177
android:layout_below="@id/buttonFrame"
178-
android:layout_marginBottom="16dp"
179-
android:layout_marginEnd="16dp"
180-
android:layout_marginLeft="16dp"
181-
android:layout_marginRight="16dp"
182-
android:layout_marginStart="16dp">
183-
184-
<fr.free.nrw.commons.ui.widget.HtmlTextView
185-
android:id="@+id/about_privacy_policy"
186-
style="?android:textAppearanceSmall"
187-
android:layout_width="wrap_content"
188-
android:layout_height="wrap_content"
189-
android:layout_marginTop="16dp"
190-
android:layout_gravity="center_horizontal"
191-
android:text="@string/about_privacy_policy"
192-
android:layout_centerHorizontal="true"/>
193-
194-
</RelativeLayout>
178+
android:layout_width="wrap_content"
179+
android:layout_height="wrap_content"
180+
android:layout_marginBottom="@dimen/standard_gap"
181+
android:layout_gravity="center_horizontal"
182+
android:text="@string/about_privacy_policy"
183+
android:layout_centerHorizontal="true"/>
195184

196185
</RelativeLayout>
197186
</android.support.v7.widget.CardView>

‎app/src/main/res/layout-land/welcome_do_upload.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:background="#0c609c"
8-
android:gravity="center"
9-
>
8+
android:gravity="center">
109

1110

1211
<GridLayout
1312
android:layout_width="300dp"
1413
android:layout_height="wrap_content"
1514
android:layout_gravity="center_vertical"
16-
android:layout_marginLeft="10dp"
17-
android:layout_marginRight="10dp"
15+
android:layout_marginEnd="@dimen/standard_gap"
16+
android:layout_marginRight="@dimen/standard_gap"
1817
android:columnCount="2"
1918
>
2019

@@ -69,8 +68,8 @@
6968
android:text="@string/tutorial_2_text"
7069
android:layout_gravity="center"
7170
android:textStyle="bold"
71+
android:textSize="@dimen/normal_text"
7272
android:textAlignment="center"
73-
android:paddingTop="24dp"
7473
android:gravity="center_horizontal"
7574
android:textColor="@android:color/white"/>
7675

@@ -81,7 +80,7 @@
8180
android:text="@string/tutorial_2_subtext"
8281
android:layout_gravity="center"
8382
android:textAlignment="textStart"
84-
android:paddingTop="16dp"
83+
android:paddingTop="@dimen/standard_gap"
8584
android:gravity="start"
8685
android:textColor="@android:color/white"
8786
/>

‎app/src/main/res/layout-land/welcome_dont_upload.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,25 @@
1212
android:layout_gravity="center"
1313
android:layout_width="240dp"
1414
android:layout_height="wrap_content"
15-
android:layout_marginRight="10dp"
16-
android:layout_marginLeft="10dp"
15+
android:layout_marginEnd="@dimen/standard_gap"
16+
android:layout_marginRight="@dimen/standard_gap"
1717
>
1818

1919
<ImageView
2020
android:src="@drawable/selfie_x"
2121
android:id="@+id/selfie_x"
2222
android:layout_width="110dp"
23-
android:layout_height="wrap_content"
23+
android:layout_height="match_parent"
2424
android:contentDescription="@string/welcome_image_no_selfies"
2525
/>
2626

2727
<ImageView
2828
android:src="@drawable/proprietary_x"
2929
android:id="@+id/proprietary_x"
30-
android:layout_marginLeft="10dp"
30+
android:layout_marginStart="@dimen/standard_gap"
31+
android:layout_marginLeft="@dimen/standard_gap"
3132
android:layout_width="110dp"
32-
android:layout_height="wrap_content"
33+
android:layout_height="match_parent"
3334
android:layout_toRightOf="@+id/selfie_x"
3435
android:contentDescription="@string/welcome_image_proprietary"
3536
/>
@@ -50,7 +51,7 @@
5051
android:layout_gravity="center"
5152
android:textStyle="bold"
5253
android:textAlignment="center"
53-
android:paddingTop="24dp"
54+
android:textSize="@dimen/normal_text"
5455
android:gravity="center_horizontal"
5556
android:textColor="@android:color/white"/>
5657

@@ -61,7 +62,7 @@
6162
android:text="@string/tutorial_3_subtext"
6263
android:layout_gravity="center"
6364
android:textAlignment="textStart"
64-
android:paddingTop="16dp"
65+
android:paddingTop="@dimen/standard_gap"
6566
android:gravity="start"
6667
android:textColor="@android:color/white"
6768
/>

‎app/src/main/res/layout-land/welcome_final.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@
4343
android:text="@string/welcome_final_text"
4444
android:layout_gravity="center"
4545
android:textStyle="bold"
46+
android:textSize="@dimen/normal_text"
4647
android:textAlignment="center"
4748
android:gravity="center_horizontal"
4849
android:textColor="@android:color/white"/>
4950

5051
<Button
5152
android:layout_width="120dp"
52-
android:layout_height="40dp"
53-
android:layout_marginTop="16dp"
53+
android:layout_height="@dimen/overflow_button_dimen"
54+
android:layout_marginTop="@dimen/standard_gap"
5455
android:text="@string/welcome_final_button_text"
5556
android:id="@+id/welcomeYesButton"
5657
android:layout_gravity="center"

‎app/src/main/res/layout-land/welcome_image_details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
1414
android:src="@drawable/sydney_opera_house"
15-
android:paddingLeft="24dp"
16-
android:paddingRight="24dp"
17-
android:paddingTop="24dp"
18-
android:paddingBottom="24dp"
15+
android:paddingLeft="@dimen/large_gap"
16+
android:paddingRight="@dimen/standard_gap"
17+
android:paddingTop="@dimen/large_gap"
18+
android:paddingBottom="@dimen/large_gap"
1919
android:adjustViewBounds="true"
2020
android:layout_gravity="center"
2121
android:contentDescription="@string/welcome_image_sydney_opera_house"
@@ -34,7 +34,7 @@
3434
android:layout_gravity="center"
3535
android:textStyle="bold"
3636
android:textAlignment="center"
37-
android:paddingTop="24dp"
37+
android:textSize="@dimen/normal_text"
3838
android:gravity="center_horizontal"
3939
android:textColor="@android:color/white"/>
4040

@@ -45,7 +45,7 @@
4545
android:text="@string/tutorial_4_subtext"
4646
android:layout_gravity="center"
4747
android:textAlignment="textStart"
48-
android:paddingTop="16dp"
48+
android:paddingTop="@dimen/standard_gap"
4949
android:gravity="start"
5050
android:textColor="@android:color/white"
5151
/>

‎app/src/main/res/layout-land/welcome_wikipedia.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
android:layout_height="wrap_content"
1414
android:layout_gravity="center"
1515
android:src="@drawable/welcome_wikipedia"
16+
android:layout_marginEnd="@dimen/standard_gap"
17+
android:layout_marginRight="@dimen/standard_gap"
1618
android:adjustViewBounds="true"
1719
android:contentDescription="@string/welcome_image_welcome_wikipedia"
1820
/>
@@ -29,8 +31,8 @@
2931
android:text="@string/tutorial_1_text"
3032
android:layout_gravity="center"
3133
android:textStyle="bold"
34+
android:textSize="@dimen/normal_text"
3235
android:textAlignment="center"
33-
android:paddingTop="24dp"
3436
android:gravity="center_horizontal"
3537
android:textColor="@android:color/white"/>
3638

@@ -41,7 +43,7 @@
4143
android:text="@string/tutorial_1_subtext"
4244
android:layout_gravity="center"
4345
android:textAlignment="center"
44-
android:paddingTop="16dp"
46+
android:paddingTop="@dimen/standard_gap"
4547
android:gravity="center_horizontal"
4648
android:textColor="@android:color/white"
4749
/>

0 commit comments

Comments
 (0)