Added checkstyle

app/build.gradle

@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'checkstyle'
 
 android {
     compileSdkVersion 29
@@ -42,17 +44,40 @@ tasks.withType(Test) {
     }
 }
 
+task checkstyle(type: Checkstyle) {
+    configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
+
+    source 'src/main/java'
+    include '**/*.java'
+    exclude '**/gen/**'
+
+    ignoreFailures true
+    showViolations true
+
+    classpath = files()
+}
+
+
+checkstyle {
+    toolVersion "8.17"
+}
+
+project.afterEvaluate {
+    preBuild.dependsOn 'checkstyle'
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     //firebase
-    implementation 'com.google.firebase:firebase-analytics:17.4.1'
+    implementation 'com.google.firebase:firebase-analytics:17.4.2'
     implementation 'com.google.firebase:firebase-auth:19.3.1'
     implementation 'com.google.firebase:firebase-firestore:21.4.3'
     implementation 'com.google.firebase:firebase-database:19.3.0'
     implementation 'com.google.firebase:firebase-storage:19.1.1'
     implementation 'com.firebaseui:firebase-ui-firestore:6.2.1'
 
+
     //animation / view design
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

app/src/main/java/com/evan/parknbark/settings/SettingsActivity.java

@@ -9,44 +9,69 @@
 
 import com.evan.parknbark.R;
 import com.evan.parknbark.RateUsActivity;
+import com.evan.parknbark.contacts.EditContactActivity;
 import com.evan.parknbark.emailpassword.ChangePassActivity;
 import com.evan.parknbark.utilities.BaseActivity;
 import com.evan.parknbark.utilities.User;
 
 public class SettingsActivity extends BaseActivity implements AdapterView.OnItemClickListener {
 
-    private String[] settingsArray = {"Change password","Light/Dark Mode","Rate Us"}; //Settings menu items
-    private String[] admin = {"Edit"};
+    private String[] settingsArray = {"Change password", "Rate Us"}; //Settings menu items
+    private String[] adminSettingsArray = {"Change password", "Edit contact", "Show all users"};
+    private String currentUserPermission;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
 
-        ArrayAdapter adapter = new ArrayAdapter<String>(this,
-                R.layout.setting_list, settingsArray);
+        currentUserPermission = getIntent().getStringExtra("current_user_permission");
+        ArrayAdapter adapter;
+        if (currentUserPermission.equals("admin"))
+            adapter = new ArrayAdapter<>(this,
+                    R.layout.setting_list, adminSettingsArray);
+        else
+            adapter = new ArrayAdapter<>(this,
+                    R.layout.setting_list, settingsArray);
 
-        ListView listView = (ListView) findViewById(R.id.setting_listview); //Interactive list view
+        ListView listView = findViewById(R.id.setting_listview); //Interactive list view
         listView.setAdapter(adapter);
         listView.setOnItemClickListener(this);
-
-        //current user details (first name... permission)
-        String currentUserPermission = getIntent().getStringExtra("current_user_permission");
     }
 
     //On click implementation for items in the menu
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        switch (position) {
-            case 0: {
-                //Change password
-                startActivity(new Intent(SettingsActivity.this, ChangePassActivity.class));
-                break;
+
+        //if user is an admin give admin settings
+        if (currentUserPermission.equals("admin")) {
+            switch (position) {
+                case 0:
+                    //Change password
+                    startActivity(new Intent(getApplicationContext(), ChangePassActivity.class));
+                    break;
+
+                case 2:
+                    //Rate Us!
+                    startActivity(new Intent(getApplicationContext(), EditContactActivity.class));
+                    break;
+
+                case 3:
+                    //show all users in fullscreen dialog
             }
-            case 2: {
-                //Rate Us!
-                startActivity(new Intent(SettingsActivity.this, RateUsActivity.class));
-                break;
+        }
+        else{
+            switch (position) {
+                case 0: {
+                    //Change password
+                    startActivity(new Intent(SettingsActivity.this, ChangePassActivity.class));
+                    break;
+                }
+                case 2: {
+                    //Rate Us!
+                    startActivity(new Intent(SettingsActivity.this, RateUsActivity.class));
+                    break;
+                }
             }
         }
 

app/src/main/java/com/evan/parknbark/utilities/BaseNavDrawerActivity.java

@@ -186,12 +186,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             case R.id.nav_map:
                 startActivity(new Intent(getApplicationContext(), MapActivity.class));
                 break;
-            case R.id.nav_edit_contact:
-                if (currentUserPermission.equals("admin"))
-                    startActivity(new Intent(getApplicationContext(), EditContactActivity.class));
-                else
-                    Toast.makeText(getApplicationContext(), WRONG_PERMISSION, Toast.LENGTH_SHORT).show();
-                break;
         }
         drawer.closeDrawer(GravityCompat.START);
         return true;

app/src/main/java/com/evan/parknbark/utilities/MainActivity.java

@@ -54,12 +54,4 @@ public void onClick(View v) {
     public void onBackPressed() {
         finish();
     }
-
-    /*@Override
-    public void taskResults(User user) {
-        if (user != null) {
-            this.user = user;
-            updateUI(mAuth.getCurrentUser());
-        }
-    }*/
 }

app/src/main/res/menu/drawer_menu.xml

@@ -50,11 +50,6 @@
             android:icon="@drawable/ic_share"
             android:title="@string/share" />
 
-        <item
-            android:id="@+id/nav_bug_report"
-            android:icon="@drawable/ic_bug_report"
-            android:title="@string/bug_report" />
-
         <item
             android:id="@+id/nav_credit"
             android:icon="@drawable/baseline_live_help_24"
@@ -70,11 +65,6 @@
             android:icon="@drawable/baseline_perm_phone_msg_24"
             android:title="@string/contact" />
 
-        <item
-            android:id="@+id/nav_edit_contact"
-            android:title="Edit Contacts"
-            android:icon="@drawable/ic_editcontact"/>
-
     </group>
 
     <!-- Settings -->

app/src/test/java/com/evan/parknbark/LoginTest.java

@@ -1,28 +1,29 @@
 package com.evan.parknbark;
 
-import androidx.annotation.NonNull;
-
 import com.evan.parknbark.emailpassword.LoginActivity;
-import com.evan.parknbark.validation.EditTextValidator;
+import com.google.firebase.auth.FirebaseAuthException;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import java.io.IOException;
+
+import static junit.framework.TestCase.assertTrue;
 
 public class LoginTest {
     private String email;
     private String password;
 
     @Before
-    public void setUp() throws Exception {
-        email = "ltest@ltest.test";
+    public void setUp() throws IOException {
+        email = "user@eeexxxaaammmpppllleee.com";
         password = "LoGiNtEsTiNg";
     }
 
     @Test
-    public void loginTest() {
+    public void loginTest() throws FirebaseAuthException {
         LoginActivity activity = new LoginActivity();
         assertTrue("Error test failed!", activity.signIn(email, password, true));
+
     }
 }

app/src/test/java/com/evan/parknbark/NewNoteTest.java

@@ -13,8 +13,8 @@ public class NewNoteTest {
 
     @Before
     public void setUp() throws Exception {
-        title = "Some shitty old pass";
-        description = "New password :)";
+        title = "test title";
+        description = "descriptionnnnnn :)";
     }
 
     @Test