sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix login

Browse source
This commit is contained in:
Phillip Thelen 2015-12-09 00:43:30 +01:00
parent c0e7a05f77
commit f63cd745ea
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Habitica/res/layout/login_screen.xml
View file

@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:imeOptions="actionNext"
android:hint="@string/email_username"
android:hint="@string/username"
/>
</TableRow>
@ -71,8 +71,7 @@
<TableRow
android:id="@+id/email_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
android:layout_height="match_parent">
<ImageView
android:layout_width="17dp"
@ -111,7 +110,7 @@
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:hint="@string/password"
/>
</TableRow>
@ -119,8 +118,7 @@
<TableRow
android:id="@+id/confirm_password_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
android:layout_height="match_parent">
<ImageView
android:layout_width="17dp"
@ -155,7 +153,7 @@
android:id="@+id/login_btn"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/login_btn"
android:text="@string/register_btn"
android:layout_gravity="center_horizontal" />
<ProgressBar

2
Habitica/res/menu/login.xml
View file

@ -7,7 +7,7 @@
android:id="@+id/action_toggleRegistering"
android:orderInCategory="1"
app:showAsAction="ifRoom"
android:title="@string/register_btn"
android:title="@string/login_btn"
abc:showAsAction="ifRoom"/>
</menu>

1
Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
View file

@ -115,7 +115,6 @@ public class LoginActivity extends AppCompatActivity
mApiHelper = new APIHelper(this,hc);
this.isRegistering = true;
this.setRegistering(this.isRegistering);
}
private void resetLayout() {