Merge branch 'develop' into feat-badge-chip

# Conflicts:
#	app/src/main/res/values/attrs.xml

app/src/main/AndroidManifest.xml

@@ -17,10 +17,39 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
 
+        <activity
+            android:name=".presentation.ui.dummy.DummyActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".presentation.ui.dummy.DummyCustomDEditTextActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity"/>
+
+        <activity
+            android:name=".presentation.ui.main.MainActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".presentation.ui.main.plan.PlanActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
         <meta-data
             android:name="io.sentry.dsn"
             android:value="${IO_SENTRY_DSN}" />
-
         <meta-data
             android:name="io.sentry.traces.user-interaction.enable"
             android:value="true" />
@@ -30,25 +59,11 @@
         <meta-data
             android:name="io.sentry.attach-view-hierarchy"
             android:value="true" />
-
         <meta-data
             android:name="io.sentry.traces.sample-rate"
             android:value="1.0" />
         <meta-data
             android:name="io.sentry.traces.profiling.sample-rate"
             android:value="1.0" />
-
-        <activity
-            android:name=".presentation.ui.dummy.DummyActivity"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
     </application>
-
 </manifest>

app/src/main/java/org/sopt/pingle/presentation/ui/dummy/DummyCustomDEditTextActivity.kt

@@ -0,0 +1,12 @@
+package org.sopt.pingle.presentation.ui.dummy
+
+import android.os.Bundle
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.ActivityEditTextCustomTestBinding
+import org.sopt.pingle.util.base.BindingActivity
+
+class DummyCustomDEditTextActivity : BindingActivity<ActivityEditTextCustomTestBinding>(R.layout.activity_edit_text_custom_test) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/MainActivity.kt

@@ -0,0 +1,70 @@
+package org.sopt.pingle.presentation.ui.main
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.ActivityMainBinding
+import org.sopt.pingle.presentation.ui.main.commend.CommendFragment
+import org.sopt.pingle.presentation.ui.main.home.map.MapFragment
+import org.sopt.pingle.presentation.ui.main.mypingle.MyPingleFragment
+import org.sopt.pingle.presentation.ui.main.plan.PlanActivity
+import org.sopt.pingle.presentation.ui.main.setting.SettingFragment
+import org.sopt.pingle.util.base.BindingActivity
+
+class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        initLayout()
+        initBnvMainAllNaviItemSelectedListener()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        updateBnvMainAllNaviSelectedItemByFragment()
+    }
+
+    private fun initLayout() {
+        supportFragmentManager.findFragmentById(R.id.fcv_main_all_navi)
+            ?: navigateToFragment<MapFragment>()
+    }
+
+    private fun initBnvMainAllNaviItemSelectedListener() {
+        binding.bnvMainAllNavi.setOnItemSelectedListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.menu_all_navi_home -> navigateToFragment<MapFragment>()
+                R.id.menu_all_navi_commend -> navigateToFragment<CommendFragment>()
+                R.id.menu_all_navi_add -> navigateToPlan()
+                R.id.menu_all_navi_mypingle -> navigateToFragment<MyPingleFragment>()
+                R.id.menu_all_navi_setting -> navigateToFragment<SettingFragment>()
+            }
+            true
+        }
+    }
+
+    private fun updateBnvMainAllNaviSelectedItemByFragment() {
+        binding.bnvMainAllNavi.selectedItemId =
+            when (supportFragmentManager.findFragmentById(R.id.fcv_main_all_navi)) {
+                is CommendFragment -> R.id.menu_all_navi_commend
+                is MyPingleFragment -> R.id.menu_all_navi_mypingle
+                is SettingFragment -> R.id.menu_all_navi_setting
+                else -> R.id.menu_all_navi_home
+            }
+    }
+
+    private fun navigateToPlan() {
+        Intent(this@MainActivity, PlanActivity::class.java).apply {
+            startActivity(this)
+        }
+    }
+
+    private inline fun <reified T : Fragment> navigateToFragment() {
+        supportFragmentManager.commit {
+            replace<T>(R.id.fcv_main_all_navi, T::class.java.canonicalName)
+        }
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/commend/CommendFragment.kt

@@ -0,0 +1,13 @@
+package org.sopt.pingle.presentation.ui.main.commend
+
+import android.os.Bundle
+import android.view.View
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.FragmentCommendBinding
+import org.sopt.pingle.util.base.BindingFragment
+
+class CommendFragment : BindingFragment<FragmentCommendBinding>(R.layout.fragment_commend) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt

@@ -0,0 +1,13 @@
+package org.sopt.pingle.presentation.ui.main.home.map
+
+import android.os.Bundle
+import android.view.View
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.FragmentMapBinding
+import org.sopt.pingle.util.base.BindingFragment
+
+class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/mypingle/MyPingleFragment.kt

@@ -0,0 +1,13 @@
+package org.sopt.pingle.presentation.ui.main.mypingle
+
+import android.os.Bundle
+import android.view.View
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.FragmentMyPingleBinding
+import org.sopt.pingle.util.base.BindingFragment
+
+class MyPingleFragment : BindingFragment<FragmentMyPingleBinding>(R.layout.fragment_my_pingle) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanActivity.kt

@@ -0,0 +1,13 @@
+package org.sopt.pingle.presentation.ui.main.plan
+
+import android.os.Bundle
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.ActivityPlanBinding
+import org.sopt.pingle.util.base.BindingActivity
+
+class PlanActivity : BindingActivity<ActivityPlanBinding>(R.layout.activity_plan) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_plan)
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/setting/SettingFragment.kt

@@ -0,0 +1,13 @@
+package org.sopt.pingle.presentation.ui.main.setting
+
+import android.os.Bundle
+import android.view.View
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.FragmentSettingBinding
+import org.sopt.pingle.util.base.BindingFragment
+
+class SettingFragment : BindingFragment<FragmentSettingBinding>(R.layout.fragment_setting) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

app/src/main/java/org/sopt/pingle/util/component/PingleEditText.kt

@@ -0,0 +1,38 @@
+package org.sopt.pingle.util.component
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import org.sopt.pingle.R
+import org.sopt.pingle.databinding.EditTextPingleBinding
+
+@SuppressLint("CustomViewStyleable")
+class PingleEditText(
+    context: Context,
+    attrs: AttributeSet
+) : ConstraintLayout(context, attrs) {
+    private lateinit var binding: EditTextPingleBinding
+
+    init {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.pingleEditText)
+        try {
+            initView(typedArray)
+        } finally {
+            typedArray.recycle()
+        }
+    }
+
+    private fun initView(typedArray: TypedArray) {
+        binding = EditTextPingleBinding.inflate(LayoutInflater.from(context), this, true)
+        typedArray.apply {
+            val title = getString(R.styleable.pingleEditText_title)
+            binding.tvTitle.text = title
+
+            val hint = getString(R.styleable.pingleEditText_hint)
+            binding.etEditText.hint = hint
+        }
+    }
+}

app/src/main/res/drawable/cursor_drawble.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="1dp" />
+    <solid android:color="@color/pingle_green" />
+</shape>

app/src/main/res/drawable/selector_all_navi_add.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_all_navi_add_active_24" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_all_navi_add_inactivated_24" android:state_checked="false" />
+</selector>

app/src/main/res/drawable/selector_all_navi_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_checked="true" />
+    <item android:color="@color/g_07" android:state_checked="false" />
+</selector>

app/src/main/res/drawable/selector_all_navi_commend.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_all_navi_commend_active_24" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_all_navi_commend_inactivated_24" android:state_checked="false" />
+</selector>

app/src/main/res/drawable/selector_all_navi_home.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_all_navi_home_active_24" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_all_navi_home_inactivated_24" android:state_checked="false" />
+</selector>

app/src/main/res/drawable/selector_all_navi_mypingle.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_all_navi_mypingle_active_24" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_all_navi_mypingle_inactivated_24" android:state_checked="false" />
+</selector>

app/src/main/res/drawable/selector_all_navi_setting.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_all_navi_setting_active_24" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_all_navi_setting_inactivated_24" android:state_checked="false" />
+</selector>

app/src/main/res/layout/activity_edit_text_custom_test.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <org.sopt.pingle.util.component.PingleEditText
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/spacing16"
+            app:hint="힌트얌"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="레이블" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".presentation.ui.main.MainActivity">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fcv_main_all_navi"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/bnv_main_all_navi"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bnv_main_all_navi"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/bottom_navi_height"
+            android:background="@color/black"
+            app:itemActiveIndicatorStyle="@android:color/transparent"
+            app:itemBackground="@android:color/transparent"
+            app:itemIconTint="@drawable/selector_all_navi_color"
+            app:itemPaddingBottom="8dp"
+            app:itemPaddingTop="7dp"
+            app:itemRippleColor="@android:color/transparent"
+            app:itemTextAppearanceActive="@style/TextAppearance.Pingle.Cap.Semi.12"
+            app:itemTextAppearanceInactive="@style/TextAppearance.Pingle.Cap.Semi.12"
+            app:itemTextColor="@drawable/selector_all_navi_color"
+            app:labelVisibilityMode="labeled"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/all_navi_menu" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>