feat: revert presentation rename and remove core, remote module

presentation/build.gradle → app/build.gradle

@@ -77,9 +77,6 @@ android {
 }
 
 dependencies {
-
-    implementation project(':remote')
-    implementation project(':core')
     implementation deps.kotlin.stdlib
 
     implementation deps.jetpack.appCompat
@@ -97,11 +94,22 @@ dependencies {
     implementation deps.androidx.activityKtx
     implementation deps.androidx.fragmentKtx
 
+    implementation deps.glide.core
+    implementation deps.glide.okhttp
+    implementation deps.glide.transformations
+    kapt deps.glide.compiler
+
     implementation deps.rx.core
     implementation deps.rx.android
     implementation deps.rx.kotlin
     implementation deps.rx.relay
 
+    implementation deps.gson
+    implementation deps.retrofit.core
+    implementation deps.retrofit.gson
+    implementation deps.retrofit.rxjava
+    implementation deps.okhttp.logging
+
     implementation deps.firebase.crashlytics
     implementation deps.timber
 

presentation/src/main/kotlin/kr/tooni/tooni/MainActivity.kt → app/src/main/kotlin/kr/tooni/tooni/MainActivity.kt

@@ -1,7 +1,7 @@
 package kr.tooni.tooni
 
 import androidx.activity.viewModels
-import kr.tooni.tooni.core.base.BaseActivity
+import kr.tooni.tooni.base.BaseActivity
 import kr.tooni.tooni.databinding.ActivityMainBinding
 
 class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {

presentation/src/main/kotlin/kr/tooni/tooni/MainViewModel.kt → app/src/main/kotlin/kr/tooni/tooni/MainViewModel.kt

@@ -3,6 +3,6 @@
  */
 package kr.tooni.tooni
 
-import kr.tooni.tooni.core.base.BaseViewModel
+import kr.tooni.tooni.base.BaseViewModel
 
 class MainViewModel : BaseViewModel()

core/src/main/java/kr/tooni/tooni/core/base/BaseActivity.kt → app/src/main/kotlin/kr/tooni/tooni/base/BaseActivity.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.base
+package kr.tooni.tooni.base
 
 import android.os.Bundle
 import androidx.annotation.LayoutRes

core/src/main/java/kr/tooni/tooni/core/base/BaseFragment.kt → app/src/main/kotlin/kr/tooni/tooni/base/BaseFragment.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.base
+package kr.tooni.tooni.base
 
 import android.os.Bundle
 import android.view.LayoutInflater

core/src/main/java/kr/tooni/tooni/core/diff/BaseItemDiffCallback.kt → app/src/main/kotlin/kr/tooni/tooni/base/BaseItemDiffCallback.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.diff
+package kr.tooni.tooni.base
 
 import androidx.recyclerview.widget.DiffUtil
 

core/src/main/java/kr/tooni/tooni/core/base/BaseView.kt → app/src/main/kotlin/kr/tooni/tooni/base/BaseView.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.base
+package kr.tooni.tooni.base
 
 interface BaseView {
     fun initView()

core/src/main/java/kr/tooni/tooni/core/base/BaseViewModel.kt → app/src/main/kotlin/kr/tooni/tooni/base/BaseViewModel.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.base
+package kr.tooni.tooni.base
 
 import androidx.lifecycle.ViewModel
 import io.reactivex.rxjava3.disposables.CompositeDisposable

core/src/main/java/kr/tooni/tooni/core/diff/DiffCallbackItem.kt → app/src/main/kotlin/kr/tooni/tooni/base/DiffCallbackItem.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.diff
+package kr.tooni.tooni.base
 
 import java.io.Serializable
 

core/src/main/java/kr/tooni/tooni/core/extensions/FragmentActivity.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/FragmentActivity.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.content.Context
 import androidx.annotation.ColorRes

core/src/main/java/kr/tooni/tooni/core/extensions/Glide.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/Glide.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView

core/src/main/java/kr/tooni/tooni/core/extensions/ImageView.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/ImageView.kt

@@ -1,12 +1,12 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
-import kr.tooni.tooni.core.R
+import kr.tooni.tooni.R
 
 object ImageViewBindingAdapter {
 

core/src/main/java/kr/tooni/tooni/core/extensions/Primitive.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/Primitive.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.content.Context
 import android.content.res.Resources

core/src/main/java/kr/tooni/tooni/core/extensions/RecyclerView.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/RecyclerView.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView

core/src/main/java/kr/tooni/tooni/core/extensions/Toast.kt → app/src/main/kotlin/kr/tooni/tooni/extensions/Toast.kt

@@ -1,7 +1,7 @@
 /*
  * Created by Leo on 2021. 04. 17 ..
  */
-package kr.tooni.tooni.core.extensions
+package kr.tooni.tooni.extensions
 
 import android.content.Context
 import android.widget.Toast

gradle.properties

@@ -1,19 +1,11 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.configureondemand=true
+kotlin.incremental=true
+kotlin.incremental.usePreciseJavaTracking=true
+android.enableBuildCache=true
 android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
+android.enableJetifier=true
 kotlin.code.style=official

settings.gradle

@@ -1,4 +1,2 @@
 rootProject.name = "tooni-tooni-android"
-include ':presentation'
-include ':remote'
-include ':core'
+include ':app'