From 616468fd4089e8531c0affccf01b858cb4a917a9 Mon Sep 17 00:00:00 2001
From: lanic <listolanic@gmail.com>
Date: Mon, 24 Aug 2020 20:57:11 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=97=90=20onair=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20#103=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app2020/binding/ViewBinding.kt            | 10 ++++++++++
 .../com/droidknights/app2020/data/Session.kt  |  3 ++-
 .../droidknights/app2020/ui/model/Mapper.kt   |  3 ++-
 .../app2020/ui/model/UiSessionModel.kt        |  3 ++-
 .../app/src/main/res/layout/item_session.xml  | 20 ++++++++++++++-----
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
index f21f8c6..b666098 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
@@ -1,5 +1,6 @@
 package com.droidknights.app2020.binding
 
+import android.view.View
 import android.webkit.WebView
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
@@ -19,3 +20,12 @@ fun SwipeRefreshLayout.bindRefreshListener(onRefreshListener: SwipeRefreshLayout
 
 @BindingAdapter("webUrl")
 fun WebView.bindUrl(value: String?) = value?.let(::loadUrl)
+
+@BindingAdapter(value = ["onAir"])
+fun ImageView.setVisibility(onAir: Boolean) {
+    if (onAir) {
+        this.visibility = View.VISIBLE
+    } else {
+        this.visibility = View.INVISIBLE
+    }
+}
diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/data/Session.kt b/androidapp/app/src/main/java/com/droidknights/app2020/data/Session.kt
index 343d316..ccce1f9 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/data/Session.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/data/Session.kt
@@ -9,5 +9,6 @@ data class Session(
     var contents: String? = "",
     var speakerName: String? = "",
     var speakerDesc: String? = "",
-    var speakerProfile: String? = ""
+    var speakerProfile: String? = "",
+    var isLive:Boolean = false
 )
\ No newline at end of file
diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/Mapper.kt b/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/Mapper.kt
index aec1264..6252e64 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/Mapper.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/Mapper.kt
@@ -10,7 +10,8 @@ fun Session.asUiModel() =
         title = title,
         time = time,
         tag = tag?.map { Tag(it, true) },
-        speakerName = speakerName ?: ""
+        speakerName = speakerName ?: "",
+        isLive = isLive
     )
 
 fun Sponsor.asUiModel() =
diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/UiSessionModel.kt b/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/UiSessionModel.kt
index 4fd5625..4a916be 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/UiSessionModel.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/ui/model/UiSessionModel.kt
@@ -7,5 +7,6 @@ data class UiSessionModel(
     val title: String,
     val time: String,
     val tag: List<Tag>?,
-    val speakerName: String
+    val speakerName: String,
+    val isLive:Boolean
 )
diff --git a/androidapp/app/src/main/res/layout/item_session.xml b/androidapp/app/src/main/res/layout/item_session.xml
index d55522b..38306d6 100644
--- a/androidapp/app/src/main/res/layout/item_session.xml
+++ b/androidapp/app/src/main/res/layout/item_session.xml
@@ -13,8 +13,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="15dp"
-        android:paddingTop="15dp"
         android:paddingEnd="15dp"
         tools:background="@android:color/white">
 
@@ -28,7 +26,7 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/cb_alarm"
             app:layout_constraintStart_toEndOf="@+id/tvDate"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tvDate"
             tools:text="1년간 토스 앱의 '홈' 탭을 개발하며 쌓은 Learning Share" />
 
         <CheckBox
@@ -45,19 +43,31 @@
             android:id="@+id/tvDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:text="@{item.time}"
             android:textColor="#00d0a8"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView"
             tools:text="10:45" />
 
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_marginTop="2dp"
+            app:onAir="@{item.isLive}"
+            app:layout_constraintEnd_toEndOf="@+id/tvDate"
+            app:layout_constraintStart_toStartOf="@+id/tvDate"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_onair" />
+
         <TextView
             android:id="@+id/tvSessionSpeakerName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
             android:text="@{@string/session_speaker_name_format(item.speakerName)}"
+            android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="@id/tvMemoTitle"
             app:layout_constraintStart_toStartOf="@id/tvMemoTitle"
             app:layout_constraintTop_toBottomOf="@id/tvMemoTitle"

From 7d585c333fdaf9a73d6c7e171d5e8477fab35488 Mon Sep 17 00:00:00 2001
From: lanic <listolanic@gmail.com>
Date: Mon, 24 Aug 2020 22:00:08 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=97=90=20onair=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20#103=20onAir=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidapp/app/src/main/res/drawable/ic_onair.png | Bin 0 -> 827 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 androidapp/app/src/main/res/drawable/ic_onair.png

diff --git a/androidapp/app/src/main/res/drawable/ic_onair.png b/androidapp/app/src/main/res/drawable/ic_onair.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b4e3d7c657fba8c977c0e2cb075470cbcaabe14
GIT binary patch
literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0`N&hK~zYI?UhStRA&^&f9IP=#cq5-GNTc-RD@tR9g21479~PV=8nWi
zw$>mh3WXM3NVCbpf{WImplG2kT&noUI7k$&Fqw*);3`;Oh#i@GgEWOM+B9?L9v5>P
z!(7v-bm>{$?>qnV|DAK;+zapHU8B;OPW>NR(|DnM7$=uLDn{<Ow$(P9xocZ(V&smS
zv--6!>=(Llhpi*1d<E20XqgQVXlknZ_1K8@Lt|d1ADnEa8{rHvX^h%U1Ep&UBA~A|
z4|0{P)h<T!C^1#tnk<yghbDN`(eVMo;h^%{rh(G67n{;a$IcA7onNeOG#}e!eKMBK
z6koJkiDaQTh)OSji1d$kx5h(&4<mnW1C{^}nhQgRN4s0&UQI3utW~4EjR3!<y(*-=
zm|h(1ZjCozE`AR@1ePxRd*0>{K#;EbJC&0Hy5O$`I}uVKkG-n5w-MlZwLJ(=fY0Vn
z%<B<Qlpg_9WlIQvYAOKStP^#6{mg-u!CT`_*2=ne=DA~M%1$ob(K2{z9F+rgsreE>
zjr<&Rn+gL&ngJ$_d0N-73gDke<az)+p|BWOg33vNN!9B?cdG!ZzCI1y5@Em$VXB_Y
zruonMsV7wzAnyCi0Tg}(h>NrZ6YK(>17-Eu1rUb~f%ZN?%*gV<&H2|hIt36J29}BM
zuLtg-avIS!h#o4pe|{s8FI|CGi&x35TZDRt0{CeF@pXNDv*d1Q0ue3%2<%pn@wwwa
zf!sy;C>o0%Zya5G?-;NG;dY`jaZ39zD(nuD;YIs>&L8K1GO*IkrT4X-9i5CCze|*o
z`0`x{pynVj6sbkKWMri34qN*LJ_epOS0*k@>82MswzUoPEJ9WB?PUI!t8etF=*(=C
z2m>fF71^B37cYh;07zUeo>MrA5)(BACui-L$vo&z9Xrz_hJ3w7`=^_S004>9&^HQ4
zfQTsNnap27<hQz3`<n`-eY5GO;;nu-+03VJZ2UeN<0aS3B~eP{9Txxq002ovPDHLk
FV1g_-e60Wg

literal 0
HcmV?d00001


From 50a4bf5967b31ed13184018514fa0725fbc75bc9 Mon Sep 17 00:00:00 2001
From: takedawon <takedawon@naver.com>
Date: Thu, 3 Sep 2020 17:29:15 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=97=90=20onair=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20#103=20BindingAdapter=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/droidknights/app2020/binding/ViewBinding.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
index b666098..18aa8e5 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
@@ -22,10 +22,10 @@ fun SwipeRefreshLayout.bindRefreshListener(onRefreshListener: SwipeRefreshLayout
 fun WebView.bindUrl(value: String?) = value?.let(::loadUrl)
 
 @BindingAdapter(value = ["onAir"])
-fun ImageView.setVisibility(onAir: Boolean) {
+fun setOnAir(imageView: ImageView, onAir: Boolean) {
     if (onAir) {
-        this.visibility = View.VISIBLE
+        imageView.visibility = View.VISIBLE
     } else {
-        this.visibility = View.INVISIBLE
+        imageView.visibility = View.INVISIBLE
     }
 }

From 31289b8ca73d4fb676aec215bfdb34c2a9e619fa Mon Sep 17 00:00:00 2001
From: takedawon <takedawon@naver.com>
Date: Fri, 4 Sep 2020 00:46:23 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=97=90=20onair=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20#103=20conflict=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app2020/binding/ViewBinding.kt            |  1 +
 .../app/src/main/res/layout/item_session.xml  | 20 +++++++++++++++----
 .../src/main/res/layout/schedule_fragment.xml |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
index baa6b4a..ff7b560 100644
--- a/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
+++ b/androidapp/app/src/main/java/com/droidknights/app2020/binding/ViewBinding.kt
@@ -1,5 +1,6 @@
 package com.droidknights.app2020.binding
 
+import android.view.View
 import android.webkit.WebView
 import android.widget.ImageView
 import android.widget.TextView
diff --git a/androidapp/app/src/main/res/layout/item_session.xml b/androidapp/app/src/main/res/layout/item_session.xml
index 1684030..6062260 100644
--- a/androidapp/app/src/main/res/layout/item_session.xml
+++ b/androidapp/app/src/main/res/layout/item_session.xml
@@ -8,6 +8,7 @@
         <variable
             name="item"
             type="com.droidknights.app2020.ui.model.UiSessionModel" />
+
         <variable
             name="viewModel"
             type="com.droidknights.app2020.ui.schedule.ScheduleViewModel" />
@@ -16,12 +17,12 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:onClick="@{() -> viewModel.onClickItem(item.id)}"
         android:paddingStart="15dp"
         android:paddingTop="10dp"
         android:paddingEnd="15dp"
         android:paddingBottom="5dp"
-        android:background="?attr/selectableItemBackground"
-        android:onClick="@{() -> viewModel.onClickItem(item.id)}"
         tools:background="@android:color/white">
 
         <TextView
@@ -47,17 +48,28 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+
+        <ImageView
+            android:id="@+id/ivLive"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/ic_alarm"
+            app:layout_constraintEnd_toEndOf="@+id/tvDate"
+            app:layout_constraintStart_toStartOf="@+id/tvDate"
+            app:layout_constraintTop_toTopOf="parent"
+            app:onAir="@{item.isLive}" />
+
         <TextView
             android:id="@+id/tvDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="40dp"
             android:gravity="center_horizontal"
+            android:minWidth="40dp"
             android:text="@{item.time}"
             android:textColor="#00d0a8"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ivLive"
             tools:text="10:45" />
 
         <TextView
diff --git a/androidapp/app/src/main/res/layout/schedule_fragment.xml b/androidapp/app/src/main/res/layout/schedule_fragment.xml
index c187d12..e788e6d 100644
--- a/androidapp/app/src/main/res/layout/schedule_fragment.xml
+++ b/androidapp/app/src/main/res/layout/schedule_fragment.xml
@@ -6,7 +6,7 @@
     <data>
         <variable
             name="vm"
-            type="com.droidknights.app2020.ui.schedule.ScheduleEmptyViewModel" />
+            type="com.droidknights.app2020.ui.schedule.Sched0uleEmptyViewModel" />
 
         <variable
             name="scheduleVm"