From af96567e661ec4ac00b47a58815621905a2555eb Mon Sep 17 00:00:00 2001 From: Tushar Dhole Date: Sun, 29 Apr 2018 11:43:40 +0530 Subject: [PATCH] Creating a TO DO app in kotlin using TDD and MVP architechure. --- .gitignore | 11 ++ app/.gitignore | 1 + app/build.gradle | 35 ++++ app/proguard-rules.pro | 21 +++ app/src/main/AndroidManifest.xml | 23 +++ .../main/java/com/todo/constants/Constants.kt | 5 + .../com/todo/presenter/AddToDoPresenter.kt | 18 ++ .../com/todo/presenter/ToDoHomePresenter.kt | 27 +++ .../com/todo/view/addToDo/AddToDoActivity.kt | 39 ++++ .../java/com/todo/view/addToDo/AddToDoView.kt | 9 + .../com/todo/view/home/ToDoHomeActivity.kt | 44 +++++ .../java/com/todo/view/home/ToDoHomeView.kt | 10 + .../drawable-v24/ic_launcher_foreground.xml | 34 ++++ .../res/drawable/ic_launcher_background.xml | 170 +++++++++++++++++ app/src/main/res/layout/activity_main.xml | 27 +++ app/src/main/res/layout/add_to_do_layout.xml | 26 +++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3056 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 5024 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2096 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2858 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4569 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 7098 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6464 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10676 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 9250 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 15523 bytes app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/strings.xml | 6 + app/src/main/res/values/styles.xml | 11 ++ .../todo/presenter/AddToDoPresenterTest.kt | 45 +++++ .../todo/presenter/ToDoHomePresenterTest.kt | 68 +++++++ build.gradle | 27 +++ gradle/wrapper/.gitignore | 0 gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ settings.gradle | 1 + 40 files changed, 936 insertions(+) create mode 100644 .gitignore create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/todo/constants/Constants.kt create mode 100644 app/src/main/java/com/todo/presenter/AddToDoPresenter.kt create mode 100644 app/src/main/java/com/todo/presenter/ToDoHomePresenter.kt create mode 100644 app/src/main/java/com/todo/view/addToDo/AddToDoActivity.kt create mode 100644 app/src/main/java/com/todo/view/addToDo/AddToDoView.kt create mode 100644 app/src/main/java/com/todo/view/home/ToDoHomeActivity.kt create mode 100644 app/src/main/java/com/todo/view/home/ToDoHomeView.kt create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/add_to_do_layout.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/test/java/com/todo/presenter/AddToDoPresenterTest.kt create mode 100644 app/src/test/java/com/todo/presenter/ToDoHomePresenterTest.kt create mode 100644 build.gradle create mode 100644 gradle/wrapper/.gitignore create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5792926 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +gradle.properties +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..b40e5d9 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 26 + defaultConfig { + applicationId "com.todo.todokotlinmvp" + minSdkVersion 15 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + + testImplementation group: 'com.nhaarman', name: 'mockito-kotlin', version: '1.5.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f038309 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/todo/constants/Constants.kt b/app/src/main/java/com/todo/constants/Constants.kt new file mode 100644 index 0000000..93c87eb --- /dev/null +++ b/app/src/main/java/com/todo/constants/Constants.kt @@ -0,0 +1,5 @@ +package com.todo.constants + +const val ADD_TO_DO_REQUEST_CODE = 1111 +const val ADD_TO_DO_RESULT_CODE = 2222 +const val ADD_TO_DO_KEY = "addToDoMsg" \ No newline at end of file diff --git a/app/src/main/java/com/todo/presenter/AddToDoPresenter.kt b/app/src/main/java/com/todo/presenter/AddToDoPresenter.kt new file mode 100644 index 0000000..eb35e1f --- /dev/null +++ b/app/src/main/java/com/todo/presenter/AddToDoPresenter.kt @@ -0,0 +1,18 @@ +package com.todo.presenter + +import com.todo.constants.ADD_TO_DO_KEY +import com.todo.constants.ADD_TO_DO_RESULT_CODE +import com.todo.view.addToDo.AddToDoView + +class AddToDoPresenter(val view: AddToDoView) { + + fun onSaveToDo() { + + view.getMessageView()?.text.let { + if(it.toString().isNotBlank()) { + view.setResultMessage(ADD_TO_DO_RESULT_CODE, view.getMessageView()?.text.toString(), ADD_TO_DO_KEY) + view.finishView() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/todo/presenter/ToDoHomePresenter.kt b/app/src/main/java/com/todo/presenter/ToDoHomePresenter.kt new file mode 100644 index 0000000..25a8624 --- /dev/null +++ b/app/src/main/java/com/todo/presenter/ToDoHomePresenter.kt @@ -0,0 +1,27 @@ +package com.todo.presenter + +import android.content.Intent +import android.widget.ArrayAdapter +import com.todo.constants.ADD_TO_DO_KEY +import com.todo.constants.ADD_TO_DO_REQUEST_CODE +import com.todo.constants.ADD_TO_DO_RESULT_CODE +import com.todo.view.addToDo.AddToDoActivity +import com.todo.view.home.ToDoHomeView + +class ToDoHomePresenter(val view: ToDoHomeView, val toDoListAdapter: ArrayAdapter) { + + fun onViewCreated() { + view.getToDoListView()?.adapter = this.toDoListAdapter + } + + fun onAddNewTodo() { + view.startNewIntent(destination = AddToDoActivity::class, requestCode = ADD_TO_DO_REQUEST_CODE) + } + + fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (requestCode == ADD_TO_DO_REQUEST_CODE && resultCode == ADD_TO_DO_RESULT_CODE && data != null) { + this.toDoListAdapter.add(data.getStringExtra(ADD_TO_DO_KEY)) + this.toDoListAdapter.notifyDataSetChanged() + } + } +} diff --git a/app/src/main/java/com/todo/view/addToDo/AddToDoActivity.kt b/app/src/main/java/com/todo/view/addToDo/AddToDoActivity.kt new file mode 100644 index 0000000..42bf918 --- /dev/null +++ b/app/src/main/java/com/todo/view/addToDo/AddToDoActivity.kt @@ -0,0 +1,39 @@ +package com.todo.view.addToDo + +import android.content.Intent +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import android.view.View +import android.widget.EditText +import com.todo.presenter.AddToDoPresenter +import com.todo.todokotlinmvp.R + +class AddToDoActivity : AppCompatActivity(), AddToDoView { + + private var message: EditText? = null + private var presenter: AddToDoPresenter? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.add_to_do_layout); + message = findViewById(R.id.new_msg); + presenter = AddToDoPresenter(this) + } + + fun onSave(view: View) { + presenter?.onSaveToDo() + } + + override fun getMessageView(): EditText? { + return message + } + + override fun setResultMessage(resultCode: Int, resultMessage: String, addToDoKey: String) { + val out = Intent() + out.putExtra(addToDoKey, resultMessage) + setResult(resultCode, out) + } + override fun finishView() { + finish() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/todo/view/addToDo/AddToDoView.kt b/app/src/main/java/com/todo/view/addToDo/AddToDoView.kt new file mode 100644 index 0000000..f3ce969 --- /dev/null +++ b/app/src/main/java/com/todo/view/addToDo/AddToDoView.kt @@ -0,0 +1,9 @@ +package com.todo.view.addToDo + +import android.widget.EditText + +interface AddToDoView { + fun getMessageView(): EditText? + fun setResultMessage(resultCode: Int, resultMessage: String, addToDoKey: String) + fun finishView() +} diff --git a/app/src/main/java/com/todo/view/home/ToDoHomeActivity.kt b/app/src/main/java/com/todo/view/home/ToDoHomeActivity.kt new file mode 100644 index 0000000..6c12fd0 --- /dev/null +++ b/app/src/main/java/com/todo/view/home/ToDoHomeActivity.kt @@ -0,0 +1,44 @@ +package com.todo.view.home + +import android.content.Intent +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import android.view.View +import android.widget.ArrayAdapter +import android.widget.ListView +import com.todo.presenter.ToDoHomePresenter +import com.todo.todokotlinmvp.R +import com.todo.view.addToDo.AddToDoActivity +import kotlin.reflect.KClass + +class ToDoHomeActivity : AppCompatActivity(), ToDoHomeView { + private var homePresenter: ToDoHomePresenter? = null + private var toDoListView: ListView? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + val listAdapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, android.R.id.text1) + homePresenter = ToDoHomePresenter(this, listAdapter) + toDoListView = findViewById(R.id.my_to_do_list) + homePresenter?.onViewCreated() + } + + fun addNewTodo(addToDoButton: View) { + homePresenter?.onAddNewTodo() + } + + override fun startNewIntent(destination: KClass, requestCode: Int) { + val intent = Intent(this, destination.java) + startActivityForResult(intent, requestCode) + } + + override fun getToDoListView(): ListView? { + return toDoListView + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + homePresenter?.onActivityResult(requestCode, resultCode, data) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/todo/view/home/ToDoHomeView.kt b/app/src/main/java/com/todo/view/home/ToDoHomeView.kt new file mode 100644 index 0000000..cd00b17 --- /dev/null +++ b/app/src/main/java/com/todo/view/home/ToDoHomeView.kt @@ -0,0 +1,10 @@ +package com.todo.view.home + +import android.widget.ListView +import com.todo.view.addToDo.AddToDoActivity +import kotlin.reflect.KClass + +interface ToDoHomeView { + fun startNewIntent(destination: KClass, requestCode: Int) + fun getToDoListView(): ListView? +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..492e181 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,27 @@ + + + + + + +