working on #8

implementing MVP with dagger and koting
its too hard men
testing CI please squash or ammend

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:theme="@style/AppTheme"
         android:name="org.mercuriete.musiciantools.MusicianToolsApp">
         <activity
-            android:name=".services.MenuActivity"
+            android:name=".bpmcalculator.BPMCalculatorActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

app/src/main/java/org/mercuriete/musiciantools/BasePresenter.kt

@@ -0,0 +1,17 @@
+package org.mercuriete.musiciantools
+
+interface BasePresenter<T> {
+
+    /**
+     * Binds presenter with a view when resumed. The Presenter will perform initialization here.
+     *
+     * @param view the view associated with this presenter
+     */
+    fun takeView(view: T)
+
+    /**
+     * Drops the reference to the view when destroyed
+     */
+    fun dropView()
+
+}

app/src/main/java/org/mercuriete/musiciantools/BaseView.kt

@@ -0,0 +1,5 @@
+package org.mercuriete.musiciantools
+
+interface BaseView<T> {
+
+}

app/src/main/java/org/mercuriete/musiciantools/services/MenuActivity.kt → app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorActivity.kt

@@ -1,4 +1,4 @@
-package org.mercuriete.musiciantools.services
+package org.mercuriete.musiciantools.bpmcalculator
 
 import android.os.Bundle
 import dagger.android.support.DaggerAppCompatActivity
@@ -7,18 +7,25 @@ import kotlinx.android.synthetic.main.content_menu.*
 import org.mercuriete.musiciantools.R
 import javax.inject.Inject
 
-class MenuActivity : DaggerAppCompatActivity() {
+
+class BPMCalculatorActivity : DaggerAppCompatActivity(), BPMCalculatorContract.View {
+
     @Inject
-    lateinit var bpmCalculatorService: BPMCalculatorService
+    lateinit var presenter: BPMCalculatorContract.Presenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_menu)
         setSupportActionBar(toolbar)
+        presenter.takeView(this)
 
         button.setOnClickListener { _ ->
-            bpmCalculatorService.beat()
-            bpmText.text = String.format("%.2f", bpmCalculatorService.getBPM())
+            presenter.addBeat()
         }
     }
+
+    override fun showBPM(bpm: String) {
+        bpmText.text = bpm
+    }
+
 }

app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorContract.kt

@@ -0,0 +1,16 @@
+package org.mercuriete.musiciantools.bpmcalculator
+
+import org.mercuriete.musiciantools.BasePresenter
+import org.mercuriete.musiciantools.BaseView
+
+
+interface BPMCalculatorContract {
+
+    interface View : BaseView<Presenter> {
+        fun showBPM(bpm:String)
+    }
+
+    interface Presenter : BasePresenter<View> {
+        fun addBeat()
+    }
+}

app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorModule.kt

@@ -0,0 +1,21 @@
+package org.mercuriete.musiciantools.bpmcalculator
+
+import dagger.Provides
+import dagger.Module
+import javax.inject.Singleton
+
+@Module
+class BPMCalculatorModule {
+
+    @Provides
+    fun bpmCalculatorServiceProvider(): BPMCalculatorService {
+        return BPMCalculatorServiceImpl()
+    }
+
+    @Singleton
+    @Provides
+    fun bpmCalculatorPresenterProvider(bpmCalculatorService: BPMCalculatorService): BPMCalculatorContract.Presenter {
+        return BPMCalculatorPresenter(bpmCalculatorService)
+    }
+
+}

app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorPresenter.kt

