From 0e47f464cf023de6f261900cccaa3b38da2b9883 Mon Sep 17 00:00:00 2001 From: tonywesoly Date: Thu, 4 Aug 2022 19:46:16 +0200 Subject: [PATCH] Create children duties xml --- .idea/misc.xml | 10 +- ...DashboardFragment.kt => DutiesFragment.kt} | 20 +- ...shboardViewModel.kt => DutiesViewModel.kt} | 4 +- .../ic_baseline_calendar_month_24.xml | 5 + .../res/drawable/ic_baseline_person_24.xml | 5 + .../main/res/drawable/ic_baseline_plus.xml | 5 + app/src/main/res/drawable/rb_selector.xml | 15 ++ .../main/res/layout/fragment_dashboard.xml | 22 -- app/src/main/res/layout/fragment_duties.xml | 199 ++++++++++++++++++ .../main/res/layout/fragment_person_card.xml | 1 + .../main/res/navigation/mobile_navigation.xml | 4 +- 11 files changed, 253 insertions(+), 37 deletions(-) rename app/src/main/java/com/lsm/kothlin_app/ui/dashboard/{DashboardFragment.kt => DutiesFragment.kt} (58%) rename app/src/main/java/com/lsm/kothlin_app/ui/dashboard/{DashboardViewModel.kt => DutiesViewModel.kt} (74%) create mode 100644 app/src/main/res/drawable/ic_baseline_calendar_month_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_person_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_plus.xml create mode 100644 app/src/main/res/drawable/rb_selector.xml delete mode 100644 app/src/main/res/layout/fragment_dashboard.xml create mode 100644 app/src/main/res/layout/fragment_duties.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index a97ad67..f55f41a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,13 +5,21 @@ + + + + + + + + - + diff --git a/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardFragment.kt b/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesFragment.kt similarity index 58% rename from app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardFragment.kt rename to app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesFragment.kt index 446d4d4..5a12b87 100644 --- a/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardFragment.kt +++ b/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesFragment.kt @@ -7,11 +7,11 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import com.lsm.kothlin_app.databinding.FragmentDashboardBinding +import com.lsm.kothlin_app.databinding.FragmentDutiesBinding -class DashboardFragment : Fragment() { +class DutiesFragment : Fragment() { - private var _binding: FragmentDashboardBinding? = null + private var _binding: FragmentDutiesBinding? = null // This property is only valid between onCreateView and // onDestroyView. @@ -22,16 +22,16 @@ class DashboardFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - val dashboardViewModel = - ViewModelProvider(this).get(DashboardViewModel::class.java) +// val dutiesViewModel = +// ViewModelProvider(this).get(DutiesViewModel::class.java) - _binding = FragmentDashboardBinding.inflate(inflater, container, false) + _binding = FragmentDutiesBinding.inflate(inflater, container, false) val root: View = binding.root - val textView: TextView = binding.textDashboard - dashboardViewModel.text.observe(viewLifecycleOwner) { - textView.text = it - } +// val textView: TextView = binding.textDashboard +// dutiesViewModel.text.observe(viewLifecycleOwner) { +// textView.text = it +// } return root } diff --git a/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardViewModel.kt b/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesViewModel.kt similarity index 74% rename from app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardViewModel.kt rename to app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesViewModel.kt index bbe6dc2..d50cc60 100644 --- a/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DashboardViewModel.kt +++ b/app/src/main/java/com/lsm/kothlin_app/ui/dashboard/DutiesViewModel.kt @@ -4,10 +4,10 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -class DashboardViewModel : ViewModel() { +class DutiesViewModel : ViewModel() { private val _text = MutableLiveData().apply { - value = "This is dashboard Fragment" + value = "This is duties Fragment" } val text: LiveData = _text } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_calendar_month_24.xml b/app/src/main/res/drawable/ic_baseline_calendar_month_24.xml new file mode 100644 index 0000000..2d2e045 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_calendar_month_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_person_24.xml b/app/src/main/res/drawable/ic_baseline_person_24.xml new file mode 100644 index 0000000..8aedb63 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_person_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_plus.xml b/app/src/main/res/drawable/ic_baseline_plus.xml new file mode 100644 index 0000000..70046c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_plus.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/rb_selector.xml b/app/src/main/res/drawable/rb_selector.xml new file mode 100644 index 0000000..83c0180 --- /dev/null +++ b/app/src/main/res/drawable/rb_selector.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml deleted file mode 100644 index 166ab0e..0000000 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_duties.xml b/app/src/main/res/layout/fragment_duties.xml new file mode 100644 index 0000000..0f71457 --- /dev/null +++ b/app/src/main/res/layout/fragment_duties.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_person_card.xml b/app/src/main/res/layout/fragment_person_card.xml index b2b210d..afacbc8 100644 --- a/app/src/main/res/layout/fragment_person_card.xml +++ b/app/src/main/res/layout/fragment_person_card.xml @@ -18,6 +18,7 @@ android:id="@+id/profile1" android:layout_width="70dp" android:layout_height="70dp" + android:adjustViewBounds="true" android:padding="1.5dp" app:layout_constraintEnd_toStartOf="@+id/heart1" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 032cd13..da9e4e2 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -13,9 +13,9 @@ + tools:layout="@layout/fragment_duties" />