#10 issue halloldu

app/src/main/java/com/inonusosyal/FeedActivity.java

@@ -32,8 +32,6 @@ import com.inonusosyal.models.InonuUser;
 
 public class FeedActivity extends AppCompatActivity {
 
-    public static String q;
-    InonuUser  user;
     private AppBarConfiguration mAppBarConfiguration;
     private FirebaseAuth firebaseAuth;
     private FirebaseFirestore db;

app/src/main/java/com/inonusosyal/UyeOlActivity.java

 package com.inonusosyal;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.text.InputFilter;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.inonusosyal.filters.ValidateFilter;
 import com.inonusosyal.managers.SPManager;
 import com.inonusosyal.models.InonuUser;
 
 public class UyeOlActivity extends AppCompatActivity {
 
-    private FirebaseFirestore db;
-    private FirebaseAuth mAuth;
-    private FirebaseUser currentUser;
     private static final String TAG = "DocSnippets";
     SharedPreferences sharedPreferences;
-
-    private ProgressBar spinner;
-
     EditText isim_txt;
     EditText soy_isim_txt;
     EditText email_txt;
     EditText parola_txt;
     EditText parola_tekrar_txt;
-    String isim;
-    String soyisim;
-    String email;
-    String parola;
     Toast toast;
     Button uye_ol_btn;
+    private FirebaseFirestore db;
+    private FirebaseAuth mAuth;
+    private FirebaseUser currentUser;
+    private ProgressBar spinner;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -63,33 +60,29 @@ public class UyeOlActivity extends AppCompatActivity {
 
     }
 
-    public void uyeOl(View view){
+    public void uyeOl(View view) {
         spinner.setVisibility(View.VISIBLE);
         uye_ol_btn.setEnabled(false);
 
+        ValidateFilter vf = new ValidateFilter(getApplicationContext());
 
-        if (isim_kontrol(isim_txt.getText().toString(),soy_isim_txt.getText().toString())
-                && email_kontrol(email_txt.getText().toString())
-                && parola_kontrol(parola_txt.getText().toString(),parola_tekrar_txt.getText().toString())){
+        if (vf.validate(isim_txt)&&vf.validate(soy_isim_txt)
+                 && vf.validateEmail(email_txt) &&
+                (parola_tekrar_txt.getFilters() != null && parola_kontrol(parola_txt.getText().toString(), parola_tekrar_txt.getText().toString()))) {
 
-             isim = isim_txt.getText().toString();
-             soyisim = soy_isim_txt.getText().toString();
-             email = email_txt.getText().toString();
-             parola = parola_txt.getText().toString();
-
-            mAuth.createUserWithEmailAndPassword(email,parola).addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+            mAuth.createUserWithEmailAndPassword(email_txt.getText().toString(), parola_txt.getText().toString()).addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                 @Override
                 public void onSuccess(AuthResult authResult) {
                     uye_ol_btn.setEnabled(true);
                     currentUser = mAuth.getCurrentUser();
-                    InonuUser  user = new InonuUser ();
-                    user.setIsim(isim);
-                    user.setSoyisim(soyisim);
-                    user.setEmail(email);
-                    user.setParola(parola);
+                    InonuUser user = new InonuUser();
+                    user.setIsim(isim_txt.getText().toString());
+                    user.setSoyisim(soy_isim_txt.getText().toString());
+                    user.setEmail(email_txt.getText().toString());
+                    user.setParola(parola_txt.getText().toString());
                     db.collection("users").document(currentUser.getUid()).set(user);
                     SPManager.setUser(user);
-                    toast = Toast.makeText(getApplicationContext(),"Hoşgeldiniz!",Toast.LENGTH_LONG);
+                    toast = Toast.makeText(getApplicationContext(), "Hoşgeldiniz!", Toast.LENGTH_LONG);
                     toast.show();
                     updateUI();
 
@@ -99,80 +92,37 @@ public class UyeOlActivity extends AppCompatActivity {
                 public void onFailure(@NonNull Exception e) {
                     uye_ol_btn.setEnabled(true);
                     spinner.setVisibility(View.INVISIBLE);
-                    toast = Toast.makeText(getApplicationContext(),e.getLocalizedMessage().toString(),Toast.LENGTH_LONG);
+                    toast = Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_LONG);
                     toast.show();
                 }
             });
-
-
+            
         }
-
+        uye_ol_btn.setEnabled(true);
+        spinner.setVisibility(View.INVISIBLE);
 
     }
 
-    void updateUI(){
-        Intent intent = new Intent(getApplicationContext(),FeedActivity.class);
+    void updateUI() {
+        Intent intent = new Intent(getApplicationContext(), FeedActivity.class);
         startActivity(intent);
     }
 
-    boolean isim_kontrol(String tmp,String tmp2){
-        if(tmp.matches("")){
-            toast = Toast.makeText(getApplicationContext(),"İsim alanı boş bırakılamaz!",Toast.LENGTH_LONG);
-            toast.show();
-            return false;
-        }else if (tmp.length() == 1){
-            toast = Toast.makeText(getApplicationContext(),"Girilen isim çok kısa!",Toast.LENGTH_LONG);
-            toast.show();
-        }
-        for(int i=0; i < tmp.length() ;i++){
-            if(!Character.isAlphabetic(tmp.charAt(i))){
-                toast = Toast.makeText(getApplicationContext(),"İsim alanı rakam içeremez!",Toast.LENGTH_LONG);
-                toast.show();
-                return false;
-            }
-        }
 
-        if(tmp2.matches("")){
-            toast = Toast.makeText(getApplicationContext(),"Soyisim alanı boş bırakılamaz!",Toast.LENGTH_LONG);
+    boolean parola_kontrol(String tmp1, String tmp2) {
+        if (tmp1.length() < 6 || tmp1.length() > 18) {
+            toast = Toast.makeText(getApplicationContext(), "Parola 6-18 karakter arasında olmalıdır!", Toast.LENGTH_LONG);
             toast.show();
             return false;
-        }else if (tmp2.length() == 1){
-            toast = Toast.makeText(getApplicationContext(),"Girilen soyisim çok kısa!",Toast.LENGTH_LONG);
-            toast.show();
-        }
-        for(int i=0; i < tmp2.length() ;i++){
-            if(!Character.isAlphabetic(tmp2.charAt(i))&& tmp2.charAt(i)!= 32){
-                toast = Toast.makeText(getApplicationContext(),"Soyisim alanı rakam içeremez!",Toast.LENGTH_LONG);
-                toast.show();
-                return false;
-            }
         }
-        return true;
-    }
-
-    boolean parola_kontrol(String tmp1,String tmp2){
-        if (tmp1.length() < 6 || tmp1.length() > 18){
-            toast = Toast.makeText(getApplicationContext(),"Parola 6-18 karakter arasında olmalıdır!",Toast.LENGTH_LONG);
-            toast.show();
-            return false;
-        }
-        if (tmp1.matches(tmp2)){
+        if (tmp1.matches(tmp2)) {
             return true;
-        }else{
-            toast = Toast.makeText(getApplicationContext(),"Girilen parolalar eşleşmiyor!",Toast.LENGTH_LONG);
+        } else {
+            toast = Toast.makeText(getApplicationContext(), "Girilen parolalar eşleşmiyor!", Toast.LENGTH_LONG);
             toast.show();
             return false;
         }
     }
 
-    boolean email_kontrol(String email) {
-        String ePattern = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$";
-        java.util.regex.Pattern p = java.util.regex.Pattern.compile(ePattern);
-        java.util.regex.Matcher m = p.matcher(email);
-        if (!m.matches()){
-            toast = Toast.makeText(getApplicationContext(),"Lütfen geçerli bir email giriniz!",Toast.LENGTH_LONG);
-            toast.show();
-        }
-        return true;
-    }
+
 }

app/src/main/java/com/inonusosyal/filters/ValidateFilter.java

+package com.inonusosyal.filters;
+
+import android.content.Context;
+import android.widget.EditText;
+import android.widget.Toast;
+
+public class ValidateFilter {
+    Context context;
+
+    public ValidateFilter(Context context) {
+        this.context = context;
+    }
+
+    public boolean validate(EditText editText) {
+        if (editText.getText().toString().isEmpty()) {
+            Toast.makeText(context, "Lütfen " + editText.getHint().toString().toLowerCase() + " giriniz", Toast.LENGTH_LONG).show();
+            return false;
+        }
+        return true;
+    }
+
+    public boolean validateEmail(EditText editText) {
+        String ePattern = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$";
+        java.util.regex.Pattern p = java.util.regex.Pattern.compile(ePattern);
+        java.util.regex.Matcher m = p.matcher(editText.getText().toString());
+        if (!m.matches()) {
+            Toast.makeText(context, "Lütfen geçerli bir email giriniz", Toast.LENGTH_LONG).show();
+        }
+        return true;
+    }
+}
\ No newline at end of file