mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
Josephine Lim 2017-03-04 01:53:32 +10:00
commit b0ef687c7b
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -94,6 +94,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
Intent intent = new Intent(context, ContributionsActivity.class); Intent intent = new Intent(context, ContributionsActivity.class);
startActivity(intent); startActivity(intent);
finish();
} else { } else {
int response; int response;

30
app/src/main/res/layout/activity_login.xml
View file

@ -1,4 +1,5 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
> >
@ -42,26 +43,43 @@
android:layout_height="48dp" android:layout_height="48dp"
/> />
<EditText <android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<android.support.design.widget.TextInputEditText
android:id="@+id/loginUsername" android:id="@+id/loginUsername"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/username" android:hint="@string/username"
android:inputType="textNoSuggestions"
android:imeOptions="flagNoExtractUi" android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
> >
<requestFocus />
</EditText>
<EditText <requestFocus/>
</android.support.design.widget.TextInputEditText>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:passwordToggleEnabled="false"
>
<android.support.design.widget.TextInputEditText
android:id="@+id/loginPassword" android:id="@+id/loginPassword"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/password" android:hint="@string/password"
android:inputType="textPassword"
android:imeOptions="flagNoExtractUi" android:imeOptions="flagNoExtractUi"
android:inputType="textPassword"
/> />
</android.support.design.widget.TextInputLayout>
<Button <Button
android:id="@+id/loginButton" android:id="@+id/loginButton"
android:layout_width="match_parent" android:layout_width="match_parent"