@@ -0,0 +1,30 @@
+package org.mercuriete.musiciantools.bpmcalculator
+
+import android.support.annotation.Nullable
+import javax.inject.Inject
+
+class BPMCalculatorPresenter : BPMCalculatorContract.Presenter {
+    @Nullable
+    private var bpmCalculatorView: BPMCalculatorContract.View? = null
+
+    private var bpmCalculatorService: BPMCalculatorService
+
+    @Inject
+    constructor(bpmCalculatorService: BPMCalculatorService) {
+        this.bpmCalculatorService = bpmCalculatorService
+    }
+
+    override fun addBeat() {
+        bpmCalculatorService.beat()
+        bpmCalculatorView?.showBPM(String.format("%.2f", bpmCalculatorService.getBPM()))
+
+    }
+
+    override fun takeView(view: BPMCalculatorContract.View) {
+        bpmCalculatorView = view
+    }
+
+    override fun dropView() {
+        bpmCalculatorView = null
+    }
+}

app/src/main/java/org/mercuriete/musiciantools/services/BPMCalculatorService.kt → app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorService.kt

@@ -1,4 +1,4 @@
-package org.mercuriete.musiciantools.services
+package org.mercuriete.musiciantools.bpmcalculator
 
 interface BPMCalculatorService {
     fun beat()

app/src/main/java/org/mercuriete/musiciantools/services/BPMCalculatorServiceImpl.kt → app/src/main/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorServiceImpl.kt

@@ -1,4 +1,4 @@
-package org.mercuriete.musiciantools.services
+package org.mercuriete.musiciantools.bpmcalculator
 
 class BPMCalculatorServiceImpl : BPMCalculatorService {
 

app/src/main/java/org/mercuriete/musiciantools/di/ActivityBindingModule.kt

@@ -2,7 +2,7 @@ package org.mercuriete.musiciantools.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import org.mercuriete.musiciantools.services.MenuActivity
+import org.mercuriete.musiciantools.bpmcalculator.BPMCalculatorActivity
 
 
 /**
@@ -16,5 +16,5 @@ import org.mercuriete.musiciantools.services.MenuActivity
 abstract class ActivityBindingModule {
     @ActivityScoped
     @ContributesAndroidInjector(modules = [ApplicationModule::class])
-    internal abstract fun menuActivity(): MenuActivity
+    internal abstract fun menuActivity(): BPMCalculatorActivity
 }

app/src/main/java/org/mercuriete/musiciantools/di/ActivityScoped.kt

@@ -1,12 +1,9 @@
 package org.mercuriete.musiciantools.di
 
-import org.mercuriete.musiciantools.di.AppComponent
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Scope;
+import java.lang.annotation.Documented
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import javax.inject.Scope
 
 
 /**
@@ -18,4 +15,4 @@ import javax.inject.Scope;
 @Documented
 @Scope
 @Retention(RetentionPolicy.RUNTIME)
-annotation class ActivityScoped
+annotation class ActivityScoped

app/src/main/java/org/mercuriete/musiciantools/di/AppComponent.kt

@@ -7,7 +7,7 @@ import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
 import javax.inject.Singleton
 import org.mercuriete.musiciantools.MusicianToolsApp
-import org.mercuriete.musiciantools.services.BPMCalculatorModule
+import org.mercuriete.musiciantools.bpmcalculator.BPMCalculatorModule
 
 /**
  * This is a Dagger component. Refer to [MusicianToolsApp] for the list of Dagger components

app/src/main/res/layout/activity_menu.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".services.MenuActivity">
+    tools:context=".bpmcalculator.BPMCalculatorActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"

app/src/main/res/layout/content_menu.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".services.MenuActivity"
+    tools:context=".bpmcalculator.BPMCalculatorActivity"
     tools:showIn="@layout/activity_menu">
 
     <TextView

app/src/test/java/org/mercuriete/musiciantools/services/BPMCalculatorServiceUnitTest.kt → app/src/test/java/org/mercuriete/musiciantools/bpmcalculator/BPMCalculatorServiceUnitTest.kt

@@ -1,4 +1,4 @@
-package org.mercuriete.musiciantools.services
+package org.mercuriete.musiciantools.bpmcalculator
 
 import org.junit.Assert
 import org.junit.Test