Commit Complete #8

AntonisAndHisMetalheadFriends · Nov 5, 2018 · 4747c9e · 4747c9e
1 parent be0eabe
commit 4747c9e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,10 @@ dependencies {
     implementation 'com.google.firebase:firebase-auth:16.0.5'
     implementation 'com.google.firebase:firebase-database:16.0.4'
     implementation 'com.google.firebase:firebase-core:16.0.4'
-    implementation 'com.facebook.android:facebook-android-sdk:4.38.1'
+    implementation 'com.facebook.android:facebook-android-sdk:4.5.0'
     implementation 'com.firebase:firebase-client-android:2.5.2'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
 
 
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
             android:configChanges=
                 "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name" />
+        <activity android:name=".MainMenuActivity"></activity>
         <activity android:name=".RegisterActivity"></activity>
     </application>
 

diff --git a/app/src/main/java/aahmf/notepad/LogInActivity.java b/app/src/main/java/aahmf/notepad/LogInActivity.java
@@ -13,7 +13,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.facebook.AccessToken;
+import com.facebook.*;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
@@ -160,12 +160,40 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 if(!task.isSuccessful()){
                     Toast.makeText(getApplicationContext(),R.string.firebase_error_login, Toast.LENGTH_LONG).show();
                 }
+
+                else
+                {
+                    startActivity(new Intent(LogInActivity.this,MainMenuActivity.class));
+                }
             }
         });
     }
 
     private void signIn(String email, String password)
     {
+        if(Name.getText().toString().isEmpty())
+        {
+            Name.setError("Give An Email");
+            Name.requestFocus();
+            Name.setText("");
+            return;
+        }
+
+        if(Password.getText().toString().isEmpty())
+        {
+            Password.setError("Give A Password");
+            Password.requestFocus();
+            Password.setText("");
+            return;
+        }
+
+        if(Password.getText().toString().length()<6)
+        {
+            Password.setError("The password must be 6 Characters long");
+            Password.requestFocus();
+            Password.setText("");
+            return;
+        }
 
         progressBarLogin.setVisibility(View.VISIBLE);
         mAuth.signInWithEmailAndPassword(email, password)
@@ -181,7 +209,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                                 progressBarLogin.setVisibility(View.INVISIBLE);
 
                                 Toast.makeText(LogInActivity.this, "Login Successfull", Toast.LENGTH_LONG).show();
-                                startActivity(new Intent(LogInActivity.this, RegisterActivity.class));
+                                startActivity(new Intent(LogInActivity.this, MainMenuActivity.class));
 
 
                             } else
@@ -210,6 +238,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data)
     protected void onStart()
     {
         super.onStart();
+
         mAuth.addAuthStateListener(firebaseAuthListner);
     }
 

diff --git a/app/src/main/res/layout/main_menu_layout.xml b/app/src/main/res/layout/main_menu_layout.xml
@@ -24,15 +24,15 @@
 
 
             <TextView
-                android:id="@+id/textViewTitle"
-                android:textSize="20dp"
+                android:id="@+id/textView"
                 android:layout_width="166dp"
                 android:layout_height="63dp"
                 android:layout_marginLeft="5dp"
                 android:layout_toRightOf="@id/imageView"
                 android:text="Note Title"
+                android:textColor="#000000"
 
-                android:textColor="#000000" />
+                android:textSize="20dp" />
 
             <Button
                 android:id="@+id/EditButton"

diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'