iproved login and registration added informals logo

droidLight · droidLight · commit 2ddf0bdf48a4 · 2019-03-21T10:48:24.000+05:30
diff --git a/app/src/main/java/dpi/ks19/participantapp/Activities/ClusterCardsActivity.java b/app/src/main/java/dpi/ks19/participantapp/Activities/ClusterCardsActivity.java
@@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //icons for clusters
         icons = new ArrayList<>();
         icons.add(R.drawable.logo_ks);
-        icons.add(R.drawable.logo_ks);
+        icons.add(R.drawable.logo_informals);
         icons.add(R.drawable.logo_arts);
         icons.add(R.drawable.logo_studio);
         icons.add(R.drawable.logo_english_lits);
diff --git a/app/src/main/java/dpi/ks19/participantapp/Adapter/ClusterAdapter.java b/app/src/main/java/dpi/ks19/participantapp/Adapter/ClusterAdapter.java
@@ -52,7 +52,7 @@ public ClusterAdapter(Context mContext, int d) {
 
 
         clusterIcon.add(R.drawable.logo_ks);
-        clusterIcon.add(R.drawable.logo_ks);
+        clusterIcon.add(R.drawable.logo_informals);
         clusterIcon.add(R.drawable.logo_arts);
         clusterIcon.add(R.drawable.logo_studio);
         clusterIcon.add(R.drawable.logo_english_lits);
diff --git a/app/src/main/java/dpi/ks19/participantapp/CallbackInterface/OTPSent.java b/app/src/main/java/dpi/ks19/participantapp/CallbackInterface/OTPSent.java
@@ -1,5 +1,5 @@
 package dpi.ks19.participantapp.CallbackInterface;
 
 public interface OTPSent {
-    void otpSent(boolean isSuccess);
+    void otpSent(boolean isSuccess, boolean isRegistered);
 }
diff --git a/app/src/main/java/dpi/ks19/participantapp/Fragments/LoginPagerFragment.java b/app/src/main/java/dpi/ks19/participantapp/Fragments/LoginPagerFragment.java
@@ -2,11 +2,13 @@
 
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,9 +19,8 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import dpi.ks19.participantapp.Activities.ClusterCardsActivity;
-import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.CallbackInterface.OTPSent;
+import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.MainScreen;
 import dpi.ks19.participantapp.Networking.ApiHelper;
 import dpi.ks19.participantapp.R;
@@ -70,13 +71,18 @@ public void onClickLogin(View  view){
     }
 
     @Override
-    public void otpSent(boolean isSuccess) {
+    public void otpSent(boolean isSuccess, boolean isRegistered) {
+        Log.d("REACHED","OTP_SENT");
         progressDialog.cancel();
         if(isSuccess){
-            //calling dialog to enter OTP
-            createOTPDialog();
+            if(isRegistered){
+                //calling dialog to enter OTP
+                createOTPDialog();
+            }else{
+                Toast.makeText(getActivity(),"User not Registered",Toast.LENGTH_LONG).show();
+            }
         }else{
-            Toast.makeText(getActivity(),"Please try again",Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(),"Please try again",Toast.LENGTH_LONG).show();
         }
     }
 
@@ -116,4 +122,11 @@ public void onClickGuest(View  view){
         startActivity(intent);
     }
 
+    @OnClick(R.id.privacy_text)
+    public void privacyPolicyClicked(View v){
+        String url = "https://github.com/droidLight/ks19_privacypolicy/blob/master/privacy_policy.md";
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    }
 }
diff --git a/app/src/main/java/dpi/ks19/participantapp/Fragments/RegisterPagerFragment.java b/app/src/main/java/dpi/ks19/participantapp/Fragments/RegisterPagerFragment.java
@@ -2,7 +2,6 @@
 
 import android.app.ProgressDialog;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,22 +14,15 @@
 
 import android.widget.CheckBox;
 
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import dpi.ks19.participantapp.Activities.CollegeListActivity;
-import dpi.ks19.participantapp.CallbackInterface.CollegeInterface;
-import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.CallbackInterface.OTPSent;
-import dpi.ks19.participantapp.MainScreen;
+import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.Networking.ApiHelper;
 import dpi.ks19.participantapp.R;
 
@@ -110,14 +102,19 @@ public void onClickRegister(View  view){
     }
 
     @Override
-    public void otpSent(boolean isSuccess) {
+    public void otpSent(boolean isSuccess, boolean isRegistered) {
         progressDialog.cancel();
-        //only show otp dialog is otp is sent
+        //only show otp dialog if otp is sent
         if(isSuccess){
-            //create a OTP dialog to enter the otp
-            createOTPDialog();
+            if(!isRegistered){
+                //create a OTP dialog to enter the otp
+                createOTPDialog();
+            }else{
+                Toast.makeText(getActivity(),"Already Registered",Toast.LENGTH_LONG).show();
+            }
+
         }else{
-            Toast.makeText(getActivity(),"Please try again",Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(),"Please try again",Toast.LENGTH_LONG).show();
         }
     }
 
diff --git a/app/src/main/java/dpi/ks19/participantapp/Networking/ApiHelper.java b/app/src/main/java/dpi/ks19/participantapp/Networking/ApiHelper.java
@@ -28,8 +28,8 @@
 import dpi.ks19.participantapp.Adapter.ClusterAdapter;
 import dpi.ks19.participantapp.CallbackInterface.CollegeInterface;
 import dpi.ks19.participantapp.CallbackInterface.EventsByCluster;
-import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.CallbackInterface.OTPSent;
+import dpi.ks19.participantapp.CallbackInterface.OTPInterface;
 import dpi.ks19.participantapp.CallbackInterface.QrResponse;
 import dpi.ks19.participantapp.Model.EventClass;
 import dpi.ks19.participantapp.R;
@@ -72,14 +72,22 @@ public void generateOTP(String email, final OTPSent callback){
         JsonObjectRequest jsonRequest = new JsonObjectRequest(Request.Method.POST, URL, json, new Response.Listener<JSONObject>() {
             @Override
             public void onResponse(JSONObject response) {
-                callback.otpSent(true);
                 Log.d("GENERATE_JSON_RESPONSE", response.toString());
+                try{
+                    String msg = response.getString("msg");
+                    if(msg.equals("Already Registered")){
+                        callback.otpSent(true, true);
+                    }
+                }catch (Exception e){
+                    callback.otpSent(true, false);
+                }
+
             }
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
 
-                callback.otpSent(false);
+                callback.otpSent(false, false);
                 Log.d("GENERATE_JSON_ERROR",error.toString());
             }
         });
@@ -188,16 +196,21 @@ public void loginUser(String email, final OTPSent callback){
         JsonObjectRequest loginRequest = new JsonObjectRequest(Request.Method.POST, URL, params, new Response.Listener<JSONObject>() {
             @Override
             public void onResponse(JSONObject response) {
-
-                callback.otpSent(true);
+                try{
+                    String msg = response.getString("msg");
+                    if(msg.equals("No Email found")){
+                        callback.otpSent(true, false);
+                    }
+                }catch (Exception e){
+                    callback.otpSent(true, true);
+                }
                 Log.d("LOGIN_RESPONSE",response.toString());
-
             }
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
 
-                callback.otpSent(false);
+                callback.otpSent(false, false);
                 Log.d("LOGIN_ERROR",error.toString());
 
             }
diff --git a/app/src/main/res/drawable/logo_informals.png b/app/src/main/res/drawable/logo_informals.png
diff --git a/app/src/main/res/layout/frag_login.xml b/app/src/main/res/layout/frag_login.xml
@@ -2,6 +2,7 @@
 <android.support.constraint.ConstraintLayout
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <android.support.constraint.ConstraintLayout
@@ -106,34 +107,30 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
 
-                    android:layout_marginTop="32dp"
-                    android:layout_marginBottom="8dp"
                     android:layout_marginStart="@dimen/margin_36dp"
+                    android:layout_marginTop="32dp"
                     android:layout_marginEnd="@dimen/margin_36dp"
-                    android:src="@drawable/white_border"
                     android:background="@drawable/ripple_effect_white"
                     android:elevation="@dimen/cardview_compat_inset_shadow"
-
                     android:fontFamily="@font/sniglet_regular"
+
                     android:onClick="onClickLogin"
                     android:padding="8dp"
+                    android:src="@drawable/white_border"
                     android:text="@string/login"
-                    android:textStyle="bold"
-
                     android:textColor="@android:color/white"
+
                     android:textSize="20sp"
-                    app:layout_constraintBottom_toTopOf="@+id/guest"
+                    android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/input_txt_layout_login_email"
-                    app:layout_constraintVertical_bias="1.0" />
+                    app:layout_constraintTop_toBottomOf="@+id/input_txt_layout_login_email" />
 
                 <Button
                     android:id="@+id/guest"
                     android:layout_width="wrap_content"
                     android:layout_height="30dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
                     android:background="@drawable/ripple_effect_white"
                     android:elevation="@dimen/cardview_compat_inset_shadow"
                     android:fontFamily="@font/sniglet_regular"
@@ -142,10 +139,26 @@
                     android:text="Enter as guest"
                     android:textColor="@android:color/white"
                     android:textSize="16sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/btn_login" />
 
+                <TextView
+                    android:id="@+id/privacy_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:fontFamily="@font/sniglet_regular"
+                    android:onClick="privacyPolicyClicked"
+                    android:textColor="@color/white"
+                    android:text="@string/privacy_policy_text"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/guest" />
             </android.support.constraint.ConstraintLayout>
 
     </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -33,6 +33,8 @@
     <string name="hostel_accomodation">Hostel accomodation needed</string>
     <string name="tamil_sangam_display_text">சாஸ்த்ரா தமிழ்ச் சங்கம்</string>
     <string name="tamil_sangam_query_text">Tamil Lits</string>
+    <string name="privacy_policy_text">By Logging in you are accepting our privacy policy</string>
+
     <!--clusters-->
     <string-array name="cluster_list">
         <item>FlagShip Event</item>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package dpi.ks19.participantapp.CallbackInterface;`
`2`	`2`
`3`	`3`	`public interface OTPSent {`
`4`		`- void otpSent(boolean isSuccess);`
	`4`	`+ void otpSent(boolean isSuccess, boolean isRegistered);`
`5`	`5`	`}`