(#2) Update notice list UI and model.

app/build.gradle

@@ -30,12 +30,18 @@ android {
             buildConfigField "String", "BASE_URL", "\"\""
         }
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
-    implementation 'com.google.android.material:material:1.0.0-alpha1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation "com.google.android.material:material:1.0.0"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
@@ -54,14 +60,13 @@ dependencies {
     // Android Architecture component
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
-//    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
+    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
     // MvRx + Epoxy + Koin
     implementation "com.airbnb.android:mvrx:$mvrx_version"
     implementation "com.airbnb.android:epoxy:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
-    implementation "org.koin:koin-android:$koin_version"
 
     // Retrofit
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
@@ -88,6 +93,13 @@ dependencies {
     implementation "com.facebook.stetho:stetho:$stetho_version"
     implementation "com.facebook.stetho:stetho-okhttp3:$stetho_version"
 
+    // Koin for Kotlin
+    implementation "org.koin:koin-android:$koin_version"
+    implementation "org.koin:koin-core:$koin_version"
+    implementation "org.koin:koin-core-ext:$koin_version"
+    implementation "org.koin:koin-android:$koin_version"
+    implementation "org.koin:koin-androidx-scope:$koin_version"
+    implementation "org.koin:koin-androidx-viewmodel:$koin_version"
 }
 apply plugin: 'com.google.gms.google-services'
 com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         </activity>
         <activity android:name=".app.home.HomeActivity"/>
         <activity
-            android:name=".app.notice.NoticeActivity"
+            android:name=".notices.NoticesActivity"
             android:label="@string/title_activity_notice"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>

app/src/main/java/com/mashup/MashupApplication.kt

@@ -3,6 +3,9 @@ package com.mashup
 import android.app.Application
 import com.facebook.stetho.Stetho
 import com.jakewharton.threetenabp.AndroidThreeTen
+import com.mashup.notices.noticeModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
 
 class MashupApplication: Application() {
 
@@ -14,7 +17,10 @@ class MashupApplication: Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
-
+        startKoin {
+            androidContext(this@MashupApplication)
+            modules(noticeModule)
+        }
         initJSR310()
 
         if (BuildConfig.DEBUG) {

app/src/main/java/com/mashup/MyApplication.kt

@@ -0,0 +1,17 @@
+package com.mashup
+
+import android.app.Application
+import com.mashup.notices.noticeModule
+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(noticeModule)
+        }
+    }
+}

app/src/main/java/com/mashup/SplashActivity.kt

@@ -5,16 +5,17 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
 import com.mashup.app.auth.LoginActivity
+import com.mashup.notices.NoticesActivity
 
 class SplashActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
         Handler().postDelayed({
-            startActivity(Intent(this, LoginActivity::class.java))
+            startActivity(Intent(this, NoticesActivity::class.java))
             finish()
-        },3000)
+        },2000)
 
     }
 }

app/src/main/java/com/mashup/data/model/Notice.kt

@@ -0,0 +1,14 @@
+package com.mashup.data.model
+
+data class Notice(
+        val pk: Int,
+        val team: Team,
+        val title: String,
+        val author: User,
+        val startAt: String,
+        val duration: String,
+        val address1: String,
+        val address2: String,
+        val description: String,
+        val attendanceSet: ArrayList<NoticeAttendance>
+)

app/src/main/java/com/mashup/data/model/NoticeAttendance.kt

@@ -0,0 +1,8 @@
+package com.mashup.data.model
+
+data class NoticeAttendance(
+        val pk:Int,
+        val user:User,
+        val vote: String,
+        val voteDisplay: String
+)

app/src/main/java/com/mashup/data/model/Period.kt

@@ -0,0 +1,7 @@
+package com.mashup.data.model
+
+data class Period(
+        val pk: Int,
+        val isCurrent: Boolean,
+        val number: Int
+)

app/src/main/java/com/mashup/data/model/Team.kt

@@ -0,0 +1,6 @@
+package com.mashup.data.model
+
+data class Team(
+        val pk: Int,
+        val name: String
+)

app/src/main/java/com/mashup/data/model/User.kt

@@ -0,0 +1,10 @@
+package com.mashup.data.model
+
+data class User(
+        val pk: Int,
+        val name: String,
+        val phoneNumber: String,
+        val email: String,
+        val github: String,
+        val userPeriodTeamSet: ArrayList<UserPeriodTeam>
+)

app/src/main/java/com/mashup/data/model/UserPeriodTeam.kt

@@ -0,0 +1,6 @@
+package com.mashup.data.model
+
+data class UserPeriodTeam(
+        val period: Period,
+        val team: Team
+)

app/src/main/java/com/mashup/notices/NoticeListBindings.kt

@@ -0,0 +1,10 @@
+package com.mashup.notices
+
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.mashup.data.model.Notice
+
+@BindingAdapter("app:items")
+fun setItems(listView: RecyclerView, items: List<Notice>) {
+    (listView.adapter as NoticeAdapter).submitList(items)
+}

