├── .gitignore ├── LICENSE ├── README.md ├── app ├── .gitignore ├── build.gradle ├── proguard-rules.pro └── src │ └── main │ ├── AndroidManifest.xml │ ├── java │ └── net │ │ └── danlew │ │ └── counter │ │ ├── AndroidModule.kt │ │ ├── AppComponent.kt │ │ ├── CounterApplication.kt │ │ ├── data │ │ ├── AppDatabase.kt │ │ ├── Counter.kt │ │ ├── CounterChange.kt │ │ ├── CounterDao.kt │ │ └── DataModule.kt │ │ ├── ui │ │ ├── CounterAdapter.kt │ │ ├── CounterViewHolder.kt │ │ ├── CounterViewModel.kt │ │ └── MainActivity.kt │ │ └── util │ │ └── RxExt.kt │ └── res │ ├── drawable │ └── ic_add_24dp.xml │ ├── layout │ ├── activity_main.xml │ └── counter.xml │ ├── mipmap-hdpi │ ├── ic_launcher.png │ └── ic_launcher_round.png │ ├── mipmap-mdpi │ ├── ic_launcher.png │ └── ic_launcher_round.png │ ├── mipmap-xhdpi │ ├── ic_launcher.png │ └── ic_launcher_round.png │ ├── mipmap-xxhdpi │ ├── ic_launcher.png │ └── ic_launcher_round.png │ ├── mipmap-xxxhdpi │ ├── ic_launcher.png │ └── ic_launcher_round.png │ └── values │ ├── colors.xml │ ├── strings.xml │ └── styles.xml ├── build.gradle ├── gradle.properties ├── gradle └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── gradlew ├── gradlew.bat ├── images └── screenshot.png └── settings.gradle /.gitignore: -------------------------------------------------------------------------------- 1 | # Built application files 2 | *.apk 3 | *.ap_ 4 | 5 | # Files for the ART/Dalvik VM 6 | *.dex 7 | 8 | # Java class files 9 | *.class 10 | 11 | # Generated files 12 | bin/ 13 | gen/ 14 | out/ 15 | 16 | # Gradle files 17 | .gradle/ 18 | build/ 19 | 20 | # Local configuration file (sdk path, etc) 21 | local.properties 22 | 23 | # Proguard folder generated by Eclipse 24 | proguard/ 25 | 26 | # Log Files 27 | *.log 28 | 29 | # Android Studio Navigation editor temp files 30 | .navigation/ 31 | 32 | # Android Studio captures folder 33 | captures/ 34 | 35 | # Intellij 36 | *.iml 37 | .idea/workspace.xml 38 | .idea/tasks.xml 39 | .idea/gradle.xml 40 | .idea/dictionaries 41 | .idea/libraries 42 | 43 | # Keystore files 44 | *.jks 45 | 46 | # External native build folder generated in Android Studio 2.2 and later 47 | .externalNativeBuild 48 | 49 | # Google Services (e.g. APIs or Firebase) 50 | google-services.json 51 | 52 | # Freeline 53 | freeline.py 54 | freeline/ 55 | freeline_project_description.json 56 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | Apache License 2 | Version 2.0, January 2004 3 | http://www.apache.org/licenses/ 4 | 5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 6 | 7 | 1. Definitions. 8 | 9 | "License" shall mean the terms and conditions for use, reproduction, 10 | and distribution as defined by Sections 1 through 9 of this document. 11 | 12 | "Licensor" shall mean the copyright owner or entity authorized by 13 | the copyright owner that is granting the License. 14 | 15 | "Legal Entity" shall mean the union of the acting entity and all 16 | other entities that control, are controlled by, or are under common 17 | control with that entity. For the purposes of this definition, 18 | "control" means (i) the power, direct or indirect, to cause the 19 | direction or management of such entity, whether by contract or 20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the 21 | outstanding shares, or (iii) beneficial ownership of such entity. 22 | 23 | "You" (or "Your") shall mean an individual or Legal Entity 24 | exercising permissions granted by this License. 25 | 26 | "Source" form shall mean the preferred form for making modifications, 27 | including but not limited to software source code, documentation 28 | source, and configuration files. 29 | 30 | "Object" form shall mean any form resulting from mechanical 31 | transformation or translation of a Source form, including but 32 | not limited to compiled object code, generated documentation, 33 | and conversions to other media types. 34 | 35 | "Work" shall mean the work of authorship, whether in Source or 36 | Object form, made available under the License, as indicated by a 37 | copyright notice that is included in or attached to the work 38 | (an example is provided in the Appendix below). 39 | 40 | "Derivative Works" shall mean any work, whether in Source or Object 41 | form, that is based on (or derived from) the Work and for which the 42 | editorial revisions, annotations, elaborations, or other modifications 43 | represent, as a whole, an original work of authorship. For the purposes 44 | of this License, Derivative Works shall not include works that remain 45 | separable from, or merely link (or bind by name) to the interfaces of, 46 | the Work and Derivative Works thereof. 47 | 48 | "Contribution" shall mean any work of authorship, including 49 | the original version of the Work and any modifications or additions 50 | to that Work or Derivative Works thereof, that is intentionally 51 | submitted to Licensor for inclusion in the Work by the copyright owner 52 | or by an individual or Legal Entity authorized to submit on behalf of 53 | the copyright owner. For the purposes of this definition, "submitted" 54 | means any form of electronic, verbal, or written communication sent 55 | to the Licensor or its representatives, including but not limited to 56 | communication on electronic mailing lists, source code control systems, 57 | and issue tracking systems that are managed by, or on behalf of, the 58 | Licensor for the purpose of discussing and improving the Work, but 59 | excluding communication that is conspicuously marked or otherwise 60 | designated in writing by the copyright owner as "Not a Contribution." 61 | 62 | "Contributor" shall mean Licensor and any individual or Legal Entity 63 | on behalf of whom a Contribution has been received by Licensor and 64 | subsequently incorporated within the Work. 65 | 66 | 2. Grant of Copyright License. Subject to the terms and conditions of 67 | this License, each Contributor hereby grants to You a perpetual, 68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 69 | copyright license to reproduce, prepare Derivative Works of, 70 | publicly display, publicly perform, sublicense, and distribute the 71 | Work and such Derivative Works in Source or Object form. 72 | 73 | 3. Grant of Patent License. Subject to the terms and conditions of 74 | this License, each Contributor hereby grants to You a perpetual, 75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 76 | (except as stated in this section) patent license to make, have made, 77 | use, offer to sell, sell, import, and otherwise transfer the Work, 78 | where such license applies only to those patent claims licensable 79 | by such Contributor that are necessarily infringed by their 80 | Contribution(s) alone or by combination of their Contribution(s) 81 | with the Work to which such Contribution(s) was submitted. If You 82 | institute patent litigation against any entity (including a 83 | cross-claim or counterclaim in a lawsuit) alleging that the Work 84 | or a Contribution incorporated within the Work constitutes direct 85 | or contributory patent infringement, then any patent licenses 86 | granted to You under this License for that Work shall terminate 87 | as of the date such litigation is filed. 88 | 89 | 4. Redistribution. You may reproduce and distribute copies of the 90 | Work or Derivative Works thereof in any medium, with or without 91 | modifications, and in Source or Object form, provided that You 92 | meet the following conditions: 93 | 94 | (a) You must give any other recipients of the Work or 95 | Derivative Works a copy of this License; and 96 | 97 | (b) You must cause any modified files to carry prominent notices 98 | stating that You changed the files; and 99 | 100 | (c) You must retain, in the Source form of any Derivative Works 101 | that You distribute, all copyright, patent, trademark, and 102 | attribution notices from the Source form of the Work, 103 | excluding those notices that do not pertain to any part of 104 | the Derivative Works; and 105 | 106 | (d) If the Work includes a "NOTICE" text file as part of its 107 | distribution, then any Derivative Works that You distribute must 108 | include a readable copy of the attribution notices contained 109 | within such NOTICE file, excluding those notices that do not 110 | pertain to any part of the Derivative Works, in at least one 111 | of the following places: within a NOTICE text file distributed 112 | as part of the Derivative Works; within the Source form or 113 | documentation, if provided along with the Derivative Works; or, 114 | within a display generated by the Derivative Works, if and 115 | wherever such third-party notices normally appear. The contents 116 | of the NOTICE file are for informational purposes only and 117 | do not modify the License. You may add Your own attribution 118 | notices within Derivative Works that You distribute, alongside 119 | or as an addendum to the NOTICE text from the Work, provided 120 | that such additional attribution notices cannot be construed 121 | as modifying the License. 122 | 123 | You may add Your own copyright statement to Your modifications and 124 | may provide additional or different license terms and conditions 125 | for use, reproduction, or distribution of Your modifications, or 126 | for any such Derivative Works as a whole, provided Your use, 127 | reproduction, and distribution of the Work otherwise complies with 128 | the conditions stated in this License. 129 | 130 | 5. Submission of Contributions. Unless You explicitly state otherwise, 131 | any Contribution intentionally submitted for inclusion in the Work 132 | by You to the Licensor shall be under the terms and conditions of 133 | this License, without any additional terms or conditions. 134 | Notwithstanding the above, nothing herein shall supersede or modify 135 | the terms of any separate license agreement you may have executed 136 | with Licensor regarding such Contributions. 137 | 138 | 6. Trademarks. This License does not grant permission to use the trade 139 | names, trademarks, service marks, or product names of the Licensor, 140 | except as required for reasonable and customary use in describing the 141 | origin of the Work and reproducing the content of the NOTICE file. 142 | 143 | 7. Disclaimer of Warranty. Unless required by applicable law or 144 | agreed to in writing, Licensor provides the Work (and each 145 | Contributor provides its Contributions) on an "AS IS" BASIS, 146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 147 | implied, including, without limitation, any warranties or conditions 148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 149 | PARTICULAR PURPOSE. You are solely responsible for determining the 150 | appropriateness of using or redistributing the Work and assume any 151 | risks associated with Your exercise of permissions under this License. 152 | 153 | 8. Limitation of Liability. In no event and under no legal theory, 154 | whether in tort (including negligence), contract, or otherwise, 155 | unless required by applicable law (such as deliberate and grossly 156 | negligent acts) or agreed to in writing, shall any Contributor be 157 | liable to You for damages, including any direct, indirect, special, 158 | incidental, or consequential damages of any character arising as a 159 | result of this License or out of the use or inability to use the 160 | Work (including but not limited to damages for loss of goodwill, 161 | work stoppage, computer failure or malfunction, or any and all 162 | other commercial damages or losses), even if such Contributor 163 | has been advised of the possibility of such damages. 164 | 165 | 9. Accepting Warranty or Additional Liability. While redistributing 166 | the Work or Derivative Works thereof, You may choose to offer, 167 | and charge a fee for, acceptance of support, warranty, indemnity, 168 | or other liability obligations and/or rights consistent with this 169 | License. However, in accepting such obligations, You may act only 170 | on Your own behalf and on Your sole responsibility, not on behalf 171 | of any other Contributor, and only if You agree to indemnify, 172 | defend, and hold each Contributor harmless for any liability 173 | incurred by, or claims asserted against, such Contributor by reason 174 | of your accepting any such warranty or additional liability. 175 | 176 | END OF TERMS AND CONDITIONS 177 | 178 | APPENDIX: How to apply the Apache License to your work. 179 | 180 | To apply the Apache License to your work, attach the following 181 | boilerplate notice, with the fields enclosed by brackets "{}" 182 | replaced with your own identifying information. (Don't include 183 | the brackets!) The text should be enclosed in the appropriate 184 | comment syntax for the file format. We also recommend that a 185 | file or class name and description of purpose be included on the 186 | same "printed page" as the copyright notice for easier 187 | identification within third-party archives. 188 | 189 | Copyright {yyyy} {name of copyright owner} 190 | 191 | Licensed under the Apache License, Version 2.0 (the "License"); 192 | you may not use this file except in compliance with the License. 193 | You may obtain a copy of the License at 194 | 195 | http://www.apache.org/licenses/LICENSE-2.0 196 | 197 | Unless required by applicable law or agreed to in writing, software 198 | distributed under the License is distributed on an "AS IS" BASIS, 199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 200 | See the License for the specific language governing permissions and 201 | limitations under the License. 202 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # android-architecture-counter-sample 2 | 3 | Here's a simple sample app that demonstrates some parts of [Android Architecture Components](https://developer.android.com/topic/libraries/architecture/index.html). Plus, it's entirely written in Kotlin! 4 | 5 | -------------------------------------------------------------------------------- /app/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /app/build.gradle: -------------------------------------------------------------------------------- 1 | apply plugin: 'com.android.application' 2 | apply plugin: 'kotlin-android' 3 | apply plugin: 'kotlin-kapt' 4 | 5 | android { 6 | compileSdkVersion 25 7 | buildToolsVersion rootProject.ext.buildToolsVersion 8 | defaultConfig { 9 | applicationId "net.danlew.counter" 10 | minSdkVersion 23 11 | targetSdkVersion 25 12 | versionCode 1 13 | versionName "1.0" 14 | testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" 15 | } 16 | buildTypes { 17 | release { 18 | minifyEnabled false 19 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 20 | } 21 | } 22 | } 23 | 24 | dependencies { 25 | implementation fileTree(dir: 'libs', include: ['*.jar']) 26 | androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { 27 | exclude group: 'com.android.support', module: 'support-annotations' 28 | }) 29 | implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" 30 | implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}" 31 | implementation "com.android.support:design:${rootProject.ext.supportLibVersion}" 32 | implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}" 33 | implementation 'com.android.support.constraint:constraint-layout:1.1.3' 34 | testImplementation 'junit:junit:4.12' 35 | 36 | implementation "android.arch.lifecycle:extensions:${rootProject.archLifecycleVersion}" 37 | implementation "android.arch.persistence.room:runtime:${rootProject.archRoomVersion}" 38 | implementation "android.arch.persistence.room:rxjava2:${rootProject.archRoomVersion}" 39 | kapt "android.arch.lifecycle:compiler:${rootProject.archLifecycleVersion}" 40 | kapt "android.arch.persistence.room:compiler:${rootProject.archRoomVersion}" 41 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 42 | 43 | String butterKnifeVersion = '8.5.1' 44 | implementation "com.jakewharton:butterknife:$butterKnifeVersion" 45 | kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion" 46 | 47 | implementation 'io.reactivex.rxjava2:rxjava:2.1.0' 48 | 49 | String daggerVersion = '2.10' 50 | implementation "com.google.dagger:dagger:$daggerVersion" 51 | kapt "com.google.dagger:dagger-compiler:$daggerVersion" 52 | 53 | String rxBindingVersion = '2.0.0' 54 | implementation "com.jakewharton.rxbinding2:rxbinding:$rxBindingVersion" 55 | implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxBindingVersion" 56 | 57 | implementation 'com.jakewharton.timber:timber:4.5.1' 58 | 59 | implementation 'com.jakewharton.rxrelay2:rxrelay:2.0.0' 60 | } 61 | 62 | repositories { 63 | mavenCentral() 64 | } 65 | -------------------------------------------------------------------------------- /app/proguard-rules.pro: -------------------------------------------------------------------------------- 1 | # Add project specific ProGuard rules here. 2 | # By default, the flags in this file are appended to flags specified 3 | # in /Users/dlew/code/android/sdk/tools/proguard/proguard-android.txt 4 | # You can edit the include path and order by changing the proguardFiles 5 | # directive in build.gradle. 6 | # 7 | # For more details, see 8 | # http://developer.android.com/guide/developing/tools/proguard.html 9 | 10 | # Add any project specific keep options here: 11 | 12 | # If your project uses WebView with JS, uncomment the following 13 | # and specify the fully qualified class name to the JavaScript interface 14 | # class: 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { 16 | # public *; 17 | #} 18 | 19 | # Uncomment this to preserve the line number information for 20 | # debugging stack traces. 21 | #-keepattributes SourceFile,LineNumberTable 22 | 23 | # If you keep the line number information, uncomment this to 24 | # hide the original source file name. 25 | #-renamesourcefileattribute SourceFile 26 | -------------------------------------------------------------------------------- /app/src/main/AndroidManifest.xml: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/AndroidModule.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter 2 | 3 | import android.content.Context 4 | import dagger.Module 5 | import dagger.Provides 6 | import javax.inject.Singleton 7 | 8 | @Module 9 | class AndroidModule(private val context: Context) { 10 | 11 | @Singleton @Provides fun provideContext(): Context = context 12 | 13 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/AppComponent.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter 2 | 3 | import dagger.Component 4 | import net.danlew.counter.data.DataModule 5 | import net.danlew.counter.ui.CounterViewModel 6 | import javax.inject.Singleton 7 | 8 | @Component( 9 | modules = arrayOf( 10 | AndroidModule::class, 11 | DataModule::class 12 | ) 13 | ) 14 | @Singleton 15 | interface AppComponent { 16 | fun inject(into: CounterViewModel) 17 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/CounterApplication.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter 2 | 3 | import android.app.Application 4 | import timber.log.Timber 5 | 6 | class CounterApplication : Application() { 7 | 8 | val appComponent: AppComponent = DaggerAppComponent.builder() 9 | .androidModule(AndroidModule(this)) 10 | .build() 11 | 12 | override fun onCreate() { 13 | super.onCreate() 14 | 15 | if (BuildConfig.DEBUG) { 16 | Timber.plant(Timber.DebugTree()) 17 | } 18 | } 19 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/data/AppDatabase.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.data 2 | 3 | import android.arch.persistence.room.Database 4 | import android.arch.persistence.room.Room 5 | import android.arch.persistence.room.RoomDatabase 6 | import android.content.Context 7 | 8 | @Database( 9 | entities = arrayOf(Counter::class), 10 | version = 1 11 | ) 12 | abstract class AppDatabase : RoomDatabase() { 13 | 14 | abstract fun counterModel(): CounterDao 15 | 16 | companion object { 17 | private const val DB_NAME = "counter.db" 18 | 19 | fun createInMemoryDatabase(context: Context): AppDatabase 20 | = Room.inMemoryDatabaseBuilder(context.applicationContext, AppDatabase::class.java).build() 21 | 22 | fun createPersistentDatabase(context: Context): AppDatabase 23 | = Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, DB_NAME).build() 24 | } 25 | 26 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/data/Counter.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.data 2 | 3 | import android.arch.persistence.room.Entity 4 | import android.arch.persistence.room.Index 5 | import android.arch.persistence.room.PrimaryKey 6 | 7 | @Entity( 8 | tableName = "counter" 9 | ) 10 | data class Counter ( 11 | @PrimaryKey(autoGenerate = true) val id: Long, 12 | val name: String = "", 13 | val position: Long = 0, 14 | val count: Long = 0 15 | ) 16 | -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/data/CounterChange.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.data 2 | 3 | /** 4 | * Represents requests to change a counter's properties. 5 | */ 6 | sealed class CounterChange { 7 | data class Create(val name: String = "") : CounterChange() 8 | data class Name(val counterId: Long, val name: String) : CounterChange() 9 | data class Count(val counterId: Long, val difference: Long) : CounterChange() 10 | data class Move(val fromCounterId: Long, val toCounterId: Long) : CounterChange() 11 | data class Delete(val counterId: Long) : CounterChange() 12 | data class UndoDelete(val counter: Counter) : CounterChange() 13 | } 14 | -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/data/CounterDao.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.data 2 | 3 | import android.arch.persistence.room.Dao 4 | import android.arch.persistence.room.Delete 5 | import android.arch.persistence.room.Insert 6 | import android.arch.persistence.room.OnConflictStrategy 7 | import android.arch.persistence.room.Query 8 | import io.reactivex.Flowable 9 | 10 | // Note: Kotlin renames params, thus the awkward names 11 | @Dao 12 | abstract class CounterDao { 13 | 14 | companion object { 15 | private const val POSITION_OFFSET = 262144 16 | } 17 | 18 | @Query("SELECT COUNT(*) FROM counter") 19 | abstract fun count(): Int 20 | 21 | @Query("SELECT * FROM counter ORDER BY position") 22 | abstract fun counters(): Flowable> 23 | 24 | @Query("SELECT * FROM counter WHERE id = :id") 25 | abstract fun counter(id: Long): Counter? 26 | 27 | @Query("SELECT position FROM counter WHERE id = :id") 28 | abstract fun position(id: Long): Long 29 | 30 | @Query("SELECT position FROM counter WHERE position < :position ORDER BY position DESC LIMIT 1") 31 | abstract fun previousPosition(position: Long): Long 32 | 33 | @Query("SELECT position FROM counter WHERE position > :position ORDER BY position ASC LIMIT 1") 34 | abstract fun nextPosition(position: Long): Long 35 | 36 | @Query("SELECT position FROM counter ORDER BY position DESC LIMIT 1") 37 | abstract fun lastPosition(): Long 38 | 39 | fun createCounter(name: String) { 40 | insertOrUpdate(Counter(0, name, lastPosition() + POSITION_OFFSET)) 41 | } 42 | 43 | @Query("UPDATE counter " + 44 | "SET count = (count + :difference) " + 45 | "WHERE id = :counterId") 46 | abstract fun modifyCount(counterId: Long, difference: Long) 47 | 48 | @Query("UPDATE counter " + 49 | "SET name = :name " + 50 | "WHERE id = :counterId") 51 | abstract fun modifyName(counterId: Long, name: String) 52 | 53 | @Query("UPDATE counter " + 54 | "SET position = :position " + 55 | "WHERE id = :counterId") 56 | abstract fun modifyPosition(counterId: Long, position: Long) 57 | 58 | // Positioning is done in such a way that we don't have to rewrite the whole db each time you change anything, 59 | // just the single item that is being moved. 60 | fun move(fromCounterId: Long, toCounterId: Long) { 61 | val fromPosition = position(fromCounterId) 62 | val toPosition = position(toCounterId) 63 | 64 | val newPosition: Long 65 | if (fromPosition < toPosition) { 66 | val nextPosition = nextPosition(toPosition) 67 | if (nextPosition == 0L) { 68 | newPosition = toPosition + POSITION_OFFSET 69 | } 70 | else { 71 | newPosition = (nextPosition + toPosition) / 2L 72 | } 73 | } 74 | else { 75 | val previousPosition = previousPosition(toPosition) 76 | if (previousPosition == 0L) { 77 | newPosition = toPosition / 2L 78 | } 79 | else { 80 | newPosition = (previousPosition + toPosition) / 2L 81 | } 82 | } 83 | 84 | modifyPosition(fromCounterId, newPosition) 85 | } 86 | 87 | @Insert(onConflict = OnConflictStrategy.REPLACE) 88 | abstract fun insertOrUpdate(vararg counters: Counter) 89 | 90 | @Delete 91 | abstract fun delete(counter: Counter) 92 | 93 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/data/DataModule.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.data 2 | 3 | import android.content.Context 4 | import dagger.Module 5 | import dagger.Provides 6 | import javax.inject.Singleton 7 | 8 | @Module 9 | class DataModule { 10 | 11 | @Singleton @Provides fun provideAppDatabase(context: Context) = AppDatabase.createPersistentDatabase(context) 12 | 13 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/ui/CounterAdapter.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.ui 2 | 3 | import android.content.Context 4 | import android.support.v7.util.DiffUtil 5 | import android.support.v7.widget.RecyclerView 6 | import android.view.ViewGroup 7 | import com.jakewharton.rxrelay2.PublishRelay 8 | import io.reactivex.Flowable 9 | import io.reactivex.Observable 10 | import io.reactivex.android.schedulers.AndroidSchedulers 11 | import io.reactivex.disposables.Disposable 12 | import net.danlew.counter.data.Counter 13 | import net.danlew.counter.data.CounterChange 14 | 15 | class CounterAdapter(private val context: Context) : RecyclerView.Adapter() { 16 | 17 | private var data: List = emptyList() 18 | 19 | private val changes = PublishRelay.create() 20 | 21 | private val listener = object : CounterViewHolder.Listener { 22 | override fun onCounterChange(counterChange: CounterChange) = changes.accept(counterChange) 23 | } 24 | 25 | init { 26 | setHasStableIds(true) 27 | } 28 | 29 | fun changes(): Observable = changes.hide() 30 | 31 | fun bind(source: Flowable>): Disposable { 32 | data class DataWithDiff(val counters: List, val diff: DiffUtil.DiffResult?) 33 | 34 | return source 35 | .scan(DataWithDiff(emptyList(), null)) { (old), new -> 36 | DataWithDiff(new, DiffUtil.calculateDiff(DiffCallback(old, new))) 37 | } 38 | .observeOn(AndroidSchedulers.mainThread()) 39 | .subscribe { 40 | data = it.counters 41 | if (it.diff != null) { 42 | it.diff.dispatchUpdatesTo(this) 43 | } 44 | else { 45 | notifyDataSetChanged() 46 | } 47 | } 48 | } 49 | 50 | override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = CounterViewHolder(context, parent) 51 | 52 | override fun onBindViewHolder(holder: CounterViewHolder, position: Int) = holder.bind(data[position], listener) 53 | 54 | override fun onViewDetachedFromWindow(holder: CounterViewHolder) = holder.detach() 55 | 56 | override fun getItemCount() = data.size 57 | 58 | override fun getItemId(position: Int) = data[position].id 59 | 60 | fun getPosition(itemId: Long) = data.indexOfFirst { it.id == itemId } 61 | 62 | private class DiffCallback(private val old: List, private val new: List) : DiffUtil.Callback() { 63 | override fun getOldListSize() = old.size 64 | 65 | override fun getNewListSize() = new.size 66 | 67 | override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) 68 | = old[oldItemPosition].id == new[newItemPosition].id 69 | 70 | override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) 71 | = old[oldItemPosition] == new[newItemPosition] 72 | } 73 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/ui/CounterViewHolder.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.ui 2 | 3 | import android.content.Context 4 | import android.support.v7.widget.RecyclerView 5 | import android.text.Editable 6 | import android.text.TextWatcher 7 | import android.view.LayoutInflater 8 | import android.view.ViewGroup 9 | import android.view.inputmethod.EditorInfo 10 | import android.widget.Button 11 | import android.widget.EditText 12 | import android.widget.TextView 13 | import butterknife.BindView 14 | import butterknife.ButterKnife 15 | import net.danlew.counter.R 16 | import net.danlew.counter.data.Counter 17 | import net.danlew.counter.data.CounterChange 18 | 19 | class CounterViewHolder(context: Context, parent: ViewGroup) 20 | : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.counter, parent, false)) { 21 | 22 | companion object { 23 | private val DUMMY_COUNTER = Counter(-1) 24 | } 25 | 26 | @BindView(R.id.counter_name) lateinit var counterName: EditText 27 | @BindView(R.id.count) lateinit var count: TextView 28 | @BindView(R.id.plus_button) lateinit var plusButton: Button 29 | @BindView(R.id.minus_button) lateinit var minusButton: Button 30 | 31 | private var counter: Counter = DUMMY_COUNTER 32 | private lateinit var listener: Listener 33 | 34 | init { 35 | ButterKnife.bind(this, itemView) 36 | 37 | plusButton.setOnClickListener { 38 | listener.onCounterChange(CounterChange.Count(counter.id, 1)) 39 | } 40 | 41 | minusButton.setOnClickListener { 42 | listener.onCounterChange(CounterChange.Count(counter.id, -1)) 43 | } 44 | 45 | counterName.setOnEditorActionListener { v, actionId, event -> 46 | if (actionId == EditorInfo.IME_ACTION_DONE) { 47 | // If you try to clear focus immediately it doesn't work 48 | v.postDelayed({ v.clearFocus() }, 0) 49 | } 50 | false 51 | } 52 | 53 | counterName.addTextChangedListener(object : TextWatcher { 54 | override fun afterTextChanged(s: Editable) 55 | = listener.onCounterChange(CounterChange.Name(counter.id, s.toString())) ?: Unit 56 | 57 | override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit 58 | 59 | override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit 60 | }) 61 | } 62 | 63 | fun bind(counter: Counter, listener: Listener) { 64 | if (this.counter == counter) { 65 | return 66 | } 67 | 68 | this.listener = listener 69 | this.counter = counter 70 | if (counterName.text.toString() != counter.name) { 71 | counterName.setText(counter.name) 72 | } 73 | count.text = counter.count.toString() 74 | } 75 | 76 | fun detach() { 77 | if (counterName.hasFocus()) { 78 | counterName.clearFocus() 79 | } 80 | } 81 | 82 | interface Listener { 83 | fun onCounterChange(counterChange: CounterChange) 84 | } 85 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/ui/CounterViewModel.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.ui 2 | 3 | import android.app.Application 4 | import android.arch.lifecycle.AndroidViewModel 5 | import net.danlew.counter.CounterApplication 6 | import net.danlew.counter.data.AppDatabase 7 | import net.danlew.counter.data.Counter 8 | import javax.inject.Inject 9 | 10 | class CounterViewModel constructor(application: Application) : AndroidViewModel(application) { 11 | 12 | @Inject lateinit var db: AppDatabase 13 | 14 | init { 15 | (application as CounterApplication).appComponent.inject(this) 16 | } 17 | 18 | fun hasCounters() = db.counterModel().count() != 0 19 | 20 | fun counters() = db.counterModel().counters() 21 | 22 | fun createCounter(name: String = "") = db.counterModel().createCounter(name) 23 | 24 | fun undoDelete(counter: Counter) = db.counterModel().insertOrUpdate(counter) 25 | 26 | fun modifyCount(counterId: Long, difference: Long) = db.counterModel().modifyCount(counterId, difference) 27 | 28 | fun modifyName(counterId: Long, name: String) = db.counterModel().modifyName(counterId, name) 29 | 30 | fun move(fromCounterId: Long, toCounterId: Long) = db.counterModel().move(fromCounterId, toCounterId) 31 | 32 | fun delete(counterId: Long): Counter? { 33 | db.counterModel().counter(counterId)?.let { 34 | db.counterModel().delete(it) 35 | return it 36 | } 37 | 38 | return null 39 | } 40 | } -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/ui/MainActivity.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.ui 2 | 3 | import android.arch.lifecycle.ViewModelProviders 4 | import android.os.Bundle 5 | import android.support.design.widget.CoordinatorLayout 6 | import android.support.design.widget.Snackbar 7 | import android.support.v7.app.AppCompatActivity 8 | import android.support.v7.widget.DefaultItemAnimator 9 | import android.support.v7.widget.LinearLayoutManager 10 | import android.support.v7.widget.RecyclerView 11 | import android.support.v7.widget.helper.ItemTouchHelper 12 | import android.support.v7.widget.helper.ItemTouchHelper.DOWN 13 | import android.support.v7.widget.helper.ItemTouchHelper.LEFT 14 | import android.support.v7.widget.helper.ItemTouchHelper.RIGHT 15 | import android.support.v7.widget.helper.ItemTouchHelper.UP 16 | import android.view.View 17 | import butterknife.BindView 18 | import butterknife.ButterKnife 19 | import com.jakewharton.rxbinding2.view.clicks 20 | import com.jakewharton.rxrelay2.PublishRelay 21 | import io.reactivex.android.schedulers.AndroidSchedulers 22 | import io.reactivex.disposables.CompositeDisposable 23 | import io.reactivex.schedulers.Schedulers 24 | import net.danlew.counter.R 25 | import net.danlew.counter.data.CounterChange 26 | import net.danlew.counter.util.plus 27 | import java.util.concurrent.TimeUnit 28 | 29 | class MainActivity : AppCompatActivity() { 30 | 31 | @BindView(R.id.coordinator_layout) lateinit var coordinatorLayout: CoordinatorLayout 32 | @BindView(R.id.recycler_view) lateinit var recyclerView: RecyclerView 33 | @BindView(R.id.create_button) lateinit var createButton: View 34 | 35 | private val layoutManager = LinearLayoutManager(this) 36 | 37 | private val counterAdapter = CounterAdapter(this) 38 | 39 | private lateinit var counterViewModel: CounterViewModel 40 | 41 | private val changeRequestRelay = PublishRelay.create() 42 | 43 | private var startDisposables = CompositeDisposable() 44 | 45 | override fun onCreate(savedInstanceState: Bundle?) { 46 | super.onCreate(savedInstanceState) 47 | setContentView(R.layout.activity_main) 48 | ButterKnife.bind(this) 49 | 50 | counterViewModel = ViewModelProviders.of(this).get(CounterViewModel::class.java) 51 | 52 | recyclerView.layoutManager = layoutManager 53 | recyclerView.adapter = counterAdapter 54 | recyclerView.itemAnimator = DefaultItemAnimator().apply { supportsChangeAnimations = false } 55 | itemTouchHelper.attachToRecyclerView(recyclerView) 56 | 57 | // Always guarantee at least one counter, so the app doesn't open blank on a fresh run 58 | if (savedInstanceState == null) { 59 | counterViewModel.counters() 60 | .take(1) 61 | .subscribe { 62 | if (it.isEmpty()) { 63 | counterViewModel.createCounter() 64 | } 65 | } 66 | } 67 | } 68 | 69 | override fun onStart() { 70 | super.onStart() 71 | 72 | // Ensure all database changes happen off the main thread 73 | startDisposables += changeRequestRelay 74 | .observeOn(Schedulers.io()) 75 | .subscribe(this::onCounterChangeRequested) 76 | 77 | startDisposables += createButton.clicks().map { CounterChange.Create() }.subscribe(changeRequestRelay) 78 | startDisposables += counterAdapter.changes().subscribe(changeRequestRelay) 79 | startDisposables += counterAdapter.bind(counterViewModel.counters()) 80 | 81 | // Detect when new items are added so we can scroll to them 82 | // This is admittedly a bit of a hack 83 | data class ItemIdChanges(val itemIds: Set, val addedItemIds: Set) 84 | 85 | startDisposables += counterViewModel.counters() 86 | .map { counters -> counters.map { it.id }.toSet() } 87 | .distinctUntilChanged() 88 | .scan(ItemIdChanges(emptySet(), emptySet()), { (itemIds), newItemIds -> 89 | // Skip the initial add; we only care about *new* items 90 | if (itemIds.isEmpty()) { 91 | ItemIdChanges(newItemIds, emptySet()) 92 | } 93 | else { 94 | val addedItemIds = newItemIds.toMutableSet() 95 | addedItemIds.removeAll(itemIds) 96 | ItemIdChanges(newItemIds, addedItemIds) 97 | } 98 | }) 99 | .filter { (_, addedItemIds) -> addedItemIds.isNotEmpty() } 100 | .map { (_, addedItemIds) -> addedItemIds.toList()[0] } 101 | .delay(100, TimeUnit.MILLISECONDS) // Give the adapter time to settle 102 | .map { counterAdapter.getPosition(it) } 103 | .filter { it != -1 } 104 | .observeOn(AndroidSchedulers.mainThread()) 105 | .subscribe { layoutManager.smoothScrollToPosition(recyclerView, null, it) } 106 | } 107 | 108 | override fun onStop() { 109 | super.onStop() 110 | startDisposables.clear() 111 | } 112 | 113 | private val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(UP or DOWN, LEFT or RIGHT) { 114 | private var lastFrom: Int = -1 115 | private var lastTo: Int = -1 116 | 117 | override fun onMove(recyclerView: RecyclerView, 118 | source: RecyclerView.ViewHolder, 119 | target: RecyclerView.ViewHolder): Boolean { 120 | val from = counterAdapter.getPosition(source.itemId) 121 | val to = counterAdapter.getPosition(target.itemId) 122 | 123 | // Check if we aren't already in the process of making this swap, since this could be 124 | // fired multiple times while the animation is running 125 | if (lastFrom == from && lastTo == to) { 126 | return false 127 | } 128 | 129 | lastFrom = from 130 | lastTo = to 131 | changeRequestRelay.accept(CounterChange.Move(source.itemId, target.itemId)) 132 | return true 133 | } 134 | 135 | override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) 136 | = changeRequestRelay.accept(CounterChange.Delete(viewHolder.itemId)) 137 | }) 138 | 139 | private fun onCounterChangeRequested(change: CounterChange) { 140 | when (change) { 141 | is CounterChange.Create -> counterViewModel.createCounter(change.name) 142 | is CounterChange.Count -> counterViewModel.modifyCount(change.counterId, change.difference) 143 | is CounterChange.Name -> counterViewModel.modifyName(change.counterId, change.name) 144 | is CounterChange.Move -> counterViewModel.move(change.fromCounterId, change.toCounterId) 145 | is CounterChange.Delete -> { 146 | val counter = counterViewModel.delete(change.counterId) 147 | 148 | if (counter != null) { 149 | val text: CharSequence 150 | if (counter.name.isNotBlank()) { 151 | text = getString(R.string.named_counter_removed, counter.name) 152 | } 153 | else { 154 | text = getString(R.string.counter_removed) 155 | } 156 | 157 | Snackbar.make(coordinatorLayout, text, Snackbar.LENGTH_LONG) 158 | .setAction(R.string.undo, { changeRequestRelay.accept(CounterChange.UndoDelete(counter)) }) 159 | .show() 160 | } 161 | } 162 | is CounterChange.UndoDelete -> counterViewModel.undoDelete(change.counter) 163 | } 164 | } 165 | } 166 | -------------------------------------------------------------------------------- /app/src/main/java/net/danlew/counter/util/RxExt.kt: -------------------------------------------------------------------------------- 1 | package net.danlew.counter.util 2 | 3 | import io.reactivex.disposables.CompositeDisposable 4 | import io.reactivex.disposables.Disposable 5 | 6 | operator fun CompositeDisposable.plus(disposable: Disposable): CompositeDisposable { 7 | add(disposable) 8 | return this 9 | } 10 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_add_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/layout/activity_main.xml: -------------------------------------------------------------------------------- 1 | 2 | 10 | 11 | 19 | 20 | 30 | -------------------------------------------------------------------------------- /app/src/main/res/layout/counter.xml: -------------------------------------------------------------------------------- 1 | 2 | 10 | 11 | 16 | 17 |