Merge branch 'develop'

DSM-DMS · Apr 19, 2021 · 1355fc2 · 1355fc2
2 parents a877a3a + ec7c501
commit 1355fc2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/features/build.gradle b/features/build.gradle
@@ -18,8 +18,8 @@ android {
         multiDexEnabled true
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 32
-        versionName "v1.1.5"
+        versionCode 33
+        versionName "v1.1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/features/src/main/java/com/dms/sms/feature/schedule/ui/SchoolScheduleFragment.kt b/features/src/main/java/com/dms/sms/feature/schedule/ui/SchoolScheduleFragment.kt
@@ -1,8 +1,6 @@
 package com.dms.sms.feature.schedule.ui
 
-import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -29,6 +27,7 @@ class SchoolScheduleFragment : BackPressedBaseFragment<FragmentSchoolScheduleBin
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewLifecycleOwner.lifecycle.addObserver(viewModel)
+        viewModel.onCreate()
         initView()
     }
 

diff --git a/features/src/main/java/com/dms/sms/feature/schedule/viewmodel/SchoolScheduleViewModel.kt b/features/src/main/java/com/dms/sms/feature/schedule/viewmodel/SchoolScheduleViewModel.kt
@@ -1,7 +1,8 @@
 package com.dms.sms.feature.schedule.viewmodel
 
-import android.util.Log
-import androidx.lifecycle.*
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import com.dms.domain.base.Error
 import com.dms.domain.base.Result
 import com.dms.domain.schedule.entity.Schedules
@@ -38,7 +39,6 @@ class SchoolScheduleViewModel(private val getScheduleUseCase: GetScheduleUseCase
 
     val onClickTimeTableSwitch = SingleLiveEvent<Unit>()
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun onCreate() {
         _currentYear.value = getCurrentDate().year
         _currentMonth.value = getCurrentDate().month