Skip to content

Commit 1db1715

Browse files
author
Vivek Maskara
authored
Merge pull request commons-app#1208 from knight-shade/Fixes-#1207
Fixes commons-app#1207
2 parents 2fe374a + 541976c commit 1db1715

File tree

4 files changed

+73
-39
lines changed

4 files changed

+73
-39
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
compile 'com.facebook.stetho:stetho:1.5.0'
5050

5151
testCompile 'junit:junit:4.12'
52-
testCompile 'org.robolectric:robolectric:3.4'
52+
testCompile 'org.robolectric:robolectric:3.7.1'
5353

5454
testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
5555
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
@@ -78,7 +78,7 @@ dependencies {
7878
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
7979

8080
testImplementation 'junit:junit:4.12'
81-
testImplementation 'org.robolectric:robolectric:3.4'
81+
testImplementation 'org.robolectric:robolectric:3.7.1'
8282
testImplementation 'org.mockito:mockito-all:1.10.19'
8383

8484
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'

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

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<android.support.v7.widget.CardView
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_marginTop="@dimen/large_gap"
1716
android:layout_marginBottom="@dimen/standard_gap"
1817
android:layout_marginEnd="@dimen/standard_gap"
1918
android:layout_marginLeft="@dimen/standard_gap"
2019
android:layout_marginRight="@dimen/standard_gap"
2120
android:layout_marginStart="@dimen/standard_gap"
21+
android:layout_marginTop="@dimen/large_gap"
2222
app:cardCornerRadius="4dp"
2323
app:cardElevation="4dp">
2424

@@ -40,11 +40,26 @@
4040
android:textColor="@android:color/white"
4141
android:textSize="@dimen/heading_text_size" />
4242

43+
<TextView
44+
android:id="@+id/login_credentials"
45+
android:layout_width="match_parent"
46+
android:layout_height="wrap_content"
47+
android:layout_below="@id/title"
48+
android:layout_marginEnd="@dimen/standard_gap"
49+
android:layout_marginLeft="@dimen/standard_gap"
50+
android:layout_marginRight="@dimen/standard_gap"
51+
android:layout_marginStart="@dimen/standard_gap"
52+
android:paddingBottom="@dimen/standard_gap"
53+
android:paddingTop="@dimen/small_gap"
54+
android:textAlignment="center"
55+
android:textColor="@color/secondaryDarkColor"
56+
tools:text="@string/login_credential" />
57+
4358
<FrameLayout
4459
android:id="@+id/error_message_container"
4560
android:layout_width="match_parent"
4661
android:layout_height="wrap_content"
47-
android:layout_below="@id/title"
62+
android:layout_below="@id/login_credentials"
4863
android:visibility="gone"
4964
tools:visibility="visible">
5065

@@ -56,6 +71,7 @@
5671
android:layout_marginLeft="@dimen/standard_gap"
5772
android:layout_marginRight="@dimen/standard_gap"
5873
android:layout_marginStart="@dimen/standard_gap"
74+
android:gravity="center"
5975
android:paddingBottom="@dimen/small_gap"
6076
android:paddingTop="@dimen/small_gap"
6177
android:textColor="@color/secondaryDarkColor"
@@ -149,8 +165,8 @@
149165

150166
<Button
151167
android:id="@+id/signupButton"
152-
android:layout_width="0dp"
153168
style="@style/Widget.AppCompat.Button.Borderless.Colored"
169+
android:layout_width="0dp"
154170
android:layout_height="wrap_content"
155171
android:layout_gravity="center_horizontal"
156172
android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
160176

161177
<Button
162178
android:id="@+id/loginButton"
163-
android:layout_width="0dp"
164179
style="@style/Widget.AppCompat.Button.Colored"
180+
android:layout_width="0dp"
165181
android:layout_height="wrap_content"
166182
android:layout_marginLeft="@dimen/small_gap"
167183
android:layout_marginStart="@dimen/small_gap"
@@ -174,33 +190,33 @@
174190
<fr.free.nrw.commons.ui.widget.HtmlTextView
175191
android:id="@+id/about_privacy_policy"
176192
style="?android:textAppearanceSmall"
177-
android:layout_below="@id/buttonFrame"
178193
android:layout_width="wrap_content"
179194
android:layout_height="wrap_content"
180-
android:layout_marginBottom="@dimen/standard_gap"
195+
android:layout_below="@id/buttonFrame"
196+
android:layout_centerHorizontal="true"
181197
android:layout_gravity="center_horizontal"
182-
android:text="@string/about_privacy_policy"
183-
android:layout_centerHorizontal="true"/>
198+
android:layout_marginBottom="@dimen/standard_gap"
199+
android:text="@string/about_privacy_policy" />
184200

185201
</RelativeLayout>
186202
</android.support.v7.widget.CardView>
187203

188204
<android.support.v7.widget.AppCompatImageView
189205
android:layout_width="64dp"
190206
android:layout_height="64dp"
191-
android:elevation="8dp"
192-
tools:ignore="UnusedAttribute"
193207
android:layout_gravity="center_horizontal"
194-
app:srcCompat="@drawable/blue_rinse_circle" />
208+
android:elevation="8dp"
209+
app:srcCompat="@drawable/blue_rinse_circle"
210+
tools:ignore="UnusedAttribute" />
195211

196212
<android.support.v7.widget.AppCompatImageView
197213
android:layout_width="42dp"
198-
tools:ignore="UnusedAttribute"
199214
android:layout_height="42dp"
200215
android:layout_gravity="center_horizontal"
201216
android:layout_marginTop="8dp"
202217
android:elevation="8dp"
203-
app:srcCompat="@drawable/commons_logo_large" />
218+
app:srcCompat="@drawable/commons_logo_large"
219+
tools:ignore="UnusedAttribute" />
204220

205221
</FrameLayout>
206222

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<android.support.v7.widget.CardView
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_marginTop="@dimen/large_gap"
1716
android:layout_marginBottom="@dimen/standard_gap"
1817
android:layout_marginEnd="@dimen/standard_gap"
1918
android:layout_marginLeft="@dimen/standard_gap"
2019
android:layout_marginRight="@dimen/standard_gap"
2120
android:layout_marginStart="@dimen/standard_gap"
21+
android:layout_marginTop="@dimen/large_gap"
2222
app:cardCornerRadius="4dp"
2323
app:cardElevation="4dp">
2424

@@ -40,6 +40,21 @@
4040
android:textColor="@android:color/white"
4141
android:textSize="@dimen/heading_text_size" />
4242

43+
<TextView
44+
android:id="@+id/login_credentials"
45+
android:layout_width="match_parent"
46+
android:layout_height="wrap_content"
47+
android:layout_below="@id/title"
48+
android:layout_marginEnd="@dimen/standard_gap"
49+
android:layout_marginLeft="@dimen/standard_gap"
50+
android:layout_marginRight="@dimen/standard_gap"
51+
android:layout_marginStart="@dimen/standard_gap"
52+
android:paddingBottom="@dimen/small_gap"
53+
android:paddingTop="@dimen/small_gap"
54+
android:textAlignment="center"
55+
android:textColor="@color/secondaryDarkColor"
56+
tools:text="@string/login_credential" />
57+
4358
<FrameLayout
4459
android:id="@+id/error_message_container"
4560
android:layout_width="match_parent"
@@ -56,6 +71,7 @@
5671
android:layout_marginLeft="@dimen/standard_gap"
5772
android:layout_marginRight="@dimen/standard_gap"
5873
android:layout_marginStart="@dimen/standard_gap"
74+
android:gravity="center"
5975
android:paddingBottom="@dimen/small_gap"
6076
android:paddingTop="@dimen/small_gap"
6177
android:textColor="@color/secondaryDarkColor"
@@ -149,8 +165,8 @@
149165

150166
<Button
151167
android:id="@+id/signupButton"
152-
android:layout_width="0dp"
153168
style="@style/Widget.AppCompat.Button.Borderless.Colored"
169+
android:layout_width="0dp"
154170
android:layout_height="wrap_content"
155171
android:layout_gravity="center_horizontal"
156172
android:layout_marginEnd="@dimen/small_gap"
@@ -160,8 +176,8 @@
160176

161177
<Button
162178
android:id="@+id/loginButton"
163-
android:layout_width="0dp"
164179
style="@style/Widget.AppCompat.Button.Colored"
180+
android:layout_width="0dp"
165181
android:layout_height="wrap_content"
166182
android:layout_marginLeft="@dimen/small_gap"
167183
android:layout_marginStart="@dimen/small_gap"
@@ -174,22 +190,22 @@
174190
<fr.free.nrw.commons.ui.widget.HtmlTextView
175191
android:id="@+id/about_privacy_policy"
176192
style="?android:textAppearanceSmall"
177-
android:layout_below="@id/buttonFrame"
178193
android:layout_width="wrap_content"
179194
android:layout_height="wrap_content"
180-
android:layout_marginBottom="@dimen/standard_gap"
195+
android:layout_below="@id/buttonFrame"
196+
android:layout_centerHorizontal="true"
181197
android:layout_gravity="center_horizontal"
182-
android:text="@string/about_privacy_policy"
183-
android:layout_centerHorizontal="true"/>
198+
android:layout_marginBottom="@dimen/standard_gap"
199+
android:text="@string/about_privacy_policy" />
184200

185201
</RelativeLayout>
186202
</android.support.v7.widget.CardView>
187203

188204
<android.support.v7.widget.AppCompatImageView
189205
android:layout_width="64dp"
190206
android:layout_height="64dp"
191-
android:elevation="8dp"
192207
android:layout_gravity="center_horizontal"
208+
android:elevation="8dp"
193209
app:srcCompat="@drawable/blue_rinse_circle"
194210
tools:ignore="UnusedAttribute" />
195211

@@ -198,9 +214,9 @@
198214
android:layout_height="42dp"
199215
android:layout_gravity="center_horizontal"
200216
android:layout_marginTop="8dp"
201-
tools:ignore="UnusedAttribute"
202217
android:elevation="8dp"
203-
app:srcCompat="@drawable/commons_logo_large" />
218+
app:srcCompat="@drawable/commons_logo_large"
219+
tools:ignore="UnusedAttribute" />
204220

205221
</FrameLayout>
206222

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@
4444
android:textColor="@android:color/white"
4545
android:textSize="@dimen/heading_text_size" />
4646

47-
<TextView
48-
android:id="@+id/login_credentials"
49-
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:layout_below="@id/title"
52-
android:layout_marginEnd="@dimen/standard_gap"
53-
android:layout_marginLeft="@dimen/standard_gap"
54-
android:layout_marginRight="@dimen/standard_gap"
55-
android:layout_marginStart="@dimen/standard_gap"
56-
android:paddingBottom="@dimen/small_gap"
57-
android:paddingTop="@dimen/small_gap"
58-
android:textAlignment="center"
59-
android:textColor="@color/secondaryDarkColor"
60-
tools:text="@string/login_credential"/>
47+
<TextView
48+
android:id="@+id/login_credentials"
49+
android:layout_width="match_parent"
50+
android:layout_height="wrap_content"
51+
android:layout_below="@id/title"
52+
android:layout_marginEnd="@dimen/standard_gap"
53+
android:layout_marginLeft="@dimen/standard_gap"
54+
android:layout_marginRight="@dimen/standard_gap"
55+
android:layout_marginStart="@dimen/standard_gap"
56+
android:paddingBottom="@dimen/small_gap"
57+
android:paddingTop="@dimen/small_gap"
58+
android:textAlignment="center"
59+
android:textColor="@color/secondaryDarkColor"
60+
tools:text="@string/login_credential" />
6161

6262

6363
<FrameLayout
@@ -67,6 +67,7 @@
6767
android:layout_below="@id/login_credentials"
6868
android:visibility="gone"
6969
tools:visibility="visible">
70+
7071
<TextView
7172
android:id="@+id/error_message"
7273
android:layout_width="match_parent"
@@ -75,6 +76,7 @@
7576
android:layout_marginLeft="@dimen/standard_gap"
7677
android:layout_marginRight="@dimen/standard_gap"
7778
android:layout_marginStart="@dimen/standard_gap"
79+
android:gravity="center"
7880
android:paddingBottom="@dimen/small_gap"
7981
android:paddingTop="@dimen/small_gap"
8082
android:textColor="@color/secondaryDarkColor"

0 commit comments

Comments
 (0)