Made the user setter button clear the current user if there's a user …

…already set.
CodemateLtd · Jan 19, 2017 · 3fd0139 · 3fd0139
1 parent 9759233
commit 3fd0139
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 5 deletions.
diff --git a/app/src/main/java/com/codemate/koffeemate/ui/main/MainActivity.kt b/app/src/main/java/com/codemate/koffeemate/ui/main/MainActivity.kt
@@ -57,9 +57,7 @@ class MainActivity : AppCompatActivity(), MainView, UserSelectorFragment.UserSel
         }
 
         coffeeProgressView.setOnUserSetterClickListener {
-            UserSelectorFragment
-                    .newInstance()
-                    .show(supportFragmentManager, "asd")
+            presenter.handlePersonChange()
         }
 
         settingsButton.onClick {
@@ -91,7 +89,17 @@ class MainActivity : AppCompatActivity(), MainView, UserSelectorFragment.UserSel
         accidentProgress?.dismiss()
     }
 
-    // UserSelectListener method, for identifying who brews the coffee
+    // Functions for identifying who brews the coffee
+    override fun selectCoffeeBrewingPerson() {
+        UserSelectorFragment
+                .newInstance()
+                .show(supportFragmentManager, "user_selector")
+    }
+
+    override fun clearCoffeeBrewingPerson() {
+        coffeeProgressView.userSetterButton.clearUser()
+    }
+
     override fun onUserSelected(user: User) {
         Glide.with(this)
                 .load(user.profile.smallestAvailableImage)

diff --git a/app/src/main/java/com/codemate/koffeemate/ui/main/MainPresenter.kt b/app/src/main/java/com/codemate/koffeemate/ui/main/MainPresenter.kt
@@ -77,6 +77,15 @@ class MainPresenter @Inject constructor(
                 && !coffeePreferences.isCoffeeAnnouncementChannelSet()
     }
 
+    fun handlePersonChange() {
+        if (personBrewingCoffee == null) {
+            getView()?.selectCoffeeBrewingPerson()
+        } else {
+            personBrewingCoffee = null
+            getView()?.clearCoffeeBrewingPerson()
+        }
+    }
+
     fun updateLastBrewingEventTime() {
         coffeeEventRepository.getLastBrewingEvent()?.let {
             getView()?.updateLastBrewingEvent(it)

diff --git a/app/src/main/java/com/codemate/koffeemate/ui/main/MainView.kt b/app/src/main/java/com/codemate/koffeemate/ui/main/MainView.kt
@@ -14,6 +14,9 @@ interface MainView : MvpView {
     fun showNoAnnouncementChannelSetError()
     fun showNoAccidentChannelSetError()
 
+    fun selectCoffeeBrewingPerson()
+    fun clearCoffeeBrewingPerson()
+
     fun launchUserSelector()
     fun showPostAccidentAnnouncementPrompt(
             userId: String,

diff --git a/app/src/main/java/com/codemate/koffeemate/views/UserSetterButton.kt b/app/src/main/java/com/codemate/koffeemate/views/UserSetterButton.kt
@@ -61,7 +61,24 @@ class UserSetterButton(ctx: Context, attrs: AttributeSet) : CircleImageView(ctx,
                 .start()
     }
 
-    private fun reset() {
+    fun clearUser() {
+        animate().alpha(0.1f)
+                .scaleX(0.1f)
+                .scaleY(0.1f)
+                .rotation(180f)
+                .withEndAction {
+                    imageResource = EMPTY_IMAGE_RESOURCE
+                    rotation = -180f
+                    animate().alpha(1f)
+                            .scaleX(1f)
+                            .scaleY(1f)
+                            .rotation(0f)
+                            .setInterpolator(OvershootInterpolator(2f))
+                            .start()
+                }
+    }
+
+    fun reset() {
         imageResource = EMPTY_IMAGE_RESOURCE
         visibility = View.GONE
         isClickable = false

diff --git a/app/src/test/java/com/codemate/koffeemate/ui/main/MainPresenterTest.kt b/app/src/test/java/com/codemate/koffeemate/ui/main/MainPresenterTest.kt
@@ -175,6 +175,25 @@ class MainPresenterTest {
         verifyZeroInteractions(mockCoffeeEventRepository)
     }
 
+    @Test
+    fun handlePersonChange_WhenPersonNotSet_ShowsPersonSelectionDialog() {
+        presenter.handlePersonChange()
+
+        verify(view).selectCoffeeBrewingPerson()
+        verifyNoMoreInteractions(view)
+    }
+
+    @Test
+    fun handlePersonChange_WhenPersonIsSet_ClearsPerson() {
+        presenter.personBrewingCoffee = fakeUser()
+        presenter.handlePersonChange()
+
+        assertThat(presenter.personBrewingCoffee, nullValue())
+
+        verify(view).clearCoffeeBrewingPerson()
+        verifyNoMoreInteractions(view)
+    }
+
     @Test
     fun launchAccidentReportingScreen_DefersScreenSaver() {
         presenter.launchAccidentReportingScreen()