diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 000000000..b215bbafe --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,114 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 45b565415..88ea3aa1e 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,8 +1,5 @@ - - diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..b589d56e9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c777..105cd60b1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,17 +1,22 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..17dc0e2f6 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 000000000..f8467b458 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 703e5d4b8..36a854c0d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,11 @@ - - + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d8..000000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a7fbdc0e9..2e6177f9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,92 +1,124 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-parcelize' android { - compileSdkVersion 29 + namespace 'com.picpay.desafio.android' + compileSdkVersion 34 + defaultConfig { applicationId "com.picpay.desafio.android" - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion 24 + targetSdkVersion 34 versionCode 1 versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true + } - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + kotlinOptions { + jvmTarget = '17' + } + + testOptions { + animationsDisabled = true } - buildTypes { - debug {} + buildTypes { release { - minifyEnabled true - shrinkResources true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + buildFeatures { + viewBinding true + dataBinding true + } + + kapt { + correctErrorTypes = true + } + compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = '17' } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - implementation "androidx.core:core-ktx:$core_ktx_version" - - implementation "androidx.appcompat:appcompat:$appcompat_version" - implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - - implementation "com.google.android.material:material:$material_version" - - implementation "org.koin:koin-core:$koin_version" - implementation "org.koin:koin-android:$koin_version" - implementation "org.koin:koin-androidx-viewmodel:$koin_version" - - implementation "com.google.dagger:dagger:$dagger_version" - kapt "com.google.dagger:dagger-compiler:$dagger_version" - + ext.kotlin_version = "1.9.10" + def coroutines_version = "1.7.3" + def lifecycle_version = "2.6.2" + def retrofit_version = "2.9.0" + def okhttp_version = "4.12.0" + def picasso_version = "2.71828" + def koin_version = "3.5.3" + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + //androidX + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + androidTestImplementation "androidx.test:core:1.6.1" + + //lifecycle implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + //coroutines implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" - implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" - implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version" - - implementation 'com.google.code.gson:gson:2.8.6' + //koin + implementation "io.insert-koin:koin-android:$koin_version" + //retrofit & OkHttp implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version" implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" - implementation "com.squareup.okhttp3:okhttp:$okhttp_version" - implementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" + implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version" + //picasso e CircleImageView implementation "com.squareup.picasso:picasso:$picasso_version" - implementation "de.hdodenhof:circleimageview:$circleimageview_version" + implementation "de.hdodenhof:circleimageview:3.1.0" + + //room + implementation 'androidx.room:room-runtime:2.7.1' + kapt 'androidx.room:room-compiler:2.6.1' - testImplementation "junit:junit:$junit_version" - testImplementation "org.mockito:mockito-core:$mockito_version" - testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_kotlin_version" - testImplementation "androidx.arch.core:core-testing:$core_testing_version" - implementation "org.koin:koin-test:$koin_version" + //swipeRefresh + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - androidTestImplementation "androidx.test:runner:$test_runner_version" - androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" - androidTestImplementation "androidx.test:core-ktx:$core_ktx_test_version" + //módulos + implementation project(":data") + implementation project(":domain") + + //testes locais + testImplementation 'junit:junit:4.13.2' + testImplementation "app.cash.turbine:turbine:1.0.0" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" + testImplementation "com.squareup.okhttp3:mockwebserver:4.10.0" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.9.10" + + //testes instrumentados + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.10.0" + androidTestImplementation "io.insert-koin:koin-test-junit4:$koin_version" + androidTestImplementation "io.insert-koin:koin-test:$koin_version" + androidTestImplementation "io.insert-koin:koin-android:$koin_version" + androidTestImplementation "androidx.test:runner:1.6.2" + androidTestImplementation "androidx.test:core:1.5.0" } + + + diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml new file mode 100644 index 000000000..286a54e95 --- /dev/null +++ b/app/src/androidTest/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/androidTest/java/com/picpay/desafio/android/MainActivityTest.kt b/app/src/androidTest/java/com/picpay/desafio/android/MainActivityTest.kt index e4a4978eb..e66ff2c8a 100644 --- a/app/src/androidTest/java/com/picpay/desafio/android/MainActivityTest.kt +++ b/app/src/androidTest/java/com/picpay/desafio/android/MainActivityTest.kt @@ -1,68 +1,44 @@ package com.picpay.desafio.android -import androidx.lifecycle.Lifecycle -import androidx.test.core.app.launchActivity +import androidx.test.core.app.ActivityScenario +import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso.onView import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withText -import androidx.test.platform.app.InstrumentationRegistry -import okhttp3.mockwebserver.Dispatcher -import okhttp3.mockwebserver.MockResponse -import okhttp3.mockwebserver.MockWebServer -import okhttp3.mockwebserver.RecordedRequest +import androidx.test.espresso.matcher.ViewMatchers.* +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.picpay.desafio.android.di.testModule +import com.picpay.desafio.android.ui.MainActivity +import org.junit.Before import org.junit.Test - - -class MainActivityTest { - - private val server = MockWebServer() - - private val context = InstrumentationRegistry.getInstrumentation().targetContext - - @Test - fun shouldDisplayTitle() { - launchActivity().apply { - val expectedTitle = context.getString(R.string.title) - - moveToState(Lifecycle.State.RESUMED) - - onView(withText(expectedTitle)).check(matches(isDisplayed())) +import org.junit.runner.RunWith +import org.koin.android.ext.koin.androidContext +import org.koin.core.context.startKoin +import org.koin.core.context.stopKoin +import org.koin.test.KoinTest + + +@RunWith(AndroidJUnit4::class) +class MainActivityTest : KoinTest { + + @Before + fun setup() { + stopKoin() + startKoin { + androidContext(ApplicationProvider.getApplicationContext()) + modules(testModule) } } @Test - fun shouldDisplayListItem() { - server.dispatcher = object : Dispatcher() { - override fun dispatch(request: RecordedRequest): MockResponse { - return when (request.path) { - "/users" -> successResponse - else -> errorResponse - } - } - } - - server.start(serverPort) - - launchActivity().apply { - // TODO("validate if list displays items returned by server") - } + fun testRecyclerViewLoadsUsers() { + ActivityScenario.launch(MainActivity::class.java).use { + Thread.sleep(2000) - server.close() - } - - companion object { - private const val serverPort = 8080 + onView(withId(R.id.recyclerView)) + .check(matches(isDisplayed())) - private val successResponse by lazy { - val body = - "[{\"id\":1001,\"name\":\"Eduardo Santos\",\"img\":\"https://randomuser.me/api/portraits/men/9.jpg\",\"username\":\"@eduardo.santos\"}]" - - MockResponse() - .setResponseCode(200) - .setBody(body) + onView(withText("Maria Silva")) + .check(matches(isDisplayed())) } - - private val errorResponse by lazy { MockResponse().setResponseCode(404) } } } \ No newline at end of file diff --git a/app/src/androidTest/java/com/picpay/desafio/android/di/KoinTestModule.kt b/app/src/androidTest/java/com/picpay/desafio/android/di/KoinTestModule.kt new file mode 100644 index 000000000..de273a0a8 --- /dev/null +++ b/app/src/androidTest/java/com/picpay/desafio/android/di/KoinTestModule.kt @@ -0,0 +1,17 @@ +package com.picpay.desafio.android.di + +import com.picpay.desafio.android.domain.repository.UserRepository +import com.picpay.desafio.android.repository.FakeUserRepository +import com.picpay.desafio.android.ui.UserViewModel +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.dsl.module + +val testModule = module { + single { + FakeUserRepository(shouldFail = false) + } + + viewModel { + UserViewModel(get()) + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/picpay/desafio/android/repository/FakeUserRepository.kt b/app/src/androidTest/java/com/picpay/desafio/android/repository/FakeUserRepository.kt new file mode 100644 index 000000000..433b0e97e --- /dev/null +++ b/app/src/androidTest/java/com/picpay/desafio/android/repository/FakeUserRepository.kt @@ -0,0 +1,27 @@ +package com.picpay.desafio.android.repository + +import com.picpay.desafio.android.domain.model.User +import com.picpay.desafio.android.domain.repository.UserRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow + +class FakeUserRepository( + private val shouldFail: Boolean = false, + initialUsers: List = emptyList() +) : UserRepository { + + private val _users = MutableStateFlow(initialUsers) + override val users: Flow> = _users.asStateFlow() + + override suspend fun refreshUsers() { + if (shouldFail) { + throw RuntimeException("Erro simulado ao tentar carregar os usuários.") + } + + _users.value = listOf( + User(1, "Maria Silva", "https://...", "@mariasilva"), + User(2, "João Santos", "https://...", "@joaosantos") + ) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bdf2ce38..1b39f0cdf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,11 +1,11 @@ + xmlns:tools="http://schemas.android.com/tools"> - + + - - - \ No newline at end of file + + diff --git a/app/src/main/java/com/picpay/desafio/android/MainActivity.kt b/app/src/main/java/com/picpay/desafio/android/MainActivity.kt deleted file mode 100644 index 2447de98d..000000000 --- a/app/src/main/java/com/picpay/desafio/android/MainActivity.kt +++ /dev/null @@ -1,75 +0,0 @@ -package com.picpay.desafio.android - -import android.view.View -import android.widget.ProgressBar -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson -import com.google.gson.GsonBuilder -import okhttp3.OkHttpClient -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory - -class MainActivity : AppCompatActivity(R.layout.activity_main) { - - private lateinit var recyclerView: RecyclerView - private lateinit var progressBar: ProgressBar - private lateinit var adapter: UserListAdapter - - private val url = "https://609a908e0f5a13001721b74e.mockapi.io/picpay/api/" - - private val gson: Gson by lazy { GsonBuilder().create() } - - private val okHttp: OkHttpClient by lazy { - OkHttpClient.Builder() - .build() - } - - private val retrofit: Retrofit by lazy { - Retrofit.Builder() - .baseUrl(url) - .client(okHttp) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - } - - private val service: PicPayService by lazy { - retrofit.create(PicPayService::class.java) - } - - override fun onResume() { - super.onResume() - - recyclerView = findViewById(R.id.recyclerView) - progressBar = findViewById(R.id.user_list_progress_bar) - - adapter = UserListAdapter() - recyclerView.adapter = adapter - recyclerView.layoutManager = LinearLayoutManager(this) - - progressBar.visibility = View.VISIBLE - service.getUsers() - .enqueue(object : Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val message = getString(R.string.error) - - progressBar.visibility = View.GONE - recyclerView.visibility = View.GONE - - Toast.makeText(this@MainActivity, message, Toast.LENGTH_SHORT) - .show() - } - - override fun onResponse(call: Call>, response: Response>) { - progressBar.visibility = View.GONE - - adapter.users = response.body()!! - } - }) - } -} diff --git a/app/src/main/java/com/picpay/desafio/android/MyApplication.kt b/app/src/main/java/com/picpay/desafio/android/MyApplication.kt new file mode 100644 index 000000000..c6e703aa2 --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/MyApplication.kt @@ -0,0 +1,16 @@ +package com.picpay.desafio.android + +import android.app.Application +import com.picpay.desafio.android.di.appModule +import org.koin.android.ext.koin.androidContext +import org.koin.core.context.startKoin + +class MyApplication : Application() { + override fun onCreate() { + super.onCreate() + startKoin { + androidContext(this@MyApplication) + modules(appModule) + } + } +} diff --git a/app/src/main/java/com/picpay/desafio/android/PicPayService.kt b/app/src/main/java/com/picpay/desafio/android/PicPayService.kt deleted file mode 100644 index c26edac1f..000000000 --- a/app/src/main/java/com/picpay/desafio/android/PicPayService.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.picpay.desafio.android - -import retrofit2.Call -import retrofit2.http.GET - - -interface PicPayService { - - @GET("users") - fun getUsers(): Call> -} \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/User.kt b/app/src/main/java/com/picpay/desafio/android/User.kt deleted file mode 100644 index aa28171c9..000000000 --- a/app/src/main/java/com/picpay/desafio/android/User.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.picpay.desafio.android - -import android.os.Parcelable -import com.google.gson.annotations.SerializedName -import kotlinx.android.parcel.Parcelize - -@Parcelize -data class User( - @SerializedName("img") val img: String, - @SerializedName("name") val name: String, - @SerializedName("id") val id: Int, - @SerializedName("username") val username: String -) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/UserListAdapter.kt b/app/src/main/java/com/picpay/desafio/android/UserListAdapter.kt deleted file mode 100644 index 538c98a4a..000000000 --- a/app/src/main/java/com/picpay/desafio/android/UserListAdapter.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.picpay.desafio.android - -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView - -class UserListAdapter : RecyclerView.Adapter() { - - var users = emptyList() - set(value) { - val result = DiffUtil.calculateDiff( - UserListDiffCallback( - field, - value - ) - ) - result.dispatchUpdatesTo(this) - field = value - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserListItemViewHolder { - val view = LayoutInflater.from(parent.context) - .inflate(R.layout.list_item_user, parent, false) - - return UserListItemViewHolder(view) - } - - override fun onBindViewHolder(holder: UserListItemViewHolder, position: Int) { - holder.bind(users[position]) - } - - override fun getItemCount(): Int = users.size -} \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/UserListDiffCallback.kt b/app/src/main/java/com/picpay/desafio/android/UserListDiffCallback.kt deleted file mode 100644 index 7c734d37b..000000000 --- a/app/src/main/java/com/picpay/desafio/android/UserListDiffCallback.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.picpay.desafio.android - -import androidx.recyclerview.widget.DiffUtil -import com.picpay.desafio.android.User - -class UserListDiffCallback( - private val oldList: List, - private val newList: List -) : DiffUtil.Callback() { - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return oldList[oldItemPosition].username.equals(newList[newItemPosition].username) - } - - override fun getOldListSize(): Int { - return oldList.size - } - - override fun getNewListSize(): Int { - return newList.size - } - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return true - } -} \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/UserListItemViewHolder.kt b/app/src/main/java/com/picpay/desafio/android/UserListItemViewHolder.kt deleted file mode 100644 index 1d8240eb3..000000000 --- a/app/src/main/java/com/picpay/desafio/android/UserListItemViewHolder.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.picpay.desafio.android - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import com.squareup.picasso.Callback -import com.squareup.picasso.Picasso -import kotlinx.android.synthetic.main.list_item_user.view.* - -class UserListItemViewHolder( - itemView: View -) : RecyclerView.ViewHolder(itemView) { - - fun bind(user: User) { - itemView.name.text = user.name - itemView.username.text = user.username - itemView.progressBar.visibility = View.VISIBLE - Picasso.get() - .load(user.img) - .error(R.drawable.ic_round_account_circle) - .into(itemView.picture, object : Callback { - override fun onSuccess() { - itemView.progressBar.visibility = View.GONE - } - - override fun onError(e: Exception?) { - itemView.progressBar.visibility = View.GONE - } - }) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/di/AppModule.kt b/app/src/main/java/com/picpay/desafio/android/di/AppModule.kt new file mode 100644 index 000000000..65e4cf954 --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/di/AppModule.kt @@ -0,0 +1,39 @@ +package com.picpay.desafio.android.di + +import androidx.room.Room +import com.picpay.desafio.android.data.api.PicPayService +import com.picpay.desafio.android.data.local.AppDatabase +import com.picpay.desafio.android.data.repository.UserRepositoryImpl +import com.picpay.desafio.android.domain.repository.UserRepository +import com.picpay.desafio.android.ui.UserViewModel +import okhttp3.OkHttpClient +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.dsl.module +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +val appModule = module { + single { + Room.databaseBuilder(get(), AppDatabase::class.java, "picpay-db") + .fallbackToDestructiveMigration(false) + .build() + } + + single { get().userDao() } + + single { + val baseUrl = System.getProperty("baseUrl") + ?: "https://683cfcbc199a0039e9e3df18.mockapi.io/api/v1/" + + Retrofit.Builder() + .baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .client(OkHttpClient.Builder().build()) + .build() + .create(PicPayService::class.java) + } + + single { UserRepositoryImpl(get(), get()) } + + viewModel { UserViewModel(get()) } +} diff --git a/app/src/main/java/com/picpay/desafio/android/ui/MainActivity.kt b/app/src/main/java/com/picpay/desafio/android/ui/MainActivity.kt new file mode 100644 index 000000000..d268ad2cb --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/ui/MainActivity.kt @@ -0,0 +1,93 @@ +package com.picpay.desafio.android.ui + +import android.os.Bundle +import android.util.Log +import android.view.View +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.picpay.desafio.android.R +import com.picpay.desafio.android.databinding.ActivityMainBinding +import com.picpay.desafio.android.domain.model.UiState +import com.picpay.desafio.android.domain.model.User +import com.picpay.desafio.android.ui.adapter.UserListAdapter +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch +import org.koin.androidx.viewmodel.ext.android.viewModel + +class MainActivity : AppCompatActivity() { + + private lateinit var binding: ActivityMainBinding + private val viewModel: UserViewModel by viewModel() + + private val adapter by lazy { UserListAdapter() } + private val layoutManager by lazy { LinearLayoutManager(this) } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + setupRecyclerView() + setupSwipeToRefresh() + observeUiState() + viewModel.loadUsers() + } + + private fun setupRecyclerView() { + binding.recyclerView.apply { + layoutManager = this@MainActivity.layoutManager + setHasFixedSize(true) + adapter = this@MainActivity.adapter + } + } + + private fun setupSwipeToRefresh() { + binding.swipeRefreshLayout.setOnRefreshListener { + viewModel.refreshUsers() + } + } + + private fun observeUiState() { + lifecycleScope.launch { + viewModel.uiState.collectLatest { state -> + when (state) { + is UiState.Loading -> showLoading() + is UiState.Success -> showSuccess(state.users) + is UiState.Error -> showError(state.message) + } + } + } + } + + private fun showLoading() { + binding.apply { + userListProgressBar.visibility = View.VISIBLE + recyclerView.visibility = View.GONE + } + } + + private fun showSuccess(users: List) { + binding.apply { + swipeRefreshLayout.isRefreshing = false + userListProgressBar.visibility = View.GONE + recyclerView.visibility = View.VISIBLE + adapter.submitList(users) + } + } + + private fun showError(message: String?) { + binding.apply { + userListProgressBar.visibility = View.GONE + swipeRefreshLayout.isRefreshing = false + recyclerView.visibility = View.GONE + Toast.makeText( + root.context, + message ?: getString(R.string.error), + Toast.LENGTH_SHORT + ).show() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/picpay/desafio/android/ui/UserViewModel.kt b/app/src/main/java/com/picpay/desafio/android/ui/UserViewModel.kt new file mode 100644 index 000000000..aac2127cd --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/ui/UserViewModel.kt @@ -0,0 +1,54 @@ +package com.picpay.desafio.android.ui + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.picpay.desafio.android.domain.model.UiState +import com.picpay.desafio.android.domain.repository.UserRepository +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch + +class UserViewModel( + private val repository: UserRepository +) : ViewModel() { + + private val _uiState = MutableStateFlow(UiState.Loading) + val uiState: StateFlow = _uiState + + fun loadUsers() { + viewModelScope.launch { + _uiState.value = UiState.Loading + try { + repository.refreshUsers() + + repository.users + .catch { error -> + _uiState.value = UiState.Error(error.message ?: "Erro") + } + .collectLatest { users -> + _uiState.value = UiState.Success(users) + } + + } catch (e: Exception) { + _uiState.value = UiState.Error(e.message ?: "Erro inesperado") + } + } + } + + fun refreshUsers() { + viewModelScope.launch { + _uiState.value = UiState.Loading + try { + repository.refreshUsers() + repository.users.collectLatest { users -> + _uiState.value = UiState.Success(users) + } + } catch (e: Exception) { + _uiState.value = UiState.Error(e.message ?: "Erro") + } + } + } + +} diff --git a/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserDiffCallback.kt b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserDiffCallback.kt new file mode 100644 index 000000000..16ec54a4e --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserDiffCallback.kt @@ -0,0 +1,12 @@ +package com.picpay.desafio.android.ui.adapter + +import androidx.recyclerview.widget.DiffUtil +import com.picpay.desafio.android.domain.model.User + +class UserDiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: User, newItem: User): Boolean = + oldItem.id == newItem.id + + override fun areContentsTheSame(oldItem: User, newItem: User): Boolean = + oldItem == newItem +} diff --git a/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListAdapter.kt b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListAdapter.kt new file mode 100644 index 000000000..87c6e1beb --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListAdapter.kt @@ -0,0 +1,24 @@ +package com.picpay.desafio.android.ui.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import com.picpay.desafio.android.databinding.ListItemUserBinding +import com.picpay.desafio.android.domain.model.User + +class UserListAdapter : + ListAdapter(UserDiffCallback()) { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserListItemViewHolder { + val binding = ListItemUserBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + return UserListItemViewHolder(binding) + } + + override fun onBindViewHolder(holder: UserListItemViewHolder, position: Int) { + holder.bind(getItem(position)) + } +} diff --git a/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListItemViewHolder.kt b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListItemViewHolder.kt new file mode 100644 index 000000000..141d26af3 --- /dev/null +++ b/app/src/main/java/com/picpay/desafio/android/ui/adapter/UserListItemViewHolder.kt @@ -0,0 +1,31 @@ +package com.picpay.desafio.android.ui.adapter + +import androidx.recyclerview.widget.RecyclerView +import com.picpay.desafio.android.databinding.ListItemUserBinding +import com.picpay.desafio.android.domain.model.User +import com.squareup.picasso.Callback +import com.squareup.picasso.Picasso + +class UserListItemViewHolder( + private val binding: ListItemUserBinding +) : RecyclerView.ViewHolder(binding.root) { + + fun bind(user: User) { + binding.name.text = user.name + binding.username.text = user.username + binding.progressBar.visibility = android.view.View.VISIBLE + + Picasso.get() + .load(user.img) + .error(com.picpay.desafio.android.R.drawable.ic_round_account_circle) + .into(binding.picture, object : Callback { + override fun onSuccess() { + binding.progressBar.visibility = android.view.View.GONE + } + + override fun onError(e: Exception?) { + binding.progressBar.visibility = android.view.View.GONE + } + }) + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 487ac549e..1617f268d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,13 @@ - + xmlns:tools="http://schemas.android.com/tools"> - + android:layout_height="match_parent" + android:background="@color/colorPrimaryDark" + tools:context=".MainActivity"> + + - - + app:layout_constraintEnd_toEndOf="parent"> - - - - - - + android:layout_height="match_parent" + tools:listitem="@layout/list_item_user" + android:clipToPadding="false" + android:paddingTop="16dp" + android:paddingBottom="16dp" /> + + + - \ No newline at end of file + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39df3169e..8c65e90b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,5 +2,6 @@ PicPay Contatos Ocorreu um erro. Tente novamente. + Ocorreu um erro. Tente novamente. diff --git a/app/src/test/java/com/picpay/desafio/android/ExampleService.kt b/app/src/test/java/com/picpay/desafio/android/ExampleService.kt deleted file mode 100644 index 0199c5e4a..000000000 --- a/app/src/test/java/com/picpay/desafio/android/ExampleService.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.picpay.desafio.android - -class ExampleService( - private val service: PicPayService -) { - - fun example(): List { - val users = service.getUsers().execute() - - return users.body() ?: emptyList() - } -} \ No newline at end of file diff --git a/app/src/test/java/com/picpay/desafio/android/ExampleServiceTest.kt b/app/src/test/java/com/picpay/desafio/android/ExampleServiceTest.kt deleted file mode 100644 index 843c0e776..000000000 --- a/app/src/test/java/com/picpay/desafio/android/ExampleServiceTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.picpay.desafio.android - -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever -import junit.framework.Assert.assertEquals -import org.junit.Test -import retrofit2.Call -import retrofit2.Response - -class ExampleServiceTest { - - private val api = mock() - - private val service = ExampleService(api) - - @Test - fun exampleTest() { - // given - val call = mock>>() - val expectedUsers = emptyList() - - whenever(call.execute()).thenReturn(Response.success(expectedUsers)) - whenever(api.getUsers()).thenReturn(call) - - // when - val users = service.example() - - // then - assertEquals(users, expectedUsers) - } -} \ No newline at end of file diff --git a/app/src/test/java/com/picpay/desafio/android/repository/FakeUserRepository.kt b/app/src/test/java/com/picpay/desafio/android/repository/FakeUserRepository.kt new file mode 100644 index 000000000..985e5179b --- /dev/null +++ b/app/src/test/java/com/picpay/desafio/android/repository/FakeUserRepository.kt @@ -0,0 +1,34 @@ +package com.picpay.desafio.android.repository + +import com.picpay.desafio.android.domain.model.User +import com.picpay.desafio.android.domain.repository.UserRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow + +class FakeUserRepository : UserRepository { + + var shouldReturnError = false + var mockUsers: List = listOf( + User(1, "User 1", "img1.jpg", "@user1"), + User(2, "User 2", "img2.jpg", "@user2") + ) + var delayInMillis: Long = 0 + + private val _users = MutableStateFlow>(emptyList()) + override val users: Flow> = _users.asStateFlow() + + override suspend fun refreshUsers() { + if (shouldReturnError) { + throw RuntimeException("Erro simulado no refresh") + } + if (delayInMillis > 0) { + kotlinx.coroutines.delay(delayInMillis) + } + _users.value = mockUsers + } + + fun clearData() { + _users.value = emptyList() + } +} \ No newline at end of file diff --git a/app/src/test/java/com/picpay/desafio/android/ui/viewModel/UserViewModelTest.kt b/app/src/test/java/com/picpay/desafio/android/ui/viewModel/UserViewModelTest.kt new file mode 100644 index 000000000..5e17c2584 --- /dev/null +++ b/app/src/test/java/com/picpay/desafio/android/ui/viewModel/UserViewModelTest.kt @@ -0,0 +1,110 @@ +package com.picpay.desafio.android.ui.viewModel + +import app.cash.turbine.test +import com.picpay.desafio.android.domain.model.UiState +import com.picpay.desafio.android.repository.FakeUserRepository +import com.picpay.desafio.android.ui.UserViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.runTest +import kotlinx.coroutines.test.setMain +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import kotlin.test.assertIs +import kotlin.test.assertTrue + +@ExperimentalCoroutinesApi +class UserViewModelTest { + + private val testDispatcher = StandardTestDispatcher() + private lateinit var repository: FakeUserRepository + private lateinit var viewModel: UserViewModel + + @Before + fun setup() { + Dispatchers.setMain(testDispatcher) + repository = FakeUserRepository() + viewModel = UserViewModel(repository) + } + + @After + fun tearDown() { + Dispatchers.resetMain() + } + + @Test + fun `initial state should be Loading`() = runTest { + viewModel.uiState.test { + //estado da viewModel sempre deve ser loading + assertIs(awaitItem()) + cancelAndIgnoreRemainingEvents() + } + } + @Test + fun `loadUsers should emit Success with users`() = runTest { + viewModel.uiState.test { + assertIs(awaitItem()) + + viewModel.loadUsers() + advanceUntilIdle() + + val successState = awaitItem() as UiState.Success + assertEquals(2, successState.users.size) + assertEquals("User 1", successState.users[0].name) + } + } + @Test + fun `refreshUsers should emit Error when repository fails`() = runTest { + //erro proposital no repositorio + repository.shouldReturnError = true + + viewModel.uiState.test { + assertIs(awaitItem()) + + viewModel.refreshUsers() + advanceUntilIdle() + + val errorState = awaitItem() as UiState.Error + assertEquals("Erro simulado no refresh", errorState.message) + } + } + + @Test + fun `should handle empty user list`() = runTest { + repository.mockUsers = emptyList() + + //estado success emitido mesmo com lista vazia + viewModel.uiState.test { + assertIs(awaitItem()) + + viewModel.loadUsers() + advanceUntilIdle() + + val successState = awaitItem() as UiState.Success + assertTrue(successState.users.isEmpty()) + } + } + + @Test + fun `should handle concurrent requests`() = runTest { + //lida com a concorrencia na viewModel + repository.delayInMillis = 500 + + viewModel.uiState.test { + assertIs(awaitItem()) + + viewModel.loadUsers() + viewModel.refreshUsers() + + advanceUntilIdle() + + val lastState = awaitItem() + assertTrue(lastState is UiState.Success || lastState is UiState.Error) + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7d1b94f34..5e6f7ce33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,57 +1,44 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext { - kotlin_version = '1.3.61' - - appcompat_version = '1.1.0' - core_ktx_version = '1.2.0' - core_testing_version = '2.1.0' - constraintlayout_version = '1.1.3' - material_version = "1.1.0" - moshi_version = '1.8.0' - retrofit_version = '2.7.1' - okhttp_version = '4.3.1' - picasso_version = '2.71828' - circleimageview_version = '3.0.0' - - junit_version = '4.12' - mockito_version = '2.27.0' - mockito_kotlin_version = '2.1.0' - - test_runner_version = '1.1.1' - espresso_version = '3.1.1' - - koin_version = "2.0.1" - dagger_version = "2.23.2" - lifecycle_version = "2.2.0" - coroutines_version = "1.3.3" - rxjava_version = "2.2.17" - rxandroid_version = "2.1.1" - core_ktx_test_version = "1.2.0" + kotlin_version = '1.9.10' + koin_version = '3.5.3' + retrofit_version = '2.9.0' + okhttp_version = '5.0.0-alpha.11' + picasso_version = '2.8' + coroutines_version = '1.7.3' + lifecycle_version = '2.7.0' } repositories { google() - jcenter() - + mavenCentral() } + dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:8.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } allprojects { repositories { google() - jcenter() + mavenCentral() + maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx/maven" } + } +} +subprojects { + configurations.all { + resolutionStrategy.eachDependency { details -> + if (details.requested.group == "org.jetbrains.kotlin") { + details.useVersion("1.9.10") + } + } } } + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/data/.gitignore b/data/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/data/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/data/build.gradle b/data/build.gradle new file mode 100644 index 000000000..4c6026a43 --- /dev/null +++ b/data/build.gradle @@ -0,0 +1,62 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'kotlin-parcelize' +} + +android { + namespace 'com.picpay.desafio.android.data' + compileSdk 34 + + defaultConfig { + minSdk 24 + + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = '17' + } +} + +dependencies { + //room + implementation "androidx.room:room-runtime:2.6.1" + kapt "androidx.room:room-compiler:2.6.1" + implementation "androidx.room:room-ktx:2.6.1" + + //retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //okHttp + implementation "com.squareup.okhttp3:okhttp:4.12.0" + implementation "com.squareup.okhttp3:logging-interceptor:4.12.0" + + //coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" + + //gson + implementation "com.google.code.gson:gson:2.10.1" + + //parcelize + implementation "org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10" + + //testes + testImplementation 'junit:junit:4.13.2' + + //import module domain + implementation project(":domain") +} \ No newline at end of file diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/data/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 \ No newline at end of file diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml new file mode 100644 index 000000000..a5918e68a --- /dev/null +++ b/data/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/data/src/main/java/com/picpay/desafio/android/data/api/PicPayService.kt b/data/src/main/java/com/picpay/desafio/android/data/api/PicPayService.kt new file mode 100644 index 000000000..20dca89be --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/api/PicPayService.kt @@ -0,0 +1,8 @@ +package com.picpay.desafio.android.data.api + +import retrofit2.http.GET + +interface PicPayService { + @GET("users") + suspend fun getUsers(): List +} \ No newline at end of file diff --git a/data/src/main/java/com/picpay/desafio/android/data/api/UserDTO.kt b/data/src/main/java/com/picpay/desafio/android/data/api/UserDTO.kt new file mode 100644 index 000000000..c54033490 --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/api/UserDTO.kt @@ -0,0 +1,10 @@ +package com.picpay.desafio.android.data.api + +import com.google.gson.annotations.SerializedName + +data class UserDTO( + @SerializedName("id") val id: Int? = null, + @SerializedName("name") val name: String? = null, + @SerializedName("img") val img: String? = null, + @SerializedName("username") val username: String? = null +) diff --git a/data/src/main/java/com/picpay/desafio/android/data/local/AppDatabase.kt b/data/src/main/java/com/picpay/desafio/android/data/local/AppDatabase.kt new file mode 100644 index 000000000..6d5cd8dfe --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/local/AppDatabase.kt @@ -0,0 +1,13 @@ +package com.picpay.desafio.android.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase + +@Database( + entities = [UserEntity::class], + version = 1, + exportSchema = false +) +abstract class AppDatabase : RoomDatabase() { + abstract fun userDao(): UserDao +} diff --git a/data/src/main/java/com/picpay/desafio/android/data/local/DataLocal.kt b/data/src/main/java/com/picpay/desafio/android/data/local/DataLocal.kt new file mode 100644 index 000000000..b7099cbbb --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/local/DataLocal.kt @@ -0,0 +1,16 @@ +package com.picpay.desafio.android.data.local + +import androidx.room.Entity +import androidx.room.PrimaryKey +import com.picpay.desafio.android.domain.model.User + +@Entity(tableName = "user") +data class UserEntity( + @PrimaryKey val id: Int, + val name: String, + val username: String, + val img: String +) + +fun UserEntity.toUser() = User(id, name, img, username) +fun User.toEntity() = UserEntity(id, name, username, img) diff --git a/data/src/main/java/com/picpay/desafio/android/data/local/UserDao.kt b/data/src/main/java/com/picpay/desafio/android/data/local/UserDao.kt new file mode 100644 index 000000000..5592667f2 --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/local/UserDao.kt @@ -0,0 +1,19 @@ +package com.picpay.desafio.android.data.local + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import kotlinx.coroutines.flow.Flow + +@Dao +interface UserDao { + @Query("SELECT * FROM user") + fun observeAll(): Flow> + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertAll(users: List) + + @Query("DELETE FROM user") + suspend fun clearAll() +} diff --git a/data/src/main/java/com/picpay/desafio/android/data/local/UserEntityMapper.kt b/data/src/main/java/com/picpay/desafio/android/data/local/UserEntityMapper.kt new file mode 100644 index 000000000..291bf3aa2 --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/local/UserEntityMapper.kt @@ -0,0 +1,9 @@ +package com.picpay.desafio.android.data.local + +import com.picpay.desafio.android.data.api.UserDTO +import com.picpay.desafio.android.domain.model.User + +fun UserDTO.toUser(): User? { + if (id == null || name == null || img == null || username == null) return null + return User(id, name, img, username) +} diff --git a/data/src/main/java/com/picpay/desafio/android/data/repository/UserRepositoryImpl.kt b/data/src/main/java/com/picpay/desafio/android/data/repository/UserRepositoryImpl.kt new file mode 100644 index 000000000..dd61a1270 --- /dev/null +++ b/data/src/main/java/com/picpay/desafio/android/data/repository/UserRepositoryImpl.kt @@ -0,0 +1,29 @@ +package com.picpay.desafio.android.data.repository + +import com.picpay.desafio.android.data.api.PicPayService +import com.picpay.desafio.android.data.local.UserDao +import com.picpay.desafio.android.data.local.toEntity +import com.picpay.desafio.android.data.local.toUser +import com.picpay.desafio.android.domain.model.User +import com.picpay.desafio.android.domain.repository.UserRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +class UserRepositoryImpl( + private val service: PicPayService, + private val dao: UserDao +) : UserRepository { + + override val users: Flow> = dao.observeAll() + .map { list -> list.map { it.toUser() } } + + override suspend fun refreshUsers() { + val remote = service.getUsers() + dao.clearAll() + val entities = remote.mapNotNull { dto -> + dto.toUser()?.toEntity() + } + + dao.insertAll(entities) + } +} diff --git a/data/src/test/java/com/picpay/desafio/android/data/ExampleUnitTest.kt b/data/src/test/java/com/picpay/desafio/android/data/ExampleUnitTest.kt new file mode 100644 index 000000000..e2862dd28 --- /dev/null +++ b/data/src/test/java/com/picpay/desafio/android/data/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.picpay.desafio.android.data + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/domain/.gitignore b/domain/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/domain/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle new file mode 100644 index 000000000..73a5de73d --- /dev/null +++ b/domain/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-parcelize' +} + +android { + namespace 'com.picpay.desafio.android.domain' + compileSdk 34 + + defaultConfig { + minSdk 24 + + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = '17' + } +} + +dependencies { + //coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" + + //parcelize + implementation "androidx.annotation:annotation:1.7.0" + implementation "org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.10" + + //gson + implementation "com.google.code.gson:gson:2.10.1" + + //testes + testImplementation 'junit:junit:4.13.2' +} \ No newline at end of file diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/domain/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 \ No newline at end of file diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml new file mode 100644 index 000000000..a5918e68a --- /dev/null +++ b/domain/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/domain/src/main/java/com/picpay/desafio/android/domain/model/UiState.kt b/domain/src/main/java/com/picpay/desafio/android/domain/model/UiState.kt new file mode 100644 index 000000000..59f374b20 --- /dev/null +++ b/domain/src/main/java/com/picpay/desafio/android/domain/model/UiState.kt @@ -0,0 +1,7 @@ +package com.picpay.desafio.android.domain.model + +sealed class UiState { + data object Loading : UiState() + data class Success(val users: List) : UiState() + data class Error(val message: String? = null) : UiState() +} diff --git a/domain/src/main/java/com/picpay/desafio/android/domain/model/User.kt b/domain/src/main/java/com/picpay/desafio/android/domain/model/User.kt new file mode 100644 index 000000000..ece7c1dc8 --- /dev/null +++ b/domain/src/main/java/com/picpay/desafio/android/domain/model/User.kt @@ -0,0 +1,12 @@ +package com.picpay.desafio.android.domain.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +data class User( + val id: Int, + val name: String, + val img: String, + val username: String +) : Parcelable diff --git a/domain/src/main/java/com/picpay/desafio/android/domain/repository/UserRepository.kt b/domain/src/main/java/com/picpay/desafio/android/domain/repository/UserRepository.kt new file mode 100644 index 000000000..a3d3dface --- /dev/null +++ b/domain/src/main/java/com/picpay/desafio/android/domain/repository/UserRepository.kt @@ -0,0 +1,9 @@ +package com.picpay.desafio.android.domain.repository + +import com.picpay.desafio.android.domain.model.User +import kotlinx.coroutines.flow.Flow + +interface UserRepository { + val users: Flow> + suspend fun refreshUsers() +} diff --git a/domain/src/test/java/com/picpay/desafio/android/domain/ExampleUnitTest.kt b/domain/src/test/java/com/picpay/desafio/android/domain/ExampleUnitTest.kt new file mode 100644 index 000000000..4fd93ccd3 --- /dev/null +++ b/domain/src/test/java/com/picpay/desafio/android/domain/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.picpay.desafio.android.domain + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 23339e0df..1a09d258e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,7 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.experimental.androidTest.useUnifiedTestPlatform=false + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5..7454180f2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 31680f1d6..59bc51a20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Feb 16 19:36:17 BRT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d51..c53aefaa5 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162f..107acd32c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index e7b4def49..8489f67b7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ include ':app' +include ':domain' +include ':data'