app/src/main/java/com/mashup/notices/NoticeModule.kt

@@ -0,0 +1,8 @@
+package com.mashup.notices
+
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+
+val noticeModule = module {
+    viewModel { NoticesViewModel() }
+}

app/src/main/java/com/mashup/notices/NoticesActivity.kt

@@ -0,0 +1,19 @@
+package com.mashup.notices
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.mashup.R
+
+class NoticesActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.notices_activity)
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                    .replace(R.id.container, NoticesFragment.newInstance())
+                    .commitNow()
+        }
+    }
+
+}

app/src/main/java/com/mashup/notices/NoticesAdapter.kt

@@ -0,0 +1,59 @@
+package com.mashup.notices
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.mashup.data.model.Notice
+import com.mashup.databinding.NoticeItemBinding
+
+class NoticeAdapter(private val viewModel: NoticesViewModel) :
+        ListAdapter<Notice, NoticeAdapter.ViewHolder>(TaskDiffCallback()) {
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = getItem(position)
+
+        holder.bind(viewModel, item)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder.from(parent)
+    }
+
+    class ViewHolder private constructor(val binding: NoticeItemBinding) :
+            RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(viewModel: NoticesViewModel, item: Notice) {
+
+            binding.viewmodel = viewModel
+            binding.notice = item
+            binding.executePendingBindings()
+        }
+
+        companion object {
+            fun from(parent: ViewGroup): ViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = NoticeItemBinding.inflate(layoutInflater, parent, false)
+
+                return ViewHolder(binding)
+            }
+        }
+    }
+}
+
+/**
+ * Callback for calculating the diff between two non-null items in a list.
+ *
+ * Used by ListAdapter to calculate the minimum number of changes between and old list and a new
+ * list that's been passed to `submitList`.
+ */
+class TaskDiffCallback : DiffUtil.ItemCallback<Notice>() {
+    override fun areItemsTheSame(oldItem: Notice, newItem: Notice): Boolean {
+        return oldItem.pk == newItem.pk
+    }
+
+    override fun areContentsTheSame(oldItem: Notice, newItem: Notice): Boolean {
+        return oldItem == newItem
+    }
+}

app/src/main/java/com/mashup/notices/NoticesFragment.kt

@@ -0,0 +1,46 @@
+package com.mashup.notices
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.mashup.databinding.NoticesFragmentBinding
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class NoticesFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = NoticesFragment()
+    }
+
+    private val viewModel: NoticesViewModel by viewModel()
+    private lateinit var viewDataBinding: NoticesFragmentBinding
+    private lateinit var listAdapter: NoticeAdapter
+
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View {
+        viewDataBinding = NoticesFragmentBinding.inflate(inflater, container, false).apply {
+            viewmodel = viewModel
+        }
+        return viewDataBinding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        viewDataBinding.setLifecycleOwner(this.viewLifecycleOwner)
+        setupListAdapter()
+    }
+
+    private fun setupListAdapter() {
+        val viewModel = viewDataBinding.viewmodel
+        if (viewModel != null) {
+            listAdapter = NoticeAdapter(viewModel)
+            viewDataBinding.tasksList.adapter = listAdapter
+        }
+    }
+
+}

app/src/main/java/com/mashup/notices/NoticesViewModel.kt

@@ -0,0 +1,43 @@
+package com.mashup.notices
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.mashup.data.model.Notice
+import com.mashup.data.model.Team
+import com.mashup.data.model.User
+
+class NoticesViewModel : ViewModel() {
+    private val _items = MutableLiveData<List<Notice>>().apply { value = emptyList() }
+    val items: LiveData<List<Notice>> = _items
+
+    init {
+        loadNotice()
+    }
+
+    private fun loadNotice() {
+        val user = User(0, "이동근", "010", "ee", "ee", ArrayList())
+        val noticeArray = ArrayList<Notice>()
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+        noticeArray.add(Notice(
+                0, Team(0, "Mash-up"), "전체 회의", user, "2019-10-10", "2시까지", "행신역에서", "", "재밌게 놀아봐요",
+                ArrayList()))
+
+        _items.value = noticeArray
+    }
+
+}

app/src/main/java/com/mashup/util/CollapsibleToolbar.kt

@@ -0,0 +1,20 @@
+package com.mashup.util
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.motion.widget.MotionLayout
+import com.google.android.material.appbar.AppBarLayout
+
+class CollapsibleToolbar @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : MotionLayout(context, attrs, defStyleAttr), AppBarLayout.OnOffsetChangedListener {
+
+    override fun onOffsetChanged(appBarLayout: AppBarLayout?, verticalOffset: Int) {
+        progress = -verticalOffset / appBarLayout?.totalScrollRange?.toFloat()!!
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        (parent as? AppBarLayout)?.addOnOffsetChangedListener(this)
+    }
+}