From c3909eb3e8224cd5c4cb1cd47a86d8a791715edb Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Thu, 18 Jan 2024 18:06:06 +0900
Subject: [PATCH 01/17] feat: add toolbar & navigation bar basic setting
---
.../java/com/smilegate/Easel/MainActivity.kt | 2 +
.../app/src/main/res/layout/activity_main.xml | 44 ++++++++++++++++---
.../src/main/res/layout/fragment_start.xml | 2 +-
.../app/src/main/res/menu/bottom_nav_menu.xml | 24 ++++++++++
.../app/src/main/res/menu/toolbar_menu.xml | 13 ++++++
5 files changed, 79 insertions(+), 6 deletions(-)
create mode 100644 src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
create mode 100644 src/mobile/app/src/main/res/menu/toolbar_menu.xml
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index 25515563..c520db2b 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -30,5 +30,7 @@ class MainActivity : AppCompatActivity() {
isAppearanceLightStatusBars = true
isAppearanceLightNavigationBars = true
}
+
+ window.decorView.setBackgroundColor(ContextCompat.getColor(this, android.R.color.white))
}
}
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index e4292c75..a0a40014 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -8,18 +8,52 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_start.xml b/src/mobile/app/src/main/res/layout/fragment_start.xml
index 7098c178..39b536d8 100644
--- a/src/mobile/app/src/main/res/layout/fragment_start.xml
+++ b/src/mobile/app/src/main/res/layout/fragment_start.xml
@@ -14,7 +14,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
- android:layout_marginTop="156dp"
+ android:layout_marginTop="136dp"
android:layout_marginEnd="24dp"
android:text="@string/start_fragment_headline"
android:textColor="@color/black"
diff --git a/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml b/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 00000000..064452b1
--- /dev/null
+++ b/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/src/mobile/app/src/main/res/menu/toolbar_menu.xml b/src/mobile/app/src/main/res/menu/toolbar_menu.xml
new file mode 100644
index 00000000..e0ff57f2
--- /dev/null
+++ b/src/mobile/app/src/main/res/menu/toolbar_menu.xml
@@ -0,0 +1,13 @@
+
+
+
+
From 7d19b3ef4aeb05e9ab1bf9ff9820b4e9ab2a217d Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Thu, 18 Jan 2024 20:33:25 +0900
Subject: [PATCH 02/17] feat: change constraintLayout into LinearLayout to pix
location & add TimelineFragment
---
.../view/Timeline/TimelineFragment.kt | 60 ++++++++
.../presentation/view/join/AskNameFragment.kt | 3 +
.../view/login/PasswordFragment.kt | 4 +
.../app/src/main/res/layout/activity_main.xml | 76 +++++----
.../src/main/res/layout/fragment_login.xml | 145 +++++++++---------
.../src/main/res/layout/fragment_password.xml | 2 +-
.../src/main/res/layout/fragment_start.xml | 133 ++++++++--------
.../src/main/res/layout/fragment_timeline.xml | 14 ++
.../app/src/main/res/layout/toolbar.xml | 14 ++
.../app/src/main/res/navigation/nav_graph.xml | 20 +++
.../app/src/main/res/values/strings.xml | 2 +
11 files changed, 309 insertions(+), 164 deletions(-)
create mode 100644 src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
create mode 100644 src/mobile/app/src/main/res/layout/fragment_timeline.xml
create mode 100644 src/mobile/app/src/main/res/layout/toolbar.xml
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
new file mode 100644
index 00000000..8319dbe8
--- /dev/null
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
@@ -0,0 +1,60 @@
+package com.smilegate.Easel.presentation.view.Timeline
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.smilegate.Easel.R
+
+// 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"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [TimelineFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class TimelineFragment : Fragment() {
+ // TODO: Rename and change types of parameters
+ private var param1: String? = null
+ private var param2: String? = null
+
+ 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_timeline, 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 TimelineFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ @JvmStatic
+ fun newInstance(param1: String, param2: String) =
+ TimelineFragment().apply {
+ arguments = Bundle().apply {
+ putString(ARG_PARAM1, param1)
+ putString(ARG_PARAM2, param2)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
index 6e3b32d4..dd5fcd62 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
@@ -32,6 +32,9 @@ class AskNameFragment : Fragment() {
navController = findNavController()
+ binding.askNameFragmentJoinBtn.setOnClickListener {
+ navController.navigate(R.id.action_askNameFragment_to_timelineFragment)
+ }
return binding.root
}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
index a43c3673..6291a1a0 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
@@ -43,6 +43,10 @@ class PasswordFragment : Fragment() {
navController.navigate(R.id.action_passwordFragment_to_FindAccountFragment)
}
+ binding.passwordFragmentLoginBtn.setOnClickListener {
+ navController.navigate(R.id.action_passwordFragment_to_timelineFragment)
+ }
+
return binding.root
}
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index a0a40014..536f80d7 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -1,59 +1,75 @@
-
-
+ app:layout_constraintTop_toTopOf="parent">
-
-
+ android:background="@color/white"
+ android:elevation="0dp"
+ app:layout_scrollFlags="scroll|enterAlways"
+ android:minHeight="?attr/actionBarSize"
+ android:orientation="horizontal"
+ app:contentInsetStart="0dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:titleTextColor="@color/black">
+
+
+
-
+
-
+
-
+
+
+
-
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_login.xml b/src/mobile/app/src/main/res/layout/fragment_login.xml
index 09478b0c..fe3c00b0 100644
--- a/src/mobile/app/src/main/res/layout/fragment_login.xml
+++ b/src/mobile/app/src/main/res/layout/fragment_login.xml
@@ -1,5 +1,5 @@
-
-
-
-
+ android:layout_height="match_parent"
+ android:backgroundTint="@color/white">
-
+
+
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textView">
+
-
+
-
+
-
+
-
+
+
-
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_password.xml b/src/mobile/app/src/main/res/layout/fragment_password.xml
index f9035ef1..761ff934 100644
--- a/src/mobile/app/src/main/res/layout/fragment_password.xml
+++ b/src/mobile/app/src/main/res/layout/fragment_password.xml
@@ -15,8 +15,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
- android:text="@string/password_fragment_get_password"
android:enabled="false"
+ android:text="@string/password_fragment_get_password"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/src/mobile/app/src/main/res/layout/fragment_start.xml b/src/mobile/app/src/main/res/layout/fragment_start.xml
index 39b536d8..7f7b763b 100644
--- a/src/mobile/app/src/main/res/layout/fragment_start.xml
+++ b/src/mobile/app/src/main/res/layout/fragment_start.xml
@@ -1,5 +1,5 @@
-
-
+
-
+
-
+
+
+
+
+
-
+
-
+
-
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_timeline.xml b/src/mobile/app/src/main/res/layout/fragment_timeline.xml
new file mode 100644
index 00000000..dc62ed78
--- /dev/null
+++ b/src/mobile/app/src/main/res/layout/fragment_timeline.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mobile/app/src/main/res/layout/toolbar.xml b/src/mobile/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 00000000..f74ca97c
--- /dev/null
+++ b/src/mobile/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/src/mobile/app/src/main/res/navigation/nav_graph.xml b/src/mobile/app/src/main/res/navigation/nav_graph.xml
index 7585e74b..f3fc0741 100644
--- a/src/mobile/app/src/main/res/navigation/nav_graph.xml
+++ b/src/mobile/app/src/main/res/navigation/nav_graph.xml
@@ -47,6 +47,10 @@
android:id="@+id/action_passwordFragment_to_FindAccountFragment"
app:destination="@id/findAccountFragment"/>
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mobile/app/src/main/res/values/strings.xml b/src/mobile/app/src/main/res/values/strings.xml
index 3ca0f3d9..a9acefa0 100644
--- a/src/mobile/app/src/main/res/values/strings.xml
+++ b/src/mobile/app/src/main/res/values/strings.xml
@@ -59,5 +59,7 @@
\@사용자 아이디는 고유한 나만의 아이디입니다. 나중에 언\n제든 바꿀 수 있습니다.
사용자 아이디
가입
+
+ Hello blank fragment
From c8d0b8125d11799426837ac730d09e8eee1b3fe1 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Thu, 18 Jan 2024 23:07:05 +0900
Subject: [PATCH 03/17] feat: edit toolbar navigate icon & actions for
login/join Views
---
.../java/com/smilegate/Easel/MainActivity.kt | 4 +
.../presentation/view/join/AskNameFragment.kt | 9 +++
.../view/join/CreateAccountFragment.kt | 14 ++++
.../view/join/NeedPasswordFragment.kt | 9 +++
.../view/join/ProfileImageFragment.kt | 7 ++
.../view/join/SendCodeFragment.kt | 9 +++
.../presentation/view/join/StartFragment.kt | 12 +++
.../view/login/FindAccountFragment.kt | 9 +++
.../presentation/view/login/LoginFragment.kt | 9 +++
.../view/login/PasswordFragment.kt | 9 +++
.../app/src/main/res/layout/activity_main.xml | 81 +++++++++++--------
11 files changed, 137 insertions(+), 35 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index c520db2b..a37024c3 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -2,6 +2,7 @@ package com.smilegate.Easel
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.core.view.WindowInsetsControllerCompat
import androidx.navigation.NavController
@@ -32,5 +33,8 @@ class MainActivity : AppCompatActivity() {
}
window.decorView.setBackgroundColor(ContextCompat.getColor(this, android.R.color.white))
+
+ val toolbar = findViewById(R.id.toolbar_container)
+ setSupportActionBar(toolbar)
}
}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
index dd5fcd62..8e115ddf 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
@@ -11,6 +11,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import androidx.core.content.ContextCompat
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
@@ -42,6 +43,14 @@ class AskNameFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
binding.askNameFragmentIdField.addTextChangedListener(object : TextWatcher {
// 텍스트 변경 전에 호출되는 메소드
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/CreateAccountFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/CreateAccountFragment.kt
index 4510a188..e2f174c2 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/CreateAccountFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/CreateAccountFragment.kt
@@ -1,6 +1,7 @@
package com.smilegate.Easel.presentation.view.join
import android.graphics.Color
+import android.graphics.PorterDuff
import android.os.Bundle
import android.text.Editable
import android.text.SpannableString
@@ -11,9 +12,13 @@ import android.text.style.ClickableSpan
import android.util.Log
import android.view.LayoutInflater
import android.view.View
+import android.view.View.GONE
import android.view.ViewGroup
import android.view.inputmethod.EditorInfo
+import android.widget.ImageView
import android.widget.Toast
+import android.widget.Toolbar
+import androidx.appcompat.widget.AppCompatImageView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
@@ -62,6 +67,15 @@ class CreateAccountFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ backButton.visibility = GONE
+ }
+
binding.createAccountInfoField.setOnFocusChangeListener { _, hasFocus ->
if (!hasFocus) {
validateEmail()
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
index 2a9b5900..ed0d5269 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
@@ -11,6 +11,7 @@ import android.view.ViewGroup
import android.view.inputmethod.EditorInfo
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.navigation.NavController
@@ -50,6 +51,14 @@ class NeedPasswordFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
binding.needPasswordFragmentPwShowBtn.setOnClickListener {
passwordVisibility()
}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/ProfileImageFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/ProfileImageFragment.kt
index 51074db8..43d2c9ba 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/ProfileImageFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/ProfileImageFragment.kt
@@ -106,6 +106,13 @@ class ProfileImageFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
}
// override fun onDestroyView() {
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/SendCodeFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/SendCodeFragment.kt
index beba7e32..5e2f28e8 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/SendCodeFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/SendCodeFragment.kt
@@ -10,6 +10,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import android.widget.Toast
import androidx.core.content.ContextCompat
import androidx.fragment.app.activityViewModels
@@ -52,6 +53,14 @@ class SendCodeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
// LiveData를 사용하여 데이터 변경 감지
joinViewModel.email.observe(viewLifecycleOwner) { email ->
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
index dd6738fb..b2060abc 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.ImageView
import androidx.fragment.app.Fragment
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
@@ -19,16 +20,27 @@ class StartFragment : Fragment() {
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
+
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.GONE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
binding = FragmentStartBinding.inflate(inflater, container, false)
navController = findNavController()
binding.startFragmentLoginBtn.setOnClickListener {
navController.navigate(R.id.action_startFragment_to_loginFragment)
+ backButton.visibility = View.GONE
}
binding.startFragmentJoinBtn.setOnClickListener {
navController.navigate(R.id.action_startFragment_to_CreateAccountFragment)
+ backButton.visibility = View.VISIBLE
}
return binding.root
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/FindAccountFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/FindAccountFragment.kt
index 9e8138bb..97e943b7 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/FindAccountFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/FindAccountFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.navigation.NavController
@@ -39,6 +40,14 @@ class FindAccountFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
binding.findAccountFragmentInputField.addTextChangedListener(object : TextWatcher {
// 텍스트 변경 전에 호출되는 메소드
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/LoginFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/LoginFragment.kt
index d7b2f128..e2f3fdbf 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/LoginFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/LoginFragment.kt
@@ -10,6 +10,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import androidx.core.content.ContextCompat
import androidx.fragment.app.activityViewModels
import androidx.navigation.NavController
@@ -70,6 +71,14 @@ class LoginFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
binding.loginFragmentInputField.addTextChangedListener(object : TextWatcher {
// 텍스트 변경 전에 호출되는 메소드
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
index 6291a1a0..6c102a3d 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
@@ -54,6 +55,14 @@ class PasswordFragment : Fragment() {
super.onViewCreated(view, savedInstanceState)
Log.d("PasswordFragment", "onViewCreated")
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.VISIBLE
+
+ backButton.setOnClickListener {
+ findNavController().navigateUp()
+ }
+
//LiveData를 사용하여 데이터 변경 감지
loginViewModel.email.observe(viewLifecycleOwner) { email ->
Log.d("PasswordFragment", "email value retrieved: $email")
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index 536f80d7..696742c5 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -9,55 +9,66 @@
android:orientation="vertical"
tools:context=".MainActivity">
-
+ app:layout_constraintTop_toTopOf="parent"
+ app:titleTextColor="@color/black">
-
+
+ android:orientation="horizontal">
-
-
+
-
+
-
+
-
+
-
+
Date: Thu, 18 Jan 2024 23:09:30 +0900
Subject: [PATCH 04/17] feat: setting basic things for timelineFragment
---
.../view/Timeline/TimelineFragment.kt | 64 ++++++-------------
.../presentation/view/join/StartFragment.kt | 4 +-
.../src/main/res/layout/fragment_timeline.xml | 2 +-
3 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
index 8319dbe8..dc05b916 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
@@ -5,56 +5,34 @@ import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
import com.smilegate.Easel.R
+import com.smilegate.Easel.databinding.FragmentStartBinding
-// 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"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [TimelineFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
class TimelineFragment : Fragment() {
- // TODO: Rename and change types of parameters
- private var param1: String? = null
- private var param2: String? = null
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- arguments?.let {
- param1 = it.getString(ARG_PARAM1)
- param2 = it.getString(ARG_PARAM2)
- }
- }
+ private lateinit var binding: FragmentStartBinding
+
+ private lateinit var navController: NavController
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
- ): View? {
- // Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_timeline, container, false)
+ ): View {
+ binding = FragmentStartBinding.inflate(inflater, container, false)
+
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.GONE
+
+ navController = findNavController()
+
+ return binding.root
}
- 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 TimelineFragment.
- */
- // TODO: Rename and change types and number of parameters
- @JvmStatic
- fun newInstance(param1: String, param2: String) =
- TimelineFragment().apply {
- arguments = Bundle().apply {
- putString(ARG_PARAM1, param1)
- putString(ARG_PARAM2, param2)
- }
- }
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
}
-}
\ No newline at end of file
+}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
index b2060abc..89511e73 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/StartFragment.kt
@@ -21,6 +21,8 @@ class StartFragment : Fragment() {
savedInstanceState: Bundle?
): View {
+ binding = FragmentStartBinding.inflate(inflater, container, false)
+
val toolbar = requireActivity().findViewById(R.id.toolbar_container)
val backButton = toolbar.findViewById(R.id.back_btn)
backButton.visibility = View.GONE
@@ -29,8 +31,6 @@ class StartFragment : Fragment() {
findNavController().navigateUp()
}
- binding = FragmentStartBinding.inflate(inflater, container, false)
-
navController = findNavController()
binding.startFragmentLoginBtn.setOnClickListener {
diff --git a/src/mobile/app/src/main/res/layout/fragment_timeline.xml b/src/mobile/app/src/main/res/layout/fragment_timeline.xml
index dc62ed78..b484735d 100644
--- a/src/mobile/app/src/main/res/layout/fragment_timeline.xml
+++ b/src/mobile/app/src/main/res/layout/fragment_timeline.xml
@@ -11,4 +11,4 @@
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
-
\ No newline at end of file
+
From d2437e1b63e8ffa82fd3f98d7115fafe5d90e180 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Thu, 18 Jan 2024 23:27:22 +0900
Subject: [PATCH 05/17] feat: add toolbar icon in TimelineFragment
---
.../Easel/presentation/view/Timeline/TimelineFragment.kt | 9 +++++++--
.../Easel/presentation/view/join/AskNameFragment.kt | 4 ++++
.../Easel/presentation/view/join/NeedPasswordFragment.kt | 2 +-
.../Easel/presentation/view/login/PasswordFragment.kt | 4 ++++
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
index dc05b916..b8d63159 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
@@ -10,9 +10,10 @@ import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
import com.smilegate.Easel.R
import com.smilegate.Easel.databinding.FragmentStartBinding
+import com.smilegate.Easel.databinding.FragmentTimelineBinding
class TimelineFragment : Fragment() {
- private lateinit var binding: FragmentStartBinding
+ private lateinit var binding: FragmentTimelineBinding
private lateinit var navController: NavController
@@ -20,12 +21,16 @@ class TimelineFragment : Fragment() {
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
- binding = FragmentStartBinding.inflate(inflater, container, false)
+ binding = FragmentTimelineBinding.inflate(inflater, container, false)
val toolbar = requireActivity().findViewById(R.id.toolbar_container)
val backButton = toolbar.findViewById(R.id.back_btn)
backButton.visibility = View.GONE
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.VISIBLE
+
navController = findNavController()
return binding.root
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
index 8e115ddf..d002b6c9 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/AskNameFragment.kt
@@ -51,6 +51,10 @@ class AskNameFragment : Fragment() {
findNavController().navigateUp()
}
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.GONE
+
binding.askNameFragmentIdField.addTextChangedListener(object : TextWatcher {
// 텍스트 변경 전에 호출되는 메소드
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
index ed0d5269..2ddd5487 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/join/NeedPasswordFragment.kt
@@ -134,7 +134,7 @@ class NeedPasswordFragment : Fragment() {
private fun validatePassword() {
val password = binding.needPasswordFragmentPwField.text.toString()
- if (password.length < 8) {
+ if (password.length < maxPasswordLength) {
// 비밀번호가 8자 미만인 경우
val pwColorResourceId = ContextCompat.getColor(requireContext(), R.color.Red_200)
binding.needPasswordFragmentPwField.setTextColor(pwColorResourceId)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
index 6c102a3d..ed70c5df 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
@@ -63,6 +63,10 @@ class PasswordFragment : Fragment() {
findNavController().navigateUp()
}
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.GONE
+
//LiveData를 사용하여 데이터 변경 감지
loginViewModel.email.observe(viewLifecycleOwner) { email ->
Log.d("PasswordFragment", "email value retrieved: $email")
From d9eaf3566a15a8b7c56e55871c66fb065ca9e128 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Thu, 18 Jan 2024 23:39:54 +0900
Subject: [PATCH 06/17] feat: create Fragments for add bottom navigation bar
---
.../view/message/MessageFragment.kt | 43 +++++++++++++++++++
.../view/notice/NoticeFragment.kt | 43 +++++++++++++++++++
.../view/search/SearchFragment.kt | 43 +++++++++++++++++++
.../src/main/res/layout/fragment_message.xml | 14 ++++++
.../src/main/res/layout/fragment_notice.xml | 14 ++++++
.../src/main/res/layout/fragment_search.xml | 14 ++++++
6 files changed, 171 insertions(+)
create mode 100644 src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
create mode 100644 src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
create mode 100644 src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
create mode 100644 src/mobile/app/src/main/res/layout/fragment_message.xml
create mode 100644 src/mobile/app/src/main/res/layout/fragment_notice.xml
create mode 100644 src/mobile/app/src/main/res/layout/fragment_search.xml
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
new file mode 100644
index 00000000..4f1d09a9
--- /dev/null
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
@@ -0,0 +1,43 @@
+package com.smilegate.Easel.presentation.view.message
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import com.smilegate.Easel.R
+import com.smilegate.Easel.databinding.FragmentMessageBinding
+import com.smilegate.Easel.databinding.FragmentNoticeBinding
+
+class MessageFragment : Fragment() {
+ private lateinit var binding: FragmentMessageBinding
+
+ private lateinit var navController: NavController
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = FragmentMessageBinding.inflate(inflater, container, false)
+
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.GONE
+
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.VISIBLE
+
+ navController = findNavController()
+
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ }
+}
\ No newline at end of file
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
new file mode 100644
index 00000000..0ddb9904
--- /dev/null
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
@@ -0,0 +1,43 @@
+package com.smilegate.Easel.presentation.view.notice
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import com.smilegate.Easel.R
+import com.smilegate.Easel.databinding.FragmentNoticeBinding
+import com.smilegate.Easel.databinding.FragmentSearchBinding
+
+class NoticeFragment : Fragment() {
+ private lateinit var binding: FragmentNoticeBinding
+
+ private lateinit var navController: NavController
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = FragmentNoticeBinding.inflate(inflater, container, false)
+
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.GONE
+
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.VISIBLE
+
+ navController = findNavController()
+
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ }
+}
\ No newline at end of file
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
new file mode 100644
index 00000000..7a8dc29a
--- /dev/null
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
@@ -0,0 +1,43 @@
+package com.smilegate.Easel.presentation.view.search
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import com.smilegate.Easel.R
+import com.smilegate.Easel.databinding.FragmentSearchBinding
+
+
+class SearchFragment : Fragment() {
+ private lateinit var binding: FragmentSearchBinding
+
+ private lateinit var navController: NavController
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = FragmentSearchBinding.inflate(inflater, container, false)
+
+ val toolbar = requireActivity().findViewById(R.id.toolbar_container)
+ val backButton = toolbar.findViewById(R.id.back_btn)
+ backButton.visibility = View.GONE
+
+ val settingButton = toolbar.findViewById(R.id.else_btn)
+ settingButton.setImageResource(R.drawable.ic_setting)
+ settingButton.visibility = View.VISIBLE
+
+ navController = findNavController()
+
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ }
+}
\ No newline at end of file
diff --git a/src/mobile/app/src/main/res/layout/fragment_message.xml b/src/mobile/app/src/main/res/layout/fragment_message.xml
new file mode 100644
index 00000000..e453588e
--- /dev/null
+++ b/src/mobile/app/src/main/res/layout/fragment_message.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_notice.xml b/src/mobile/app/src/main/res/layout/fragment_notice.xml
new file mode 100644
index 00000000..6aaedf1f
--- /dev/null
+++ b/src/mobile/app/src/main/res/layout/fragment_notice.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/src/mobile/app/src/main/res/layout/fragment_search.xml b/src/mobile/app/src/main/res/layout/fragment_search.xml
new file mode 100644
index 00000000..e96f8244
--- /dev/null
+++ b/src/mobile/app/src/main/res/layout/fragment_search.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
From 556ae48d48bc2ea249d77f7084f6da09876cd0e7 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Fri, 19 Jan 2024 00:09:43 +0900
Subject: [PATCH 07/17] feat: edit activity_main.xml for
toolbar/navbar/fragmentContainer view problem
---
.../java/com/smilegate/Easel/MainActivity.kt | 2 +
.../app/src/main/res/layout/activity_main.xml | 149 ++++++++++--------
.../app/src/main/res/menu/bottom_nav_menu.xml | 6 +-
.../app/src/main/res/navigation/nav_graph.xml | 24 +++
4 files changed, 116 insertions(+), 65 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index a37024c3..6f399368 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -6,7 +6,9 @@ import android.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.core.view.WindowInsetsControllerCompat
import androidx.navigation.NavController
+import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.AppBarConfiguration
import com.smilegate.Easel.databinding.ActivityMainBinding
class MainActivity : AppCompatActivity() {
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index 696742c5..242fcc29 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
+ app:layout_constraintTop_toTopOf="parent">
-
-
+ android:elevation="0dp"
+ android:minHeight="?attr/actionBarSize"
+ android:orientation="horizontal"
+ app:contentInsetStart="0dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:titleTextColor="@color/black">
-
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
+
diff --git a/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml b/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
index 064452b1..25c55d5c 100644
--- a/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/src/mobile/app/src/main/res/menu/bottom_nav_menu.xml
@@ -7,17 +7,17 @@
android:title="@null"/>
- @font/chirp_heavy
- 700
- -0.04
- - 16sp
+ - 20sp
- 14sp
From 877d766d655ef7fa2480efc6f7283d16deb3dcc7 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Fri, 19 Jan 2024 22:33:08 +0900
Subject: [PATCH 12/17] feat: delete sucks itemActiceIndicator
---
src/mobile/app/build.gradle.kts | 3 ++-
.../app/src/main/java/com/smilegate/Easel/MainActivity.kt | 4 ++++
src/mobile/app/src/main/res/layout/activity_main.xml | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/mobile/app/build.gradle.kts b/src/mobile/app/build.gradle.kts
index 27b954ef..2f3f9644 100644
--- a/src/mobile/app/build.gradle.kts
+++ b/src/mobile/app/build.gradle.kts
@@ -74,8 +74,9 @@ dependencies {
//CircleImageView
implementation ("de.hdodenhof:circleimageview:3.1.0")
-
//lottie Animation
implementation("com.airbnb.android:lottie:6.0.0")
+ //bottom navigation bar
+ implementation ("me.majiajie:pager-bottom-tab-strip:2.4.0")
}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index ea23bf48..15f0bcc2 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -12,6 +12,8 @@ import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration
+import com.google.android.material.bottomnavigation.LabelVisibilityMode
+import com.google.android.material.navigation.NavigationBarView
import com.smilegate.Easel.databinding.ActivityMainBinding
class MainActivity : AppCompatActivity() {
@@ -55,6 +57,8 @@ class MainActivity : AppCompatActivity() {
updateIcon(R.id.navigation_home, R.drawable.ic_solid_home)
}
+ binding.navView.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_UNLABELED
+
binding.navView.setOnNavigationItemSelectedListener { item ->
onNavigationItemSelected(item)
}
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index fbed8dc8..27db446e 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -75,13 +75,15 @@
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:backgroundTint="@color/white"
+ app:itemBackground="@color/white"
android:background="#FFFFFF"
app:elevation="0dp"
app:labelVisibilityMode="unlabeled"
- android:visibility="gone"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
+ app:itemIconSize="20dp"
+ app:itemActiveIndicatorStyle="@color/white"
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/bottom_nav_menu" />
From d03f4a7af875ef9ee088270d62feda574ece97ab Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Fri, 19 Jan 2024 22:37:19 +0900
Subject: [PATCH 13/17] feat: clear doubleClicked icon focus issue
---
.../src/main/java/com/smilegate/Easel/MainActivity.kt | 9 ++++-----
src/mobile/app/src/main/res/layout/activity_main.xml | 1 +
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index 15f0bcc2..e16f42cc 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -73,13 +73,13 @@ class MainActivity : AppCompatActivity() {
}
fun onNavigationItemSelected(item: MenuItem): Boolean {
- val currentIconId = item.itemId // 현재 선택된 아이콘 ID
+ val currentIconId = item.itemId
- // 현재 아이콘을 선택한 아이콘으로 변경
- item.setIcon(getSelectedIcon(currentIconId))
+ val selectedIcon = getSelectedIcon(currentIconId)
+ item.setIcon(selectedIcon)
// 이전에 선택된 아이콘 원래 아이콘으로 변경
- if (lastSelectedIconId != 0) {
+ if (lastSelectedIconId != 0 && lastSelectedIconId != currentIconId) {
val lastSelectedItem = binding.navView.menu.findItem(lastSelectedIconId)
lastSelectedItem?.setIcon(getOriginalIcon(lastSelectedIconId))
}
@@ -87,7 +87,6 @@ class MainActivity : AppCompatActivity() {
// 이전에 선택된 아이콘 ID 업데이트
lastSelectedIconId = currentIconId
- // Navigation 처리
when (currentIconId) {
R.id.navigation_home -> {
findNavController(R.id.nav_host_fragment).navigate(R.id.timelineFragment)
diff --git a/src/mobile/app/src/main/res/layout/activity_main.xml b/src/mobile/app/src/main/res/layout/activity_main.xml
index 27db446e..fb111837 100644
--- a/src/mobile/app/src/main/res/layout/activity_main.xml
+++ b/src/mobile/app/src/main/res/layout/activity_main.xml
@@ -78,6 +78,7 @@
app:itemBackground="@color/white"
android:background="#FFFFFF"
app:elevation="0dp"
+ android:visibility="gone"
app:labelVisibilityMode="unlabeled"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
app:layout_constraintBottom_toBottomOf="parent"
From 50e88311f3a25b166aed30b1794701992c269102 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Fri, 19 Jan 2024 22:44:27 +0900
Subject: [PATCH 14/17] chore: add eol
---
.../smilegate/Easel/presentation/view/login/PasswordFragment.kt | 2 +-
.../Easel/presentation/view/message/MessageFragment.kt | 2 +-
.../smilegate/Easel/presentation/view/notice/NoticeFragment.kt | 2 +-
.../smilegate/Easel/presentation/view/search/SearchFragment.kt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
index e348c847..f25da5a8 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/login/PasswordFragment.kt
@@ -158,4 +158,4 @@ class PasswordFragment : Fragment() {
inputMethodManager.hideSoftInputFromWindow(it.windowToken, 0)
}
}
-}
\ No newline at end of file
+}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
index edc3eba9..16f6aaba 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/message/MessageFragment.kt
@@ -74,4 +74,4 @@ class MessageFragment : Fragment() {
private fun isCurrentFragment(): Boolean {
return true
}
-}
\ No newline at end of file
+}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
index 99358bb8..e50c509c 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/notice/NoticeFragment.kt
@@ -78,4 +78,4 @@ class NoticeFragment : Fragment() {
private fun isCurrentFragment(): Boolean {
return true
}
-}
\ No newline at end of file
+}
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
index 1b02610b..d38428df 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/search/SearchFragment.kt
@@ -79,4 +79,4 @@ class SearchFragment : Fragment() {
private fun isCurrentFragment(): Boolean {
return true
}
-}
\ No newline at end of file
+}
From bcf8bc42d6112dd08f2576c6b6aaffdbd3fcbb97 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Sat, 20 Jan 2024 00:13:21 +0900
Subject: [PATCH 15/17] chore: reflect review
---
.../app/src/main/java/com/smilegate/Easel/MainActivity.kt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
index e16f42cc..4f2b6f1c 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/MainActivity.kt
@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
ActivityMainBinding.inflate(layoutInflater)
}
- private var lastSelectedIconId: Int = 0
+ private var lastSelectedIconId: Int? = null
override fun onCreate(savedInstanceState: Bundle?) {
@@ -79,9 +79,9 @@ class MainActivity : AppCompatActivity() {
item.setIcon(selectedIcon)
// 이전에 선택된 아이콘 원래 아이콘으로 변경
- if (lastSelectedIconId != 0 && lastSelectedIconId != currentIconId) {
- val lastSelectedItem = binding.navView.menu.findItem(lastSelectedIconId)
- lastSelectedItem?.setIcon(getOriginalIcon(lastSelectedIconId))
+ if (lastSelectedIconId != null && lastSelectedIconId != currentIconId) {
+ val lastSelectedItem = binding.navView.menu.findItem(lastSelectedIconId!!)
+ lastSelectedItem?.setIcon(getOriginalIcon(lastSelectedIconId!!))
}
// 이전에 선택된 아이콘 ID 업데이트
From 81a4f893fe03fee4e989e98bdf182ec73d7c39e8 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Sat, 20 Jan 2024 00:30:55 +0900
Subject: [PATCH 16/17] chore: reflect review
---
.../java/com/smilegate/Easel/domain/Utils.kt | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/domain/Utils.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/domain/Utils.kt
index 876e435c..449d4aad 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/domain/Utils.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/domain/Utils.kt
@@ -1,7 +1,11 @@
package com.smilegate.Easel.domain
+import android.os.Handler
+import android.os.Looper
import android.view.KeyEvent
import android.view.inputmethod.EditorInfo
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
fun isDoneAction(actionId: Int, event: KeyEvent?): Boolean {
return actionId == EditorInfo.IME_ACTION_DONE ||
@@ -12,3 +16,19 @@ fun isDoneAction(actionId: Int, event: KeyEvent?): Boolean {
fun containsSpaceOrNewline(s: CharSequence?): Boolean {
return s?.contains(" ") == true || s?.contains("\n") == true
}
+
+
+fun handleBackPressed(activity: AppCompatActivity, doubleBackPressed: Boolean): Boolean {
+ var doubleBackPressedVar = doubleBackPressed
+
+ if (doubleBackPressedVar) {
+ // 두 번째 눌림
+ activity.finish()
+ } else {
+ // 2초 내에 두 번 누르지 않으면 초기화
+ Handler(Looper.getMainLooper()).postDelayed({
+ doubleBackPressedVar = false
+ }, 2000)
+ }
+ return true
+}
From 8a2b7c740d985ac24f475880bd4e9fbac6ca1996 Mon Sep 17 00:00:00 2001
From: HeewonP825 <7hwon@naver.com>
Date: Sat, 20 Jan 2024 00:35:50 +0900
Subject: [PATCH 17/17] chore: reflect review
---
.../Easel/presentation/view/Timeline/TimelineFragment.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
index 8a6e7b46..37f22feb 100644
--- a/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
+++ b/src/mobile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.kt
@@ -79,8 +79,8 @@ class TimelineFragment : Fragment() {
false
}
}
+
private fun isCurrentFragment(): Boolean {
return true
}
-
}