Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code review + minor ui fixes

Browse source
This commit is contained in:
Gabriel Calero 2018-11-09 12:49:02 -03:00
parent 729a0b6a59
commit d9f68af634
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
View file

@ -42,7 +42,7 @@ public class LoginFragment extends Fragment
private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID;
private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI;
private final String OAUTH_AUTHORIZE_BASE_URL = "https://highfidelity.com/users/auth/steam";
private static final int OAUTH_AUTORIZE_REQUEST = 1;
private static final int OAUTH_AUTHORIZE_REQUEST = 1;
private EditText mUsername;
private EditText mPassword;
@ -146,9 +146,6 @@ public class LoginFragment extends Fragment
@Override
public void onStop() {
super.onStop();
if (!mUseOauth) {
showLoginForm();
}
// Leave the Qt app paused
QtNative.setApplicationState(ApplicationInactive);
hideKeyboard();
@ -156,7 +153,7 @@ public class LoginFragment extends Fragment
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == OAUTH_AUTORIZE_REQUEST) {
if (requestCode == OAUTH_AUTHORIZE_REQUEST) {
if (resultCode == Activity.RESULT_OK) {
String authCode = data.getStringExtra(WebViewActivity.RESULT_OAUTH_CODE);
String state = data.getStringExtra(WebViewActivity.RESULT_OAUTH_STATE);
@ -314,7 +311,7 @@ public class LoginFragment extends Fragment
updateOauthState();
openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, buildAuthorizeUrl());
openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES, true);
startActivityForResult(openUrlIntent, OAUTH_AUTORIZE_REQUEST);
startActivityForResult(openUrlIntent, OAUTH_AUTHORIZE_REQUEST);
}

1
android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
View file

@ -114,7 +114,6 @@ public class SignupFragment extends Fragment
@Override
public void onStop() {
super.onStop();
showSignupForm();
// Leave the Qt app paused
QtNative.setApplicationState(ApplicationInactive);
hideKeyboard();

4
android/app/src/main/res/layout/fragment_signup.xml
View file

@ -134,7 +134,7 @@
android:layout_marginLeft="@dimen/signup_margin"
android:layout_marginRight="@dimen/signup_margin"
android:background="@color/white_opaque"
android:paddingLeft="@dimen/login_edit_text_padding"
android:paddingLeft="@dimen/edit_text_padding"
android:ems="10"
android:fontFamily="sans-serif"
android:textSize="@dimen/login_edit_text_size"
@ -149,7 +149,7 @@
<EditText
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="27dp"
android:layout_height="@dimen/login_edit_text_height"
android:layout_marginLeft="@dimen/signup_margin"
android:layout_marginRight="@dimen/signup_margin"
android:background="@color/white_opaque"