From ebce073a5acb2c2a85eb6cbdd5d6df7c0aacac3f Mon Sep 17 00:00:00 2001
From: Aviel Cohen <38301471+AvielCo@users.noreply.github.com>
Date: Tue, 26 May 2020 15:02:28 +0300
Subject: [PATCH] Added checkstyle

---
 app/build.gradle                              |  27 ++-
 .../parknbark/settings/SettingsActivity.java  |  59 +++--
 .../utilities/BaseNavDrawerActivity.java      |   6 -
 .../parknbark/utilities/MainActivity.java     |   8 -
 app/src/main/res/menu/drawer_menu.xml         |  10 -
 .../java/com/evan/parknbark/LoginTest.java    |  15 +-
 .../java/com/evan/parknbark/NewNoteTest.java  |   4 +-
 config/checkstyle/checkstyle.xml              | 217 ++++++++++++++++++
 8 files changed, 295 insertions(+), 51 deletions(-)
 create mode 100644 config/checkstyle/checkstyle.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8d318c3..99ac193 100644
--- a/app/build.gradle
+++ b/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'
diff --git a/app/src/main/java/com/evan/parknbark/settings/SettingsActivity.java b/app/src/main/java/com/evan/parknbark/settings/SettingsActivity.java
index 155b160..1ae18fd 100644
--- a/app/src/main/java/com/evan/parknbark/settings/SettingsActivity.java
+++ b/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;
+                }
             }
         }
 
diff --git a/app/src/main/java/com/evan/parknbark/utilities/BaseNavDrawerActivity.java b/app/src/main/java/com/evan/parknbark/utilities/BaseNavDrawerActivity.java
index 702eafb..9b3c8fe 100644
--- a/app/src/main/java/com/evan/parknbark/utilities/BaseNavDrawerActivity.java
+++ b/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;
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 46ba42d..c382d32 100644
--- a/app/src/main/java/com/evan/parknbark/utilities/MainActivity.java
+++ b/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());
-        }
-    }*/
 }
\ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 549eb84..15c28c5 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/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 -->
diff --git a/app/src/test/java/com/evan/parknbark/LoginTest.java b/app/src/test/java/com/evan/parknbark/LoginTest.java
index 16eeca6..5e061b4 100644
--- a/app/src/test/java/com/evan/parknbark/LoginTest.java
+++ b/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));
+
     }
 }
diff --git a/app/src/test/java/com/evan/parknbark/NewNoteTest.java b/app/src/test/java/com/evan/parknbark/NewNoteTest.java
index 41644e8..431f5f0 100644
--- a/app/src/test/java/com/evan/parknbark/NewNoteTest.java
+++ b/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
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..7b150de
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+Checkstyle Configuration
+Severity: EASY
+-->
+<module name="Checker">
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sourceforge.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile">
+        <property name="severity" value="ignore" />
+    </module>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sourceforge.net/config_misc.html#Translation -->
+    <module name="Translation" />
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sourceforge.net/config_sizes.html -->
+    <module name="FileLength">
+        <property name="severity" value="ignore" />
+    </module>
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sourceforge.net/config_whitespace.html -->
+    <module name="FileTabCharacter" />
+
+    <!-- Miscellaneous other checks.                   -->
+    <!-- See http://checkstyle.sourceforge.net/config_misc.html -->
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$" />
+        <property name="minimum" value="0" />
+        <property name="maximum" value="0" />
+        <property name="message" value="Line has trailing spaces." />
+        <property name="severity" value="info" />
+    </module>
+
+    <module name="TreeWalker">
+
+        <!-- Enable suppression comments -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE IGNORE\s+(\S+)" />
+            <property name="onCommentFormat" value="CHECKSTYLE END IGNORE\s+(\S+)" />
+            <property name="checkFormat" value="$1" />
+        </module>
+
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="SUPPRESS CHECKSTYLE (\w+)" />
+            <property name="checkFormat" value="$1" />
+            <property name="influenceFormat" value="1" />
+        </module>
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sourceforge.net/config_javadoc.html -->
+        <module name="JavadocMethod">
+            <property name="scope" value="package" />
+            <property name="allowMissingParamTags" value="true" />
+            <property name="allowMissingThrowsTags" value="true" />
+            <property name="allowMissingReturnTag" value="true" />
+            <property name="allowThrowsTagsForSubclasses" value="true" />
+            <property name="allowUndeclaredRTE" value="true" />
+            <property name="allowMissingPropertyJavadoc" value="true" />
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="JavadocType">
+            <property name="scope" value="package" />
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="JavadocVariable">
+            <property name="scope" value="package" />
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="JavadocStyle">
+            <property name="checkEmptyJavadoc" value="true" />
+            <property name="severity" value="ignore" />
+        </module>
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sourceforge.net/config_naming.html -->
+        <module name="ConstantName" />
+        <module name="LocalFinalVariableName" />
+        <module name="LocalVariableName" />
+        <module name="MemberName" />
+        <module name="MethodName">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="PackageName" />
+        <module name="ParameterName">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="StaticVariableName">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="TypeName" />
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sourceforge.net/config_import.html -->
+        <module name="AvoidStarImport" />
+        <module name="IllegalImport" />
+        <!-- defaults to sun.* packages -->
+        <module name="RedundantImport" />
+        <module name="UnusedImports" />
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sourceforge.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="MethodLength" />
+        <module name="ParameterNumber" />
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sourceforge.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad" />
+        <module name="GenericWhitespace">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="MethodParamPad" />
+        <module name="NoWhitespaceAfter">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="NoWhitespaceBefore">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="OperatorWrap" />
+        <module name="ParenPad" />
+        <module name="TypecastParenPad" />
+        <module name="WhitespaceAfter">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="WhitespaceAround">
+            <property name="severity" value="ignore" />
+        </module>
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sourceforge.net/config_modifiers.html -->
+        <module name="ModifierOrder">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="RedundantModifier">
+            <property name="severity" value="ignore" />
+        </module>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sourceforge.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks" />
+        <module name="EmptyBlock">
+            <property name="option" value="text" />
+        </module>
+        <module name="LeftCurly">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="NeedBraces">
+            <!-- cannot initialize module TreeWalker - Property 'allowSingleLineIf' in module NeedBraces does not exist, please check the documentation -->
+            <!-- u wot m8 -->
+            <!--<property name="allowSingleLineIf" value="TRUE" />-->
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="RightCurly">
+            <property name="severity" value="ignore" />
+        </module>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sourceforge.net/config_coding.html -->
+        <module name="EmptyStatement" />
+        <module name="EqualsHashCode" />
+        <module name="HiddenField">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="IllegalInstantiation" />
+        <module name="InnerAssignment" />
+        <module name="MagicNumber">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="MissingSwitchDefault">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="SimplifyBooleanExpression" />
+        <module name="SimplifyBooleanReturn" />
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sourceforge.net/config_design.html -->
+        <module name="FinalClass" />
+        <module name="HideUtilityClassConstructor" />
+        <module name="InterfaceIsType">
+            <property name="severity" value="ignore" />
+        </module>
+        <module name="VisibilityModifier">
+            <property name="severity" value="ignore" />
+        </module>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sourceforge.net/config_misc.html -->
+        <module name="ArrayTypeStyle" />
+        <module name="TodoComment">
+            <property name="format" value="(?i)\s+TODO\s+" />
+            <property name="severity" value="info" />
+        </module>
+        <module name="TodoComment">
+            <property name="format" value="(?i)\s+CR\s+" />
+            <property name="severity" value="info" />
+        </module>
+        <module name="UpperEll" />
+
+    </module>
+
+</module>
\ No newline at end of file