Apply UI changes in android signup

2025-04-07 03:22:27 +02:00 · 2018-09-26 16:00:14 -03:00 · 2018-09-26 16:00:14 -03:00 · 6908107979
commit 6908107979
parent f4be767d22
11 changed files with 287 additions and 51 deletions
--- a/android/app/src/main/cpp/native.cpp
+++ b/android/app/src/main/cpp/native.cpp
@ -266,6 +266,14 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(JNIE

 }

+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeCancelLogin(JNIEnv *env,
+                                                                             jobject instance) {
+
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(env, instance);
+}
+
+
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *env, jobject instance,
                                                            jstring username_, jstring password_,
@ -307,6 +315,15 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
                              Q_ARG(const QString&, username), Q_ARG(const QString&, password));
 }

+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeLogin(JNIEnv *env,
+                                                                       jobject instance,
+                                                                       jstring username_,
+                                                                       jstring password_,
+                                                                       jobject usernameChangedListener) {
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(env, instance, username_, password_, usernameChangedListener);
+}
+
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeInitAfterAppLoaded(JNIEnv* env, jobject obj) {
    AndroidHelper::instance().moveToThread(qApp->thread());
 }
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@ -25,7 +25,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;

 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
@ -34,6 +33,7 @@ import io.highfidelity.hifiinterface.fragment.FriendsFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
 import io.highfidelity.hifiinterface.fragment.LoginFragment;
 import io.highfidelity.hifiinterface.fragment.PolicyFragment;
+import io.highfidelity.hifiinterface.fragment.SignedInFragment;
 import io.highfidelity.hifiinterface.fragment.SignupFragment;
 import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;

@ -41,7 +41,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                                                                LoginFragment.OnLoginInteractionListener,
                                                                HomeFragment.OnHomeInteractionListener,
                                                                FriendsFragment.OnHomeInteractionListener,
-                                                                SignupFragment.OnSignupInteractionListener {
+                                                                SignupFragment.OnSignupInteractionListener,
+                                                                SignedInFragment.OnSignedInInteractionListener {

    private static final int PROFILE_PICTURE_PLACEHOLDER = R.drawable.default_profile_avatar;
    public static final String DEFAULT_FRAGMENT = "Home";
@ -138,10 +139,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On

    private void loadLoginFragment() {
        Fragment fragment = LoginFragment.newInstance();
-
        loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true);
    }

+    private void loadSignedInFragment() {
+        Fragment fragment = SignedInFragment.newInstance();
+        loadFragment(fragment, getString(R.string.welcome), getString(R.string.tagFragmentSignedIn), true);
+    }
+
    private void loadSignupFragment() {
        Fragment fragment = SignupFragment.newInstance();

@ -316,6 +321,15 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
        }
    }

+    @Override
+    public void onGettingStarted() {
+        loadHomeFragment(false);
+        if (backToScene) {
+            backToScene = false;
+            goToLastLocation();
+        }
+    }
+
    @Override
    public void onLoginRequested() {
        loadLoginFragment();
@ -328,8 +342,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On

    @Override
    public void onSignupCompleted() {
-        Toast.makeText(this, "Sign up succeeded", Toast.LENGTH_SHORT).show();
-        loadLoginFragment();
+        loadSignedInFragment();
+        updateLoginMenu();
    }

    public void handleUsernameChanged(String username) {
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
@ -59,7 +59,7 @@ public class LoginFragment extends Fragment {
        mError = rootView.findViewById(R.id.error);
        mLoginButton = rootView.findViewById(R.id.loginButton);
        mForgotPassword = rootView.findViewById(R.id.forgotPassword);
-        mSignup = rootView.findViewById(R.id.signup);
+        mSignup = rootView.findViewById(R.id.signupButton);

        mLoginButton.setOnClickListener(view -> login());

--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
@ -0,0 +1,73 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import io.highfidelity.hifiinterface.R;
+
+public class SignedInFragment extends Fragment {
+
+    private Button mGetStartedButton;
+    private OnSignedInInteractionListener mListener;
+
+    public SignedInFragment() {
+        // Required empty public constructor
+    }
+
+    public static SignedInFragment newInstance() {
+        SignedInFragment fragment = new SignedInFragment();
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_signedin, container, false);
+        mGetStartedButton = rootView.findViewById(R.id.getStarted);
+
+        mGetStartedButton.setOnClickListener(view -> {
+            getStarted();
+        });
+
+        return rootView;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof SignedInFragment.OnSignedInInteractionListener) {
+            mListener = (SignedInFragment.OnSignedInInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnSignedInInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    public void getStarted() {
+        if (mListener != null) {
+            mListener.onGettingStarted();
+        }
+    }
+
+    public interface OnSignedInInteractionListener {
+        void onGettingStarted();
+    }
+
+}
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
@ -1,5 +1,6 @@
 package io.highfidelity.hifiinterface.fragment;

+import android.app.Activity;
 import android.app.Fragment;
 import android.app.ProgressDialog;
 import android.content.Context;
@ -26,7 +27,7 @@ public class SignupFragment extends Fragment {
    private EditText mUsername;
    private EditText mPassword;
    private TextView mError;
-    private TextView mLogin;
+    private TextView mCancelButton;

    private Button mSignupButton;

@ -34,6 +35,8 @@ public class SignupFragment extends Fragment {

    public native void nativeSignup(String email, String username, String password); // move to SignupFragment
    public native void nativeCancelSignup();
+    public native void nativeLogin(String username, String password, Activity usernameChangedListener);
+    public native void nativeCancelLogin();

    private SignupFragment.OnSignupInteractionListener mListener;

@ -56,10 +59,10 @@ public class SignupFragment extends Fragment {
        mPassword = rootView.findViewById(R.id.password);
        mError = rootView.findViewById(R.id.error);
        mSignupButton = rootView.findViewById(R.id.signupButton);
-        mLogin = rootView.findViewById(R.id.login);
+        mCancelButton = rootView.findViewById(R.id.cancelButton);

        mSignupButton.setOnClickListener(view -> signup());
-        mLogin.setOnClickListener(view -> login());
+        mCancelButton.setOnClickListener(view -> login());
        mPassword.setOnEditorActionListener(
                (textView, actionId, keyEvent) -> {
                    if (actionId == EditorInfo.IME_ACTION_DONE) {
@ -168,14 +171,19 @@ public class SignupFragment extends Fragment {
    }

    public void handleSignupCompleted() {
-        getActivity().runOnUiThread(() -> {
-            mSignupButton.setEnabled(true);
+        String username = mUsername.getText().toString().trim();
+        String password = mPassword.getText().toString();
+        mDialog.setMessage(getString(R.string.logging_in));
+        mDialog.setCancelable(true);
+        mDialog.setOnCancelListener(dialogInterface -> {
+            nativeCancelLogin();
            cancelActivityIndicator();
            if (mListener != null) {
-                mListener.onSignupCompleted();
+                mListener.onLoginRequested();
            }
-            mError.setText("handleSignupCompleted");
        });
+        mDialog.show();
+        nativeLogin(username, password, getActivity());
    }

    public void handleSignupFailed(String error) {
@ -187,4 +195,23 @@ public class SignupFragment extends Fragment {
        });
    }

+    public void handleLoginCompleted(boolean success) {
+        getActivity().runOnUiThread(() -> {
+            mSignupButton.setEnabled(true);
+            cancelActivityIndicator();
+
+            if (success) {
+                if (mListener != null) {
+                    mListener.onSignupCompleted();
+                }
+            } else {
+                // Registration was successful but login failed.
+                // Let the user to login manually
+                mListener.onLoginRequested();
+            }
+        });
+    }
+
+
+
 }
--- a/android/app/src/main/res/drawable/rounded_secondary_button.xml
+++ b/android/app/src/main/res/drawable/rounded_secondary_button.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+</selector>
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@ -21,10 +21,12 @@
        android:id="@+id/error"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="25dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginRight="9dp"
        android:fontFamily="@font/raleway"
        android:textColor="@color/colorLoginError"
-        android:textSize="12sp"
+        android:textSize="14sp"
        app:layout_constraintBottom_toTopOf="@id/username"
        app:layout_constraintLeft_toLeftOf="@id/username"
        android:visibility="invisible"/>
@ -95,45 +97,47 @@
        android:background="@drawable/rounded_button"
        android:fontFamily="@font/raleway_semibold"
        android:paddingBottom="0dp"
-        android:paddingLeft="55dp"
-        android:paddingRight="55dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
        android:paddingTop="0dp"
        android:text="@string/login"
        android:textColor="@color/white_opaque"
        android:textAllCaps="false"
-        android:textSize="15sp"
+        android:textSize="18sp"
        app:layout_constraintRight_toRightOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
        app:layout_goneMarginTop="4dp"/>

    <TextView
        android:id="@+id/forgotPassword"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginTop="9dp"
        android:fontFamily="@font/raleway_semibold"
        android:textSize="14dp"
        android:text="@string/forgot_password"
        android:textStyle="italic"
-        android:paddingRight="10dp"
-        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
-        app:layout_constraintTop_toTopOf="@id/loginButton"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
+        app:layout_constraintRight_toRightOf="@id/passwordLayout"
+        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
        android:textColor="@color/colorButton1"/>

-    <TextView
-        android:id="@+id/signup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/signupButton"
+        android:layout_width="154dp"
+        android:layout_height="38dp"
+        android:background="@drawable/rounded_secondary_button"
        android:fontFamily="@font/raleway_semibold"
-        android:textSize="14dp"
+        android:paddingBottom="0dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:paddingTop="0dp"
        android:text="@string/signup"
-        android:textStyle="italic"
-        android:paddingRight="10dp"
-        android:layout_marginTop="20dp"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
-        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
-        android:textColor="@color/colorButton1"/>
+        app:layout_constraintTop_toTopOf="@id/loginButton"
+        app:layout_goneMarginTop="4dp"/>



--- a/android/app/src/main/res/layout/fragment_signedin.xml
+++ b/android/app/src/main/res/layout/fragment_signedin.xml
@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundLight">
+
+    <ImageView
+        android:id="@+id/header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/hifi_header" />
+
+    <TextView
+        android:id="@+id/welcome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:paddingLeft="86dp"
+        android:paddingRight="86dp"
+        android:fontFamily="@font/raleway"
+        android:textColor="@color/clearText"
+        android:textSize="24sp"
+        android:text="@string/signedin_welcome"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:gravity="center"
+
+        />
+
+    <Button
+        android:id="@+id/getStarted"
+        android:layout_width="217dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/rounded_button"
+        android:fontFamily="@font/raleway_semibold"
+        android:paddingBottom="0dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:paddingTop="0dp"
+        android:text="@string/get_started"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
+        app:layout_constraintTop_toBottomOf="@id/welcome"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+
+        app:layout_goneMarginTop="4dp"/>
+
+
+
+
+
+</android.support.constraint.ConstraintLayout>
--- a/android/app/src/main/res/layout/fragment_signup.xml
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@ -22,9 +22,11 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginBottom="16dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginRight="9dp"
        android:fontFamily="@font/raleway"
        android:textColor="@color/colorLoginError"
-        android:textSize="12sp"
+        android:textSize="14sp"
        app:layout_constraintBottom_toTopOf="@id/email"
        app:layout_constraintLeft_toLeftOf="@id/email"
        app:layout_constraintRight_toRightOf="@id/email"
@ -71,7 +73,7 @@
        android:textColorHint="@color/editTextColor"
        android:gravity="left|center_vertical"
        app:layout_constraintTop_toBottomOf="@id/email"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="7dp"
        android:hint="@string/username" />


@ -87,7 +89,7 @@
        app:passwordToggleDrawable="@drawable/selector_show_password"
        app:hintEnabled="false"
        app:layout_constraintTop_toBottomOf="@id/username"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="7dp"
        >
    <android.support.design.widget.TextInputEditText
        android:id="@+id/password"
@ -114,7 +116,7 @@
        android:id="@+id/signupButton"
        android:layout_width="154dp"
        android:layout_height="38dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="44dp"
        android:background="@drawable/rounded_button"
        android:fontFamily="@font/raleway_semibold"
        android:paddingBottom="0dp"
@ -124,23 +126,27 @@
        android:text="@string/signup"
        android:textColor="@color/white_opaque"
        android:textAllCaps="false"
-        android:textSize="15sp"
+        android:textSize="18sp"
        app:layout_constraintRight_toRightOf="@id/username"
        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
        app:layout_goneMarginTop="4dp"/>

-    <TextView
-        android:id="@+id/login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/cancelButton"
+        android:layout_width="154dp"
+        android:layout_height="38dp"
+        android:background="@drawable/rounded_secondary_button"
        android:fontFamily="@font/raleway_semibold"
-        android:textSize="14dp"
-        android:text="@string/login"
-        android:textStyle="italic"
-        android:paddingRight="10dp"
+        android:paddingBottom="0dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="0dp"
+        android:text="@string/cancel"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
        app:layout_constraintTop_toTopOf="@id/signupButton"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
-        android:textColor="@color/colorButton1"/>
+        app:layout_goneMarginTop="4dp"/>

 </android.support.constraint.ConstraintLayout>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@ -9,6 +9,7 @@
    <color name="showPasswordColor">#3D3D3D</color>
    <color name="tabs">#1EB5EC</color>
    <color name="colorButton1">#00B4EF</color>
+    <color name="colorButton2">#828282</color>
    <color name="backgroundDark">#333333</color>
    <color name="backgroundLight">#4F4F4F</color>
    <color name="backgroundSearch">#33999999</color>
@ -23,4 +24,6 @@
    <color name="starSelectedTint">#FBD92A</color>
    <color name="starUnselectedTint">#8A8A8A</color>
    <color name="slidingUpPanelFadeColor">#40000000</color>
+    <color name="clearText">#F2F2F2</color>
+
 </resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@ -16,7 +16,7 @@
    <string name="password">Password</string>
    <string name="login">Login</string>
    <string name="logout">Logout</string>
-    <string name="forgot_password">Forgot password?\u00A0</string>
+    <string name="forgot_password"><u>Forgot password?</u>\u00A0</string>
    <string name="login_username_or_password_incorrect">Username or password incorrect.</string>
    <string name="logging_in">Logging into High Fidelity</string>
    <string name="search_hint"><i>Search for a place by name</i>\u00A0</string>
@ -25,9 +25,13 @@
    <string name="privacyPolicy">Privacy Policy</string>
    <string name="your_last_location">Your Last Location</string>
    <string name="online">Online</string>
-    <string name="signup">Sign up</string>
+    <string name="signup">Sign Up</string>
    <string name="creating_account">Creating your High Fidelity account</string>
    <string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
+    <string name="signedin_welcome">You are now signed into High Fidelity</string>
+    <string name="welcome">Welcome</string>
+    <string name="cancel">Cancel</string>
+    <string name="get_started">Get Started</string>

    <!-- tags -->
    <string name="tagFragmentHome">tagFragmentHome</string>
@ -35,4 +39,5 @@
    <string name="tagFragmentSignup">tagFragmentSignup</string>
    <string name="tagFragmentPolicy">tagFragmentPolicy</string>
    <string name="tagFragmentPeople">tagFragmentPeople</string>
+    <string name="tagFragmentSignedIn">tagFragmentSignedIn</string>
 </resources>