Skip to content

Commit

Permalink
Bugs fixed, code to 7
Browse files Browse the repository at this point in the history
  • Loading branch information
@getoxdev
getoxdev committed Feb 15, 2021
1 parent 4c93525 commit e568c89
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 30 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
manifestPlaceholders = [bootPriority:"999"]
minSdkVersion 21
targetSdkVersion 29
versionCode 6
versionCode 7
versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
44 changes: 24 additions & 20 deletions app/src/main/java/com/attendo/ui/auth/login/FragmentLogin.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.attendo.ui.auth.login;

import android.app.Activity;
import android.content.ContentProvider;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProvider;

Expand All @@ -26,6 +29,7 @@

import com.attendo.Schedule.Preference.AppPreferences;
import com.attendo.ui.CustomLoadingDialog;
import com.attendo.ui.auth.AuthenticationActivity;
import com.attendo.ui.auth.FragmentForgetPassword;
import com.attendo.R;
import com.attendo.ui.auth.signup.FragmentSignup;
Expand Down Expand Up @@ -89,7 +93,7 @@ public class FragmentLogin extends Fragment implements logininterface.View {
private FirebaseAuth mAuth;
private DatabaseReference databaseReference;
private FragmentProfile fragmentProfile;

FragmentActivity mActivity;
private static final String EMAIL = "email";


Expand All @@ -108,10 +112,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
fragmentSignup = new FragmentSignup();
fragmentForgetpassword = new FragmentForgetPassword();
fragmentProfile = new FragmentProfile();
databaseReference = FirebaseDatabase.getInstance().getReference("Schedule_Member");
firebaseScheduleViewModel = new ViewModelProvider(this).get(FirebaseScheduleViewModel.class);
appPreferences = AppPreferences.getInstance(getContext());

databaseReference = FirebaseDatabase.getInstance().getReference("Schedule");

/*//stay logged in code
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
Expand Down Expand Up @@ -185,6 +188,14 @@ public void onClick(View view) {
return view;
}

@Override
public void onAttach(Context context) {
super.onAttach(context);

if (context instanceof FragmentActivity){
mActivity = (FragmentActivity) context;
}
}

public void setInputs(boolean enable){
email.setEnabled(enable);
Expand Down Expand Up @@ -230,8 +241,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}

private void firebaseAuthWithGoogle(String idToken) {
//TODO: Add the loadin animation dialog here
private void firebaseAuthWithGoogle(String idToken)
{
CustomLoadingDialog loadingDialog = new CustomLoadingDialog(getActivity());
loadingDialog.startDialog(false);
AuthCredential credential = GoogleAuthProvider.getCredential(idToken, null);
Expand Down Expand Up @@ -262,10 +273,10 @@ public void onComplete(@NonNull Task<AuthResult> task) {
});
}

private void setNextFragment(Fragment fragment) {
private void setNextFragment(Fragment fragment)
{
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.start_frame, fragment);
fragmentTransaction.addToBackStack(null);
fragmentTransaction.commit();
}

Expand Down Expand Up @@ -299,12 +310,12 @@ public void enableInput() {
public void handleLogin() {
if(!isValidEmail()){
progress.setVisibility(View.INVISIBLE);
Toast.makeText(getActivity(),"please enter a valid email",Toast.LENGTH_SHORT).show();
Toast.makeText(mActivity,"please enter a valid email",Toast.LENGTH_SHORT).show();
email.setError("InValid email");
}
else if(!isValidPassword()){
progress.setVisibility(View.INVISIBLE);
Toast.makeText(getActivity(),"please enter a valid password",Toast.LENGTH_SHORT).show();
Toast.makeText(mActivity,"please enter a valid password",Toast.LENGTH_SHORT).show();
}
else {
presenter.toLogin(email.getText().toString().trim(),password.getText().toString().trim());
Expand Down Expand Up @@ -339,7 +350,6 @@ public void onLogin() {

private void RetrieveFcm() {
mAuth = FirebaseAuth.getInstance();
databaseReference = FirebaseDatabase.getInstance().getReference("Schedule");
databaseReference.orderByKey().equalTo(mAuth.getCurrentUser().getUid()).addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot snapshot) {
Expand All @@ -356,10 +366,8 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
public void onCancelled(@NonNull DatabaseError error) {
}
});

}


@Override
public void onError(String message) {
progress.setVisibility(View.INVISIBLE);
Expand All @@ -368,26 +376,22 @@ public void onError(String message) {
private void setFragment(Fragment fragment) {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.start_frame,fragment);
fragmentTransaction.addToBackStack(null).commit();
fragmentTransaction.commit();
}

private void checkUser(){

if(mAuth.getCurrentUser() != null) {
final String id = mAuth.getCurrentUser().getUid();
DatabaseReference mData = FirebaseDatabase.getInstance().getReference("data");

mData.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot snapshot) {
if (snapshot.hasChild(mAuth.getCurrentUser().getUid())) {
Intent newIntent = new Intent(getActivity(), BottomNavMainActivity.class);
startActivity(newIntent);
getActivity().finish();
Intent newIntent = new Intent(mActivity, BottomNavMainActivity.class);
mActivity.startActivity(newIntent);
mActivity.finish();
} else {
String userId = mAuth.getCurrentUser().getUid();
databaseReference.child(userId).child("Schedule_Code").setValue("");
databaseReference.child(userId).child("Schedule_Join_As").setValue("");
setNextFragment(fragmentProfile);
setDataGoogleSignIn(fragmentProfile);
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/attendo/ui/main/drawers/account/FragmentProfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ public void onClick(View v) {
@Override
public void onSuccess(Void aVoid) {
databaseReference.child("images/" + user_id.toString()).removeValue();
Toast.makeText(getContext(), "Account Updated " + name.getText().toString(), Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), "Account Updated " + name.getText().toString(), Toast.LENGTH_SHORT).show();
Intent intent = new Intent(getActivity(), BottomNavMainActivity.class);
startActivity(intent);
getActivity().finish();
}
}).addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
Toast.makeText(getContext(), "Account Updated", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), "Account Updated", Toast.LENGTH_SHORT).show();
Log.d("Execption got", e.toString());
Intent intent = new Intent(getActivity(), BottomNavMainActivity.class);
startActivity(intent);
Expand All @@ -176,7 +176,7 @@ private void UploadImage() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
pB.setVisibility(View.INVISIBLE);
Toast.makeText(getContext(),"Account Updated "+name.getText().toString(),Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(),"Account Updated "+name.getText().toString(),Toast.LENGTH_SHORT).show();
Intent intent=new Intent(getActivity(), BottomNavMainActivity.class);
startActivity(intent);
getActivity().finish();
Expand Down
18 changes: 12 additions & 6 deletions app/src/main/java/com/attendo/ui/splash/SplashFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,

Animation animation = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.bounce);


//hooks
appIcon = (ImageView) view.findViewById(R.id.splash_screen_app_icon);

Expand All @@ -57,7 +56,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
//stay logged in code
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();


new Handler().postDelayed(new Runnable() {
@Override
public void run() {
Expand All @@ -79,9 +77,17 @@ public void run() {
return view;
}

private void setFragment(Fragment fragment) {
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.start_frame,fragment);
fragmentTransaction.commit();
private void setFragment(Fragment fragment)
{
try
{
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.start_frame,fragment);
fragmentTransaction.commit();
}
catch (Exception e)
{
Log.e("Exception",e.getMessage());
}
}
}

0 comments on commit e568c89

Please sign in to comment.