From 998834376513ef7b347b14a8583990a5dc66e891 Mon Sep 17 00:00:00 2001 From: hangunhee39 Date: Thu, 11 Jan 2024 19:51:54 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20home=20ui=20=EA=B5=AC=ED=98=84=20/?= =?UTF-8?q?=20ARCH-124?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/home/HomeFragment.kt | 60 +--- .../presentation/ui/home/HomeViewModel.kt | 5 + .../presentation/ui/home/HomeViewModelImpl.kt | 13 + .../main/res/drawable/corner_radius_18.xml | 5 + .../main/res/drawable/corner_radius_22.xml | 5 + .../main/res/drawable/ic_alarm_main_24.xml | 30 ++ .../main/res/drawable/ic_alarm_on_main_24.xml | 33 +++ .../app/src/main/res/layout/fragment_home.xml | 268 +++++++++++++++++- .../app/src/main/res/values/colors.xml | 3 + 9 files changed, 360 insertions(+), 62 deletions(-) create mode 100644 frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModel.kt create mode 100644 frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModelImpl.kt create mode 100644 frontend/ARchive/app/src/main/res/drawable/corner_radius_18.xml create mode 100644 frontend/ARchive/app/src/main/res/drawable/corner_radius_22.xml create mode 100644 frontend/ARchive/app/src/main/res/drawable/ic_alarm_main_24.xml create mode 100644 frontend/ARchive/app/src/main/res/drawable/ic_alarm_on_main_24.xml diff --git a/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeFragment.kt b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeFragment.kt index cb892552f..a4f868cf0 100644 --- a/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeFragment.kt +++ b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeFragment.kt @@ -1,60 +1,16 @@ package com.droidblossom.archive.presentation.ui.home -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup +import androidx.fragment.app.viewModels import com.droidblossom.archive.R +import com.droidblossom.archive.databinding.FragmentHomeBinding +import com.droidblossom.archive.presentation.base.BaseFragment +import dagger.hilt.android.AndroidEntryPoint -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" +@AndroidEntryPoint +class HomeFragment : BaseFragment(R.layout.fragment_home) { -/** - * A simple [Fragment] subclass. - * Use the [HomeFragment.newInstance] factory method to - * create an instance of this fragment. - */ -class HomeFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null + override val viewModel: HomeViewModelImpl by viewModels() - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_home, container, false) - } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment HomeFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - HomeFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } + override fun observeData() { } } \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModel.kt b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModel.kt new file mode 100644 index 000000000..054baea6e --- /dev/null +++ b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModel.kt @@ -0,0 +1,5 @@ +package com.droidblossom.archive.presentation.ui.home + +interface HomeViewModel { + +} \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModelImpl.kt b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModelImpl.kt new file mode 100644 index 000000000..f9d0c80d8 --- /dev/null +++ b/frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/ui/home/HomeViewModelImpl.kt @@ -0,0 +1,13 @@ +package com.droidblossom.archive.presentation.ui.home + +import com.droidblossom.archive.presentation.base.BaseViewModel +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class HomeViewModelImpl @Inject constructor( + +) : BaseViewModel(), HomeViewModel { + + +} \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/res/drawable/corner_radius_18.xml b/frontend/ARchive/app/src/main/res/drawable/corner_radius_18.xml new file mode 100644 index 000000000..cead1e45b --- /dev/null +++ b/frontend/ARchive/app/src/main/res/drawable/corner_radius_18.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/res/drawable/corner_radius_22.xml b/frontend/ARchive/app/src/main/res/drawable/corner_radius_22.xml new file mode 100644 index 000000000..25e3ecfd7 --- /dev/null +++ b/frontend/ARchive/app/src/main/res/drawable/corner_radius_22.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/res/drawable/ic_alarm_main_24.xml b/frontend/ARchive/app/src/main/res/drawable/ic_alarm_main_24.xml new file mode 100644 index 000000000..242d5c476 --- /dev/null +++ b/frontend/ARchive/app/src/main/res/drawable/ic_alarm_main_24.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/frontend/ARchive/app/src/main/res/drawable/ic_alarm_on_main_24.xml b/frontend/ARchive/app/src/main/res/drawable/ic_alarm_on_main_24.xml new file mode 100644 index 000000000..967a7a1b4 --- /dev/null +++ b/frontend/ARchive/app/src/main/res/drawable/ic_alarm_on_main_24.xml @@ -0,0 +1,33 @@ + + + + + + + diff --git a/frontend/ARchive/app/src/main/res/layout/fragment_home.xml b/frontend/ARchive/app/src/main/res/layout/fragment_home.xml index 8dd85a6cb..a576a3e3c 100644 --- a/frontend/ARchive/app/src/main/res/layout/fragment_home.xml +++ b/frontend/ARchive/app/src/main/res/layout/fragment_home.xml @@ -1,15 +1,263 @@ - + - + + + + + + + android:background="@android:color/holo_green_dark" + tools:context=".presentation.ui.home.HomeFragment"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/frontend/ARchive/app/src/main/res/values/colors.xml b/frontend/ARchive/app/src/main/res/values/colors.xml index 4be005fbe..a093faa8b 100644 --- a/frontend/ARchive/app/src/main/res/values/colors.xml +++ b/frontend/ARchive/app/src/main/res/values/colors.xml @@ -21,4 +21,7 @@ #FF2E2E2E #FF1C1C1C + + #B3FFFFFF + #99FFFFFF \ No newline at end of file