|
@@ -1,6 +1,7 @@
|
|
package com.fastest.pass.home.presentation.ui.fragment
|
|
package com.fastest.pass.home.presentation.ui.fragment
|
|
|
|
|
|
import android.os.Bundle
|
|
import android.os.Bundle
|
|
|
|
+import android.util.Log
|
|
import android.view.LayoutInflater
|
|
import android.view.LayoutInflater
|
|
import android.view.View
|
|
import android.view.View
|
|
import android.view.ViewGroup
|
|
import android.view.ViewGroup
|
|
@@ -9,14 +10,18 @@ import androidx.compose.foundation.layout.Box
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
import androidx.compose.foundation.layout.padding
|
|
import androidx.compose.foundation.layout.padding
|
|
import androidx.compose.material.Scaffold
|
|
import androidx.compose.material.Scaffold
|
|
|
|
+import androidx.compose.runtime.collectAsState
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.platform.ComposeView
|
|
import androidx.compose.ui.platform.ComposeView
|
|
import androidx.compose.ui.res.colorResource
|
|
import androidx.compose.ui.res.colorResource
|
|
|
|
+import androidx.fragment.app.activityViewModels
|
|
import androidx.fragment.app.viewModels
|
|
import androidx.fragment.app.viewModels
|
|
|
|
+import androidx.lifecycle.ViewModelProvider
|
|
import com.fastest.pass.BaseFragment
|
|
import com.fastest.pass.BaseFragment
|
|
import com.fastest.pass.R
|
|
import com.fastest.pass.R
|
|
import com.fastest.pass.home.presentation.ui.components.ClickTypeNewItemForm
|
|
import com.fastest.pass.home.presentation.ui.components.ClickTypeNewItemForm
|
|
import com.fastest.pass.home.presentation.ui.components.NewItemFormScreen
|
|
import com.fastest.pass.home.presentation.ui.components.NewItemFormScreen
|
|
|
|
+import com.fastest.pass.home.presentation.viewmodels.AddNewItemsViewModel
|
|
import com.fastest.pass.home.presentation.viewmodels.NewItemFormViewModel
|
|
import com.fastest.pass.home.presentation.viewmodels.NewItemFormViewModel
|
|
import com.fastest.pass.home.utils.NewItemFormNavigation
|
|
import com.fastest.pass.home.utils.NewItemFormNavigation
|
|
import com.fastest.pass.home.utils.NewItemFormRoute
|
|
import com.fastest.pass.home.utils.NewItemFormRoute
|
|
@@ -28,6 +33,7 @@ import javax.inject.Inject
|
|
class NewItemFormFragment : BaseFragment() {
|
|
class NewItemFormFragment : BaseFragment() {
|
|
|
|
|
|
val viewmodel: NewItemFormViewModel by viewModels()
|
|
val viewmodel: NewItemFormViewModel by viewModels()
|
|
|
|
+ val viewmodelAddNewItems: AddNewItemsViewModel by activityViewModels()
|
|
|
|
|
|
@Inject
|
|
@Inject
|
|
lateinit var navigation: NewItemFormNavigation
|
|
lateinit var navigation: NewItemFormNavigation
|
|
@@ -54,7 +60,14 @@ class NewItemFormFragment : BaseFragment() {
|
|
.background(colorResource(id = R.color.white))
|
|
.background(colorResource(id = R.color.white))
|
|
.padding(paddingValues.calculateBottomPadding())
|
|
.padding(paddingValues.calculateBottomPadding())
|
|
) {
|
|
) {
|
|
- NewItemFormScreen { clickTypeNewItemForm ->
|
|
|
|
|
|
+ val screenName = viewmodelAddNewItems.itemScreenName.collectAsState()
|
|
|
|
+ Log.d("test_screen_name", "NIFF::screenName = ${screenName.value}")
|
|
|
|
+
|
|
|
|
+ when (screenName.value) {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ NewItemFormScreen(screenName.value) { clickTypeNewItemForm ->
|
|
when (clickTypeNewItemForm) {
|
|
when (clickTypeNewItemForm) {
|
|
ClickTypeNewItemForm.GO_BACK_ADD_NEW_ITEM -> {
|
|
ClickTypeNewItemForm.GO_BACK_ADD_NEW_ITEM -> {
|
|
viewmodel.navigateTo(NewItemFormRoute.GoBackAddNewItemsScreen)
|
|
viewmodel.navigateTo(NewItemFormRoute.GoBackAddNewItemsScreen)
|