diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b1e5ed5..dd11af6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,10 +13,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
+
-
@@ -24,11 +23,20 @@
-
+
+
+
+
+
+
+
+ android:parentActivityName=".map_profile.maps.MapActivity" />
+
+
+ android:parentActivityName=".settings.SettingsActivity" />
+
+
+ android:parentActivityName=".map_profile.maps.MapActivity" />
+
+
-
+
+
+ android:parentActivityName=".map_profile.maps.MapActivity" />
+
+
+ android:parentActivityName=".map_profile.maps.MapActivity" />
+
+
diff --git a/app/src/main/java/com/evan/parknbark/bulletinboard/NewNoteDialog.java b/app/src/main/java/com/evan/parknbark/bulletinboard/NewNoteDialog.java
index 8e69733..dfae608 100644
--- a/app/src/main/java/com/evan/parknbark/bulletinboard/NewNoteDialog.java
+++ b/app/src/main/java/com/evan/parknbark/bulletinboard/NewNoteDialog.java
@@ -13,8 +13,6 @@
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
-import com.daimajia.androidanimations.library.Techniques;
-import com.daimajia.androidanimations.library.YoYo;
import com.evan.parknbark.R;
import com.evan.parknbark.validation.EditTextValidator;
import com.google.android.material.textfield.TextInputLayout;
@@ -23,7 +21,6 @@
import java.text.DateFormat;
import java.util.Calendar;
-import java.util.concurrent.atomic.AtomicBoolean;
import es.dmoral.toasty.Toasty;
@@ -33,10 +30,9 @@ public class NewNoteDialog extends DialogFragment {
private TextInputLayout textInputTitle;
private TextInputLayout textInputDescription;
- public static NewNoteDialog display(FragmentManager fragmentManager) {
+ static void display(FragmentManager fragmentManager) {
NewNoteDialog exampleDialog = new NewNoteDialog();
exampleDialog.show(fragmentManager, TAG);
- return exampleDialog;
}
@Override
@@ -54,7 +50,7 @@ public void onStart() {
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View v = inflater.inflate(R.layout.new_note_dialog, container, false);
+ View v = inflater.inflate(R.layout.dialog_new_note, container, false);
toolbar = v.findViewById(R.id.toolbar);
textInputDescription = v.findViewById(R.id.text_input_description);
textInputTitle = v.findViewById(R.id.text_input_title);
diff --git a/app/src/main/java/com/evan/parknbark/bulletinboard/NoteDescriptionDialog.java b/app/src/main/java/com/evan/parknbark/bulletinboard/NoteDescriptionDialog.java
index 2db52e4..75813da 100644
--- a/app/src/main/java/com/evan/parknbark/bulletinboard/NoteDescriptionDialog.java
+++ b/app/src/main/java/com/evan/parknbark/bulletinboard/NoteDescriptionDialog.java
@@ -21,7 +21,7 @@ public class NoteDescriptionDialog extends DialogFragment {
private static final String TAG = "NoteDescriptionDialog";
private Toolbar toolbar;
- public static NoteDescriptionDialog display(FragmentManager fragmentManager) {
+ static NoteDescriptionDialog display(FragmentManager fragmentManager) {
NoteDescriptionDialog noteDescriptionDialog = new NoteDescriptionDialog();
noteDescriptionDialog.show(fragmentManager, TAG);
@@ -43,7 +43,7 @@ public void onStart() {
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View v = inflater.inflate(R.layout.note_description_dialog, container, false);
+ View v = inflater.inflate(R.layout.dialog_note_description, container, false);
toolbar = v.findViewById(R.id.toolbar);
textViewDate = v.findViewById(R.id.text_view_date_des);
textViewDescription = v.findViewById(R.id.text_view_description_des);
diff --git a/app/src/main/java/com/evan/parknbark/maps/usersFragment.java b/app/src/main/java/com/evan/parknbark/maps/usersFragment.java
deleted file mode 100644
index fa12a8b..0000000
--- a/app/src/main/java/com/evan/parknbark/maps/usersFragment.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.evan.parknbark.maps;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.evan.parknbark.R;
-
-/**
- * A simple {@link Fragment} subclass.
- */
-
-public class usersFragment extends Fragment {
-
- TextView usersTextView;
-
- public usersFragment() {
- // Required empty public constructor
- }
-
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- View v = inflater.inflate(R.layout.fragment_users, container, false);
- usersTextView = v.findViewById(R.id.users_Text_view);
- Bundle bundle = getArguments();
- String data = bundle.getString("users");
- usersTextView.setText(data);
- return v;
- }
-}
diff --git a/app/src/main/java/com/evan/parknbark/utilities/MainActivity.java b/app/src/main/java/com/evan/parknbark/utilities/MainActivity.java
index 9c883c6..46ba42d 100644
--- a/app/src/main/java/com/evan/parknbark/utilities/MainActivity.java
+++ b/app/src/main/java/com/evan/parknbark/utilities/MainActivity.java
@@ -2,54 +2,39 @@
import android.content.Intent;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
-import androidx.annotation.NonNull;
-
import com.evan.parknbark.R;
import com.evan.parknbark.emailpassword.*;
import com.evan.parknbark.google.GoogleAuthActivity;
import com.evan.parknbark.map_profile.maps.MapActivity;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.firestore.DocumentReference;
-import com.google.firebase.firestore.DocumentSnapshot;
+
+import javax.annotation.Nullable;
public class MainActivity extends BaseActivity implements View.OnClickListener {
GoogleAuthActivity gaa;
+ @Nullable private String currentUserPermission;
@Override
public void onCreate(Bundle savedInstanceState) {
loadLocale(this);
setContentView(R.layout.activity_main);
super.onCreate(savedInstanceState);
- FirebaseUser currentUser = mAuth.getCurrentUser();
- updateUI(currentUser);
findViewById(R.id.button_sign_in_main).setOnClickListener(this);
findViewById(R.id.button_sign_up_main).setOnClickListener(this);
- //findViewById(R.id.button_google_sign_in).setOnClickListener(this);
- gaa = new GoogleAuthActivity();
+ Bundle bundle = getIntent().getExtras();
+ currentUserPermission = bundle.getString("current_user_permission", null);
+
+ updateUI(mAuth.getCurrentUser());
}
private void updateUI(FirebaseUser firebaseUser) {
- if (firebaseUser != null) {
- DocumentReference docRef = db.collection("users").document(mAuth.getCurrentUser().getUid());
- docRef.get().addOnCompleteListener(this, new OnCompleteListener() {
- @Override
- public void onComplete(@NonNull Task task) {
- if (task.isSuccessful()) {
- User user = task.getResult().toObject(User.class);
- startActivity(new Intent(MainActivity.this, MapActivity.class)
- .putExtra("current_user_permission", user.getPermission()));
- }
- }
- });
-
- }
+ if (firebaseUser != null && currentUserPermission != null)
+ startActivity(new Intent(MainActivity.this, MapActivity.class)
+ .putExtra("current_user_permission", currentUserPermission));
}
@Override
@@ -62,12 +47,6 @@ public void onClick(View v) {
case R.id.button_sign_up_main:
startActivity(new Intent(this, RegisterActivity.class));
break;
-// case R.id.button_google_sign_in:
-// GoogleSignInAccount googleAccount = gaa.signInWithGoogle();
-// if (googleAccount != null)
-// updateUI(mAuth.getCurrentUser());
-// break;
-
}
}
@@ -75,4 +54,12 @@ public void onClick(View v) {
public void onBackPressed() {
finish();
}
+
+ /*@Override
+ public void taskResults(User user) {
+ if (user != null) {
+ this.user = user;
+ updateUI(mAuth.getCurrentUser());
+ }
+ }*/
}
\ No newline at end of file
diff --git a/app/src/main/java/com/evan/parknbark/utilities/SplashScreenActivity.java b/app/src/main/java/com/evan/parknbark/utilities/SplashScreenActivity.java
new file mode 100644
index 0000000..e8274e6
--- /dev/null
+++ b/app/src/main/java/com/evan/parknbark/utilities/SplashScreenActivity.java
@@ -0,0 +1,67 @@
+package com.evan.parknbark.utilities;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.evan.parknbark.R;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.FirebaseFirestore;
+
+import gr.net.maroulis.library.EasySplashScreen;
+
+public class SplashScreenActivity extends BaseActivity {
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ //Create a bundle to pass to the next activity
+ Bundle bundle = new Bundle();
+
+ db = FirebaseFirestore.getInstance();
+ mAuth = FirebaseAuth.getInstance();
+ FirebaseUser firebaseUser = mAuth.getCurrentUser();
+ if (firebaseUser != null) {
+ DocumentReference docRef = db.collection("users").document(firebaseUser.getUid());
+ docRef.get().addOnCompleteListener(new OnCompleteListener() {
+ @Override
+ public void onComplete(@NonNull Task task) {
+ if (task.isSuccessful()) {
+ User user = task.getResult().toObject(User.class);
+ //if user is logged in, put the permission into bundle
+ //else, do nothing
+ bundle.putString("current_user_permission", user.getPermission());
+ }
+ }
+ });
+ }
+
+
+ EasySplashScreen config = new EasySplashScreen(this)
+ .withFullScreen()
+ .withTargetActivity(MainActivity.class) //go to main activity
+ .withBundleExtras(bundle) //send bundle, either user logged in or nah
+ .withBackgroundColor(Color.parseColor("#e1f5fe"))
+ .withHeaderText("Welcome to")
+ .withLogo(R.mipmap.app_logo1_foreground); //TODO: adjust logo dimensions
+
+ View easySplashScreen = config.create();
+ setContentView(easySplashScreen);
+ }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 329e2be..66e82f0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,9 +5,6 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
- android:paddingStart="30dp"
- android:paddingTop="30dp"
- android:paddingEnd="30dp"
android:background="@color/colorAppBackground"
tools:context="com.evan.parknbark.utilities.MainActivity">
diff --git a/app/src/main/res/layout/new_note_dialog.xml b/app/src/main/res/layout/dialog_new_note.xml
similarity index 100%
rename from app/src/main/res/layout/new_note_dialog.xml
rename to app/src/main/res/layout/dialog_new_note.xml
diff --git a/app/src/main/res/layout/note_description_dialog.xml b/app/src/main/res/layout/dialog_note_description.xml
similarity index 100%
rename from app/src/main/res/layout/note_description_dialog.xml
rename to app/src/main/res/layout/dialog_note_description.xml
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 03a376b..549eb84 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -33,8 +33,7 @@
android:checkableBehavior="none">