conflict 수정

app/src/main/AndroidManifest.xml

@@ -12,10 +12,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ChaRoAndroid">
-
-
         <activity android:name=".ui.search.SearchActivity" />
         <activity android:name=".DetailActivity"/>
+        <activity android:name=".ui.write.WriteMapActivity"></activity>
+        <activity android:name=".ui.write.WriteActivity" />
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">

app/src/main/java/com/example/charo_android/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.example.charo_android
 
+import android.content.Intent
 import android.os.Bundle
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import androidx.appcompat.app.AppCompatActivity
@@ -12,6 +13,7 @@ import com.example.charo_android.databinding.ActivityMainBinding
 import com.example.charo_android.ui.home.HomeFragment
 import com.example.charo_android.ui.home.HomeViewPagerAdapter
 
+import com.example.charo_android.ui.write.WriteActivity
 
 class MainActivity : AppCompatActivity() {
 
@@ -28,8 +30,7 @@ class MainActivity : AppCompatActivity() {
     }
 
 
-
-    private fun initNavView(){
+    private fun initNavView() {
         val navView: BottomNavigationView = binding.navView
         val navController = findNavController(R.id.nav_host_fragment_activity_main)
         val appBarConfiguration = AppBarConfiguration(
@@ -39,14 +40,26 @@ class MainActivity : AppCompatActivity() {
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
+
+
+        binding.btnWrite.setOnClickListener {
+            startActivityWrite()
+        }
+    }
+
+
+    fun AppCompatActivity.replaceFragment(fragment: Fragment) {
+        val fragmentManager = supportFragmentManager
+        val transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.nav_host_fragment_activity_main, fragment)
+        transaction.addToBackStack(null)
+        transaction.commit()
+    }
+
+    fun startActivityWrite() {
+        val intent = Intent(this@MainActivity, WriteActivity::class.java)
+        startActivity(intent)
     }
 
-}
 
-fun AppCompatActivity.replaceFragment(fragment: Fragment){
-    val fragmentManager = supportFragmentManager
-    val transaction = fragmentManager.beginTransaction()
-    transaction.replace(R.id.nav_host_fragment_activity_main, fragment)
-    transaction.addToBackStack(null)
-    transaction.commit()
 }

app/src/main/java/com/example/charo_android/ui/write/WriteActivity.kt

@@ -0,0 +1,147 @@
+package com.example.charo_android.ui.write
+
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.example.charo_android.R
+import com.example.charo_android.databinding.ActivityWriteBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+
+class WriteActivity : AppCompatActivity() {
+
+    private lateinit var binding : ActivityWriteBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityWriteBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        //버튼 selected 상태 변화 함수
+        setButtonClickEvent()
+
+        //지역
+        val ItemsDo = arrayOf("")
+
+
+        // 테마
+        val ItemsTheme = arrayOf("산", "바다", "호수","강","봄","여름","가을","겨울","해안도로","벚꽃","단풍","여유","스피드","야경","도심")
+
+
+        binding.btnWriteTheme1.setOnClickListener {
+            val checkedItem = 1
+            MaterialAlertDialogBuilder(this)
+                .setTitle(resources.getString(R.string.theme1))
+                .setNeutralButton("취소") { dialog, which ->
+                    binding.btnWriteTheme1.setText(resources.getString(R.string.theme1))
+                    it.isSelected = false
+                }
+                .setPositiveButton("확인") { dialog, which ->
+                    if(binding.btnWriteTheme1.text.toString() == resources.getString(R.string.theme1)) {
+                        it.isSelected = false
+                    }
+                    it.isSelected = true
+                }
+                // Single-choice items (initialized with checked item)
+                .setSingleChoiceItems(ItemsTheme, checkedItem) { dialog, which ->
+                    //which : index
+                    //테마 고르면 텍스트 변경
+                    binding.btnWriteTheme1.setText(ItemsTheme[which])
+                }
+                .show()
+        }
+        binding.btnWriteTheme2.setOnClickListener {
+            val checkedItem = 1
+            MaterialAlertDialogBuilder(this)
+                .setTitle(resources.getString(R.string.theme2))
+                .setNeutralButton("취소") { dialog, which ->
+                    binding.btnWriteTheme2.setText(resources.getString(R.string.theme2))
+                    it.isSelected = false
+                }
+                .setPositiveButton("확인") { dialog, which ->
+                    if(binding.btnWriteTheme1.text.toString() == resources.getString(R.string.theme2)) {
+                        it.isSelected = false
+                    }
+                    it.isSelected = true
+                }
+                // Single-choice items (initialized with checked item)
+                .setSingleChoiceItems(ItemsTheme, checkedItem) { dialog, which ->
+                    //which : index
+                    //테마 고르면 텍스트 변경
+                    binding.btnWriteTheme2.setText(ItemsTheme[which])
+                }
+                .show()
+        }
+        binding.btnWriteTheme3.setOnClickListener {
+            val checkedItem = 1
+            MaterialAlertDialogBuilder(this)
+                .setTitle(resources.getString(R.string.theme3))
+                .setNeutralButton("취소") { dialog, which ->
+                    binding.btnWriteTheme3.setText(resources.getString(R.string.theme3))
+                    it.isSelected = false
+                }
+                .setPositiveButton("확인") { dialog, which ->
+                    if(binding.btnWriteTheme3.text.toString() == resources.getString(R.string.theme3)) {
+                        it.isSelected = false
+                    }
+                    it.isSelected = true
+                }
+                // Single-choice items (initialized with checked item)
+                .setSingleChoiceItems(ItemsTheme, checkedItem) { dialog, which ->
+                    //which : index
+                    //테마 고르면 텍스트 변경
+                    binding.btnWriteTheme3.setText(ItemsTheme[which])
+                }
+                .show()
+        }
+
+        //주차 - 둘 중 하나만 선택 가능하도록 하기
+
+
+    }
+
+
+
+    fun setButtonClickEvent() {
+
+        binding.btnWriteCautionHighway.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteCautionPeople.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteCautionDiffi.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteCautionMoun.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteDo.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteSi.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteParkNo.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteParkYes.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteTheme1.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteTheme2.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+        binding.btnWriteTheme3.setOnClickListener {
+            it.isSelected = !it.isSelected
+        }
+    }
+
+
+
+
+}

app/src/main/java/com/example/charo_android/ui/write/WriteFragment.kt

@@ -1,5 +1,6 @@
 package com.example.charo_android.ui.write
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -30,10 +31,14 @@ class WriteFragment : Fragment() {
         _binding = FragmentWriteBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-        val textView: TextView = binding.textWrite
-        writeViewModel.text.observe(viewLifecycleOwner, Observer {
-            textView.text = it
-        })
+//        val textView: TextView = binding.textWrite
+//        writeViewModel.text.observe(viewLifecycleOwner, Observer {
+//            textView.text = it
+//        })
+
+        val intent = Intent(context, WriteActivity::class.java)
+        startActivity(intent)
+
         return root
     }
 

app/src/main/java/com/example/charo_android/ui/write/WriteMapActivity.kt

@@ -0,0 +1,16 @@
+package com.example.charo_android.ui.write
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.charo_android.databinding.ActivityWriteMapBinding
+
+class WriteMapActivity : AppCompatActivity() {
+
+    private lateinit var binding : ActivityWriteMapBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityWriteMapBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+    }
+}

app/src/main/res/drawable-mdpi/btn_park_click.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/ui_write_btn_parking_select_android" android:state_selected="true" />
+    <item android:drawable="@drawable/ui_write_btn_parking_unselect_android" android:state_selected="false" />
+</selector>

app/src/main/res/drawable-mdpi/btn_warning_click.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/ui_write_btn_warning_unselect_android_2" android:state_selected="true" />
+    <item android:drawable="@drawable/ui_write_btn_warning_unselect_android" android:state_selected="false" />
+</selector>

app/src/main/res/drawable/btn_dialog_click.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/ui_write_btn_select_android" android:state_selected="true" />
+    <item android:drawable="@drawable/ui_write_btn_unselect_android" android:state_selected="false" />
+</selector>

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

@@ -6,18 +6,18 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
-
+    android:background="@color/white"
+    android:paddingTop="?attr/actionBarSize"
+    tools:context=".MainActivity">
 
     <!--그림자 있는건 png 파일로 다운 받아야 함-->
-    <!--BottomNavigation 크기는 430으로 하면 맞지만, 화면 크기 변경 시 이상해질 수 있음-->
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="88dp"
         android:layout_marginStart="0dp"
         android:layout_marginEnd="0dp"
-        android:background="@drawable/rectangle_62"
+        android:background="@drawable/background_bottom_navigation"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -39,11 +39,12 @@
         android:id="@+id/btn_write"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="50dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:src="@drawable/tabbar_ic_write"
+        android:layout_margin="40dp"
+        android:elevation="20dp"
         android:scaleType="fitXY"
         android:clickable="true"
         android:focusable="true"