Merge branch 'develop' of https://github.com/systers/mentorship-android into patch_two

Author: gaurivn

.github/CONTRIBUTING.md

@@ -1,11 +1,22 @@
 # Contributing Guidelines
-* You can join our [slack channel](http://systers.io/slack-systers-opensource/).  Each active repo has its own channel to direct questions to (for example #powerup or #portal).  
+
+* You can join us on [AnitaB.org Open Source Zulip](https://anitab-org.zulipchat.com/).  Each active repo has its own stream to direct questions to (for example #powerup or #portal).  Mentorship System stream is [#mentorship-system](https://anitab-org.zulipchat.com/#narrow/stream/222534-mentorship-system).
 * Remember that this is an inclusive community, committed to creating a safe, positive environment.  See the full [Code of Conduct](http://www.systers.io/code-of-conduct.html).
+* Follow our [Commit Message Style Guide](https://github.com/anitab-org/mentorship-android/wiki/Commit-Message-Style-Guide) when you commit your changes.
+* Please consider raising an issue before submitting a pull request (PR) to solve a problem that is not present in our [issue tracker](https://github.com/anitab-org/mentorship-android/issues). This allows maintainers to first validate the issue you are trying to solve and also reference the PR to a specific issue.
+* When developing a new feature, include at least one test when applicable.
+* When submitting a PR, please follow [this template](PULL_REQUEST_TEMPLATE.md) (which will probably be already filled up once you create the PR).
+* When submitting a PR with changes to user interface (e.g.: new screen, ...), please add screenshots to the PR description.
+* When you are finished with your work, please squash your commits otherwise we will squash them on your PR (this can help us maintain a clear commit history). 
+* When creating an issue to report a bug in the project, please follow our [bug_report.md](ISSUE_TEMPLATE/bug_report.md) template.
+* Issues labeled as “First Timers Only” are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues.
+
 ## General Guidelines
+
 * If you’re just getting started work on an issue labeled “First Timers Only” in any project. Additional resources are available on our [website](http://www.systers.io).
 * In an active repository (not an archived one), choose an open issue from the issue list, claim it in the comments, and a maintainer will assign it to you.  
 * After approval you must make continuous notes on your progress in the issue while working.  If there is not at least one comment every 3 days, the maintainer can reassign the issue.
 * Create a branch specific to the issue you're working on, so that you send a PR from that branch instead of the base branch on your fork.
 * If you’d like to create a new issue, please go through our issue list first (open as well as closed) and make sure the issues you are reporting do not replicate the existing issues. 
 * Have a short description on what has gone wrong (like a root cause analysis and description of the fix), if that information is not already present in the issue.
-* If you have issues on multiple pages, report them separately. Do not combine them into a single issue.
+* If you have issues on multiple pages, report them separately. Do not combine them into a single issue.

.gitignore

@@ -46,6 +46,8 @@ captures/
 .idea/vcs.xml
 .idea/runConfigurations.xml
 .idea/codeStyles/Project.xml
+.idea/codeStyles/codeStyleConfig.xml
+.idea/inspectionProfiles/Project_Default.xml
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.

README.md

@@ -2,25 +2,25 @@
 
 | Branch | [Travis](https://travis-ci.org/) | [Codacy](https://www.codacy.com/) |
 | :---: | :---: | :---: |
-| [master](https://github.com/systers/mentorship-android/tree/master) | [![Build Status](https://travis-ci.org/systers/mentorship-android.svg?branch=master)](https://travis-ci.org/systers/mentorship-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ee27e44e4ac646e0afe440173ea47823?branch=master)](https://www.codacy.com/app/m-murad/mentorship-android) |
-| [develop](https://github.com/systers/mentorship-android/tree/develop) | [![Build Status](https://travis-ci.org/systers/mentorship-android.svg?branch=develop)](https://travis-ci.org/systers/mentorship-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ee27e44e4ac646e0afe440173ea47823?branch=develop)](https://www.codacy.com/app/m-murad/mentorship-android) |
+| [master](https://github.com/anitab-org/mentorship-android/tree/master) | [![Build Status](https://travis-ci.org/anitab-org/mentorship-android.svg?branch=master)](https://travis-ci.org/anitab-org/mentorship-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ee27e44e4ac646e0afe440173ea47823?branch=master)](https://www.codacy.com/app/m-murad/mentorship-android) |
+| [develop](https://github.com/anitab-org/mentorship-android/tree/develop) | [![Build Status](https://travis-ci.org/anitab-org/mentorship-android.svg?branch=develop)](https://travis-ci.org/anitab-org/mentorship-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ee27e44e4ac646e0afe440173ea47823?branch=develop)](https://www.codacy.com/app/m-murad/mentorship-android) |
 
-[Mentorship System](https://github.com/systers/mentorship-backend) is an application that allows women in tech to mentor each other, on career development topics, through 1:1 relations for a certain period.
+[Mentorship System](https://github.com/anitab-org/mentorship-backend) is an application that allows women in tech to mentor each other, on career development topics, through 1:1 relations for a certain period.
 
 This is the Android client for the Mentorship System.
 
 ## Setting up the project
 
 To setup the project locally read these wiki pages and follow the instructions:
 
- - [Fork, Clone and Remote](https://github.com/systers/mentorship-android/wiki/Fork%2C-Clone-%26-Remote)
- - [Open project in Android Studio](https://github.com/systers/mentorship-android/wiki/Open-the-project-in-Android-Studio)
+ - [Fork, Clone and Remote](https://github.com/anitab-org/mentorship-android/wiki/Fork%2C-Clone-%26-Remote)
+ - [Open project in Android Studio](https://github.com/anitab-org/mentorship-android/wiki/Open-the-project-in-Android-Studio)
 
 ## Contributing 
 
-Please read our [Contributing guidelines](https://github.com/systers/mentorship-android/blob/develop/.github/CONTRIBUTING.md), [Code of Conduct](http://systers.io/code-of-conduct) and [Reporting Guidelines](http://systers.io/reporting-guidelines)
+Please read our [Contributing guidelines](https://github.com/anitab-org/mentorship-android/blob/develop/.github/CONTRIBUTING.md), [Code of Conduct](http://systers.io/code-of-conduct) and [Reporting Guidelines](http://systers.io/reporting-guidelines)
 
-Please follow our [Commit Message Style Guide](https://github.com/systers/mentorship-android/wiki/Commit-Message-Style-Guide) while sending PRs.
+Please follow our [Commit Message Style Guide](https://github.com/anitab-org/mentorship-android/wiki/Commit-Message-Style-Guide) while sending PRs.
 
 ## Branches
 
@@ -32,8 +32,19 @@ The repository has the following permanent branches:
 
  * **apk** This branch contains the apks for the code in the develop branch. The apks are automatically updated when a commit is pushed to `develop` branch.
 
+## Screenshots
+|![Splashscreen](Screenshots/Splashscreen.png)|![SignUp Screen](Screenshots/SignUp%20Screen.png)|![Login Page](Screenshots/Login%20Page.png)| 
+|---|---|---|
+|![Home Page](Screenshots/Home%20Page.png)|![Profile Page](Screenshots/Profile%20Page.png)|![Edit Profile Page](Screenshots/Edit%20Profile%20Page.png)| 
+|![Relations Page](Screenshots/Relations%20Page.png)|![Tasks Page](Screenshots/Tasks%20Page.png)|![Members Page](Screenshots/Members%20Page.png)
+|![Member Profile](Screenshots/Member%20Profile%20Page.png)|![Send Request Page](Screenshots/Send%20Request%20Page.png)|![Requests Page](Screenshots/Requests%20Page.png)|
+![Settings Screen](Screenshots/Settings%20Screen.png)|![About Page](Screenshots/About%20Page.png)|![Change Password Page](Screenshots/Change%20Password%20Page.png)|
 ## Contact
 
-You can reach maintainers team @mentorship-team on [Systers Open Source Slack](http://systers.io/slack-systers-opensource/) or @systers/maintainers-mentorship-android on GitHub.
+You can reach our community at [AnitaB.org Open Source Zulip](https://anitab-org.zulipchat.com/).
 
-We use [#mentorship-system](https://systers-opensource.slack.com/messages/CAE8QK41L/) channel on Slack to discuss this project. If you're interested in contributing to this project, join us there!
+We use [#mentorship-system](https://anitab-org.zulipchat.com/#narrow/stream/222534-mentorship-system) stream on Zulip to discuss this project and interact with the community. If you're interested in contributing to this project, join us there!
+
+## License
+
+Mentorship System is licensed under the GNU General Public License v3.0. Learn more about it in the [LICENSE](LICENSE) file.

Screenshots/About Page.png

@@ -21,10 +21,13 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            manifestPlaceholders = [usesCleartextTraffic:"false"]
+            manifestPlaceholders = [usesCleartextTraffic: "false"]
         }
         debug {
-            manifestPlaceholders = [usesCleartextTraffic:"true"]
+            manifestPlaceholders = [usesCleartextTraffic: "true"]
+        }
+        debug_localhost {
+            initWith debug
         }
     }
     dataBinding {
@@ -53,6 +56,8 @@ dependencies {
     androidTestImplementation Dependencies.test_runner
     androidTestImplementation Dependencies.test_rules
     androidTestImplementation Dependencies.espresso
+    androidTestImplementation Dependencies.espresso_intents
+    androidTestImplementation Dependencies.ext_junit
 
     implementation Dependencies.rx_java
     implementation Dependencies.rx_android
@@ -65,4 +70,5 @@ dependencies {
 
     implementation Dependencies.lifecycle_extensions
     implementation Dependencies.lifecycle_viewmodel
+    implementation Dependencies.circule_image_view
 }

Screenshots/Change Password Page.png

@@ -1,16 +1,21 @@
 package org.systers.mentorship
 
+import android.content.ComponentName
+import android.view.View
+import android.widget.EditText
 import androidx.annotation.IdRes
-import com.google.android.material.textfield.TextInputLayout
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
-import android.view.View
-import android.widget.EditText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.material.textfield.TextInputLayout
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.Description
@@ -20,20 +25,30 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.systers.mentorship.view.activities.LoginActivity
+import org.systers.mentorship.view.activities.MainActivity
+
 
 /**
  * This class specifies the UI test for LoginActivity
  */
 @RunWith(AndroidJUnit4::class)
 class LoginActivityTest {
-    private val EMPTY_USERNAME_ERROR: String = "Username cannot be empty"
-    private val EMPTY_PASSWORD_ERROR: String = "Password cannot be empty"
+    private val EMPTY_USERNAME_ERROR = "Username cannot be empty"
+    private val EMPTY_PASSWORD_ERROR = "Password cannot be empty"
+    private val INCORRECT_CREDENTIALS_ERROR = "Username or password is incorrect."
 
-    private val TEST_USERNAME: String = "test user"
-    private val TEST_PASSWORD: String = "test password"
+    private val INCORRECT_TEST_USERNAME = "blah"
+    private val INCORRECT_TEST_PASSWORD = "blah"
+
+    private val CORRECT_TEST_USERNAME = "testusername"
+    private val CORRECT_TEST_PASSWORD = "test_pass"
 
     @get:Rule
-    var mActivityRule: ActivityTestRule<LoginActivity> = ActivityTestRule(LoginActivity::class.java)
+    var activityRule = ActivityTestRule(LoginActivity::class.java)
+
+    @Rule
+    @JvmField
+    var intentsRule = IntentsTestRule(MainActivity::class.java)
 
     private fun findEditTextInTextInputLayout(@IdRes textInputLayoutId : Int) : ViewInteraction {
 
@@ -50,7 +65,7 @@ class LoginActivityTest {
             return object : TypeSafeMatcher<View>() {
                 /**
                  * Generates a description of the object.  The description may be part of a
-                 * a description of a larger object of which this is just a component, so it
+                 * larger object of which this is just a component, so it
                  * should be worded appropriately.
                  *
                  * @param description
@@ -84,17 +99,13 @@ class LoginActivityTest {
 
     /**
      * This test checks that error messages are shown after the Login button is clicked
-     *  with empty username and password fields.
+     * with:
+     * username: EMPTY
+     * password: EMPTY
      */
     @Test
     fun testLoginButtonClickedWhenUsernameAndPasswordAreEmpty() {
-
-        // Type empty string in both the editTexts
-        findEditTextInTextInputLayout(R.id.tiUsername).perform(typeText(""), closeSoftKeyboard())
-        findEditTextInTextInputLayout(R.id.tiPassword).perform(typeText(""), closeSoftKeyboard())
-
-        // Perform Click operation on Login Button
-        onView(withId(R.id.btnLogin)).perform(click())
+        enterCredentials("", "")
 
         // Checks that the error message in both the editTexts appears after button click
         onView(withId(R.id.tiUsername)).check(matches(hasTextInputLayoutErrorText(EMPTY_USERNAME_ERROR)))
@@ -104,41 +115,106 @@ class LoginActivityTest {
 
     /**
      * This test checks that error messages are shown after the Login button is clicked
-     *  with empty username and a password.
+     * with:
+     * username: EMPTY
+     * password: PRESENT
      */
     @Test
     fun testLoginButtonClickedWhenUsernameIsEmptyAndPasswordIsFilled() {
-        // Type in no username
-        findEditTextInTextInputLayout(R.id.tiUsername).perform(typeText(""), closeSoftKeyboard())
-
-        // Type in a password
-        findEditTextInTextInputLayout(R.id.tiPassword).perform(typeText(TEST_PASSWORD), closeSoftKeyboard())
-
-        // Perform Click operation on Login Button
-        onView(withId(R.id.btnLogin)).perform(click())
+        enterCredentials("", CORRECT_TEST_PASSWORD)
 
         // Check for error message on username and not on password
         onView(withId(R.id.tiUsername)).check(matches(hasTextInputLayoutErrorText(EMPTY_USERNAME_ERROR)))
         onView(withId(R.id.tiPassword)).check(matches(not(hasTextInputLayoutErrorText(EMPTY_PASSWORD_ERROR))))
     }
 
     /**
-     *  This test checks that error messages are shown after the Login button is clicked
-     *  with a username and an empty password.
+     * This test checks that error messages are shown after the Login button is clicked
+     * with:
+     * username: PRESENT, correct
+     * password: EMPTY
      */
     @Test
     fun testLoginButtonClickedWhenUsernameIsFilledAndPasswordIsEmpty() {
-        // Type in a username
-        findEditTextInTextInputLayout(R.id.tiUsername).perform(typeText(TEST_USERNAME), closeSoftKeyboard())
-
-        // Type in no password
-        findEditTextInTextInputLayout(R.id.tiPassword).perform(typeText(""), closeSoftKeyboard())
-
-        // Perform Click operation on Login Button
-        onView(withId(R.id.btnLogin)).perform(click())
+        enterCredentials(CORRECT_TEST_USERNAME, "")
 
         // Check for no error message on username with an error message on password
         onView(withId(R.id.tiUsername)).check(matches(not(hasTextInputLayoutErrorText(EMPTY_USERNAME_ERROR))))
         onView(withId(R.id.tiPassword)).check(matches(hasTextInputLayoutErrorText(EMPTY_PASSWORD_ERROR)))
     }
+
+    /**
+     * This test checks that error messages are shown after the Login button is clicked
+     * with:
+     * username: PRESENT, incorrect
+     * password: PRESENT, incorrect
+     */
+    @Test
+    fun testLoginButtonClickedWhenDataIsIncorrect() {
+        enterCredentials(INCORRECT_TEST_USERNAME, INCORRECT_TEST_PASSWORD)
+
+        // Verify that a Snackbar with a proper message is shown
+        onView(withId(com.google.android.material.R.id.snackbar_text))
+            .check(matches(withText("Username or password is wrong.")))
+    }
+
+    /**
+     * This test checks that the MainActivity is started when the credentials entered
+     * by the user are correct.
+     * username: PRESENT
+     * password: PRESENT
+     */
+    @Test
+    fun testLoginButtonClickedWhenDataIsCorrect() {
+        enterCredentials(CORRECT_TEST_USERNAME, CORRECT_TEST_PASSWORD)
+
+        // Verify that MainActivity is started
+        intended(hasComponent(
+            ComponentName(InstrumentationRegistry.getInstrumentation().context, MainActivity::class.java))
+        )
+    }
+
+    /**
+     * This test checks that the Snackbar with an error message is shown after the Login
+     * button is clicked with:
+     * username: PRESENT, incorrect
+     * password: PRESENT, correct
+     */
+    @Test
+    fun testLoginButtonWhenOnlyUsernameIsIncorrect() {
+        enterCredentials(INCORRECT_TEST_USERNAME, CORRECT_TEST_PASSWORD)
+
+        // Verify that a Snackbar with a proper message is shown
+        onView(withId(com.google.android.material.R.id.snackbar_text))
+            .check(matches(withText("Username or password is wrong.")))
+    }
+
+    /**
+     * This test checks that the Snackbar with an error message is shown after the Login
+     * button is clicked with:
+     * username: PRESENT, correct
+     * password: PRESENT, incorrect
+     */
+    @Test
+    fun testLoginButtonWhenOnlyPasswordIsIncorrect() {
+        enterCredentials(CORRECT_TEST_USERNAME, INCORRECT_TEST_PASSWORD)
+
+        // Verify that a Snackbar with a proper message is shown
+        onView(withId(com.google.android.material.R.id.snackbar_text))
+            .check(matches(withText(INCORRECT_CREDENTIALS_ERROR)))
+    }
+
+    /**
+     * Convenience method which enters credentials and click on the Login Button.
+     */
+    private fun enterCredentials(username: String, password: String) {
+        // Type in a username
+        findEditTextInTextInputLayout(R.id.tiUsername).perform(typeText(username), closeSoftKeyboard())
+
+        // Type in a password
+        findEditTextInTextInputLayout(R.id.tiPassword).perform(typeText(password), closeSoftKeyboard())
+
+        // Perform a click on the Login Button
+        onView(withId(R.id.btnLogin)).perform(click())
+    }
 }