diff --git a/.idea/misc.xml b/.idea/misc.xml index 13409e0..11d602c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,9 +7,9 @@ - + - + @@ -24,32 +24,20 @@ - - - - - - - + + - - - - - - - @@ -59,21 +47,21 @@ - - + + + - - - - + + - + + @@ -81,31 +69,61 @@ + + + + + + + - - + + + + + + + + + + + + + + - + + + + + + + + + + + + diff --git a/README.md b/README.md new file mode 100644 index 0000000..4e004ea --- /dev/null +++ b/README.md @@ -0,0 +1,30 @@ +# MapForGirls(μ†Œλ…€μ§€λ„) +Comprehensive medical assistant for girls
+

logo-title-light

+ +## πŸ’­ Problem +ν˜„μž¬ μ„œμšΈμ‹œμ—λŠ” 10λŒ€ μ—¬μ„± μ²­μ†Œλ…„μ„ μœ„ν•΄ 건강 상담과 μ˜μ•½ν’ˆ 지원, 지원 μ‹œμ„€ 연계 μ„œλΉ„μŠ€ 등을 μ œκ³΅ν•˜λŠ” 'μ†Œλ…€ λŒλ΄„ μ•½κ΅­' 사업을 μ§„ν–‰ν•˜κ³  μžˆλ‹€. ν•˜μ§€λ§Œ 홍보 λΆ€μ‘±μœΌλ‘œ μ²­μ†Œλ…„λ“€μ€ μ†Œλ…€ λŒλ΄„ 약ꡭ이 μ‘΄μž¬ν•˜λŠ”μ§€λ„ μœ„μΉ˜κ°€ μ–΄λ”” μžˆλŠ”μ§€λ„ 잘 μ•Œμ§€ λͺ»ν•œλ‹€. κ²Œλ‹€κ°€ μ†Œλ…€ λŒλ΄„ μ•½κ΅­μ˜ μœ„μΉ˜ λ¦¬μŠ€νŠΈκ°€ μ œκ³΅λ˜κΈ°λŠ” ν•˜λ‚˜ 쀄 κΈ€κ³Ό μ‚¬μ§„μœΌλ‘œλ§Œ 제곡이 되기 λ•Œλ¬Έμ— 본인 μ£Όλ³€μ˜ 약ꡭ을 일일이 찾아봐야 ν•œλ‹€λŠ” 어렀움이 μžˆλ‹€. + +## πŸ—ΊοΈ About MapForGirls +10λŒ€ μ—¬μ„± μ²­μ†Œλ…„μ„ μœ„ν•œ 길작이
+'μ†Œλ…€μ§€λ„'λŠ” λ‚΄ μœ„μΉ˜λ₯Ό 기반으둜 μ£Όλ³€μ˜ μ†Œλ…€ λŒλ΄„ 약ꡭ이 μ–΄λ”” μžˆλŠ”μ§€λ₯Ό ν‘œμ‹œν•΄ 쀌과 λ”λΆˆμ–΄ μ•½μ‚¬λ‹˜κ³Όμ˜ μΌλŒ€μΌ μ±„νŒ… μ„œλΉ„μŠ€λ₯Ό μ œκ³΅ν•œλ‹€. λ˜ν•œ, λ‹€μ–‘ν•œ μ„± 지식 μΉΌλŸΌμ„ 톡해 10λŒ€ μ—¬μ„± μ²­μ†Œλ…„μ˜ μ˜¬λ°”λ₯Έ μ„± 인식을 ν•¨μ–‘μ‹œν‚¨λ‹€. + +## πŸ“± How to use +

지도(메인화면)

+

+
+

μ±„νŒ…

+

+

+
+

μ„± 지식 칼럼

+

+

+
+

μƒλ¦¬λŒ€ μΆ”μ²œ ν…ŒμŠ€νŠΈ

+

+ +

+
+

λ§ˆμ΄νŽ˜μ΄μ§€

+ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 932a6ad..94e2afa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,10 +35,12 @@ - + + + diff --git a/app/src/main/java/com/example/mapforgirls/IntroduceActivity.kt b/app/src/main/java/com/example/mapforgirls/IntroduceActivity.kt new file mode 100644 index 0000000..5ba1a8d --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/IntroduceActivity.kt @@ -0,0 +1,11 @@ +package com.example.mapforgirls + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class IntroduceActivity: AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_introduce) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/LoginActivity.kt b/app/src/main/java/com/example/mapforgirls/LoginActivity.kt index 0c37614..d2336f0 100644 --- a/app/src/main/java/com/example/mapforgirls/LoginActivity.kt +++ b/app/src/main/java/com/example/mapforgirls/LoginActivity.kt @@ -7,6 +7,7 @@ import android.text.Editable import android.text.TextWatcher import android.util.Log import android.util.Patterns +import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.firebase.auth.FirebaseAuth @@ -37,10 +38,16 @@ class LoginActivity : AppCompatActivity() { } override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { //ν…μŠ€νŠΈ μž…λ ₯ μ „ + login_email_warn.visibility = View.INVISIBLE } override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { //ν…μŠ€νŠΈ μž…λ ₯ 쀑 activate_login = isEmail(login_email_et.text.toString()) // 아이디가 이메일 ν˜•μ‹μΌ κ²½μš°μ— 둜그인 λ²„νŠΌ ν™œμ„±ν™” μ€€λΉ„ + if(activate_login!!){ + login_email_warn.visibility = View.INVISIBLE + } else { + login_email_warn.visibility = View.VISIBLE + } isActive(activate_login, activate_pw) } }) @@ -104,9 +111,11 @@ class LoginActivity : AppCompatActivity() { moveMainPage(task.result.user) } else { // 아이디와 νŒ¨μŠ€μ›Œλ“œκ°€ 틀렸을 경우 if (task.exception?.message.equals("The password is invalid or the user does not have a password.")) { // λΉ„λ°€λ²ˆν˜Έκ°€ 틀렸을 경우 - Toast.makeText(this, "λΉ„λ°€λ²ˆν˜Έκ°€ μΌμΉ˜ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.", Toast.LENGTH_LONG).show() + login_pw_warn.visibility = View.VISIBLE + login_pw_warn.text = "λΉ„λ°€λ²ˆν˜Έκ°€ μΌμΉ˜ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€." } else if (task.exception?.message.equals("There is no user record corresponding to this identifier. The user may have been deleted.")) { // μ‘΄μž¬ν•˜μ§€ μ•ŠλŠ” 계정일 경우 - Toast.makeText(this, "계정이 μ‘΄μž¬ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.", Toast.LENGTH_LONG).show() + login_pw_warn.visibility = View.VISIBLE + login_pw_warn.text = "계정이 μ‘΄μž¬ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€." } else { // 둜그인 였λ₯˜ Toast.makeText(this, task.exception?.message, Toast.LENGTH_LONG).show() } diff --git a/app/src/main/java/com/example/mapforgirls/MainActivity.kt b/app/src/main/java/com/example/mapforgirls/MainActivity.kt index d5ce81b..c4c963d 100644 --- a/app/src/main/java/com/example/mapforgirls/MainActivity.kt +++ b/app/src/main/java/com/example/mapforgirls/MainActivity.kt @@ -55,11 +55,11 @@ class MainActivity : AppCompatActivity() { initBottomNavigation() } - override fun onDestroy() { - super.onDestroy() - - initScrapDB() + override fun onStop() { + super.onStop() +// initScrapDB() + database.child("users").child("XaJxoewI9kU2wRGUXOaX9l1q65E3").child("scrap").removeValue() } private fun initScrapDB() { diff --git a/app/src/main/java/com/example/mapforgirls/MapsFragment.kt b/app/src/main/java/com/example/mapforgirls/MapsFragment.kt index 2ea80e2..e62ba5f 100644 --- a/app/src/main/java/com/example/mapforgirls/MapsFragment.kt +++ b/app/src/main/java/com/example/mapforgirls/MapsFragment.kt @@ -56,7 +56,6 @@ class MapsFragment : Fragment() { lateinit var mainActivity: MainActivity companion object { - private val MAPVIEW_BUNDLE_KEY = "MapViewBundleKey" private val markerIconSize = 100 } @@ -99,11 +98,11 @@ class MapsFragment : Fragment() { val markerOptions = MarkerOptions() markerOptions.title("ν˜„μž¬ μœ„μΉ˜") markerOptions.icon(BitmapDescriptorFactory.fromBitmap(BitmapUtils.resizeMapIcons(requireContext(), R.drawable.marker, markerIconSize, markerIconSize))) - googleMap.addMarker(markerOptions.position(currentLocation)) - + var marker = googleMap.addMarker(markerOptions.position(currentLocation)) + marker?.tag = "current" moveCamera(googleMap, currentLocation.latitude, currentLocation.longitude) - googleMap!!.setOnMarkerClickListener(null) + } } @@ -112,6 +111,9 @@ class MapsFragment : Fragment() { // 마컀 클릭 μ‹œ μΉ΄λ“œλ·° 띄움 googleMap!!.setOnMarkerClickListener(object : GoogleMap.OnMarkerClickListener { override fun onMarkerClick(marker: Marker): Boolean { + if(marker.tag == "current") { + return false + } cardView.visibility = View.VISIBLE // 약ꡭ별 상세정보 diff --git a/app/src/main/java/com/example/mapforgirls/MypageFragment.kt b/app/src/main/java/com/example/mapforgirls/MypageFragment.kt index 534420c..e0efc75 100644 --- a/app/src/main/java/com/example/mapforgirls/MypageFragment.kt +++ b/app/src/main/java/com/example/mapforgirls/MypageFragment.kt @@ -55,6 +55,10 @@ class MypageFragment : Fragment(){ val intent = Intent(context, ProfileActivity::class.java) startActivity(intent) } + binding.mypageIntroTv.setOnClickListener { + val intent = Intent(context, IntroduceActivity::class.java) + startActivity(intent) + } binding.mypageGirlLogoutTv.setOnClickListener { // λ‘œκ·Έμ•„μ›ƒ auth.signOut() moveLoginPage() diff --git a/app/src/main/java/com/example/mapforgirls/TestActivity.kt b/app/src/main/java/com/example/mapforgirls/TestActivity.kt deleted file mode 100644 index 4bf92a1..0000000 --- a/app/src/main/java/com/example/mapforgirls/TestActivity.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.mapforgirls - -import android.os.Bundle -import android.widget.ImageView -import androidx.appcompat.app.AppCompatActivity -import com.example.mapforgirls.databinding.ActivityTestBinding - - -class TestActivity : AppCompatActivity() { - lateinit var binding: ActivityTestBinding - - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityTestBinding.inflate(layoutInflater) - setContentView(binding.root) - - //이미지뷰 λ³€μˆ˜.bringToFront(); -> 이거둜 ν•˜λ‹¨ 이미지 상단view둜 보이게 λΆ€νƒλ“œλ¦΄κ²Œμš”! γ…Žγ…Ž - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/data/entities/ColumnData.kt b/app/src/main/java/com/example/mapforgirls/data/entities/ColumnData.kt index e895a0b..6d3bcf3 100644 --- a/app/src/main/java/com/example/mapforgirls/data/entities/ColumnData.kt +++ b/app/src/main/java/com/example/mapforgirls/data/entities/ColumnData.kt @@ -10,6 +10,7 @@ data class ColumnData( var columnId : String? = "00", var cover : Int? = null, var title : String = "", + var subTitle : String = "", var author : String = "", var content : String = "", @PrimaryKey(autoGenerate = true) var id: Int = 0 diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChatRVAdapter.kt b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChatRVAdapter.kt index 4efa623..114089a 100644 --- a/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChatRVAdapter.kt +++ b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChatRVAdapter.kt @@ -1,12 +1,13 @@ package com.example.mapforgirls.ui.main.chatting -import android.annotation.SuppressLint -import android.util.Log +import android.content.Context import android.view.Gravity import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.example.mapforgirls.PharmacyData +import com.example.mapforgirls.R import com.example.mapforgirls.data.entities.ColumnData import com.example.mapforgirls.data.model.ChatModel import com.example.mapforgirls.databinding.ActivityChattingDetailBinding @@ -58,8 +59,10 @@ class ChatRVAdapter(private val chatList: ArrayList, private override fun onBindViewHolder(holder: ViewHolder, position: Int) { if(chatList[position].uid.equals(userId)){ // 본인 μ±„νŒ… holder.binding.itemMessageLlayout.gravity = Gravity.RIGHT + holder.binding.itemMessageTv.background = ContextCompat.getDrawable(holder.binding.root.context, R.drawable.img_chat_girls) }else{ // μƒλŒ€λ°© μ±„νŒ… holder.binding.itemMessageLlayout.gravity = Gravity.LEFT + holder.binding.itemMessageTv.background = ContextCompat.getDrawable(holder.binding.root.context, R.drawable.img_chat_women_red) } holder.bind(chatList[position]) @@ -74,6 +77,4 @@ class ChatRVAdapter(private val chatList: ArrayList, private } } - - } \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingFragment.kt b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingFragment.kt index 4038de1..4ec5498 100644 --- a/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingFragment.kt +++ b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingFragment.kt @@ -6,9 +6,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.example.mapforgirls.MainActivity import com.example.mapforgirls.PharmacyData import com.example.mapforgirls.databinding.FragmentChattingBinding import com.google.firebase.firestore.FirebaseFirestore +import java.lang.Exception class ChattingFragment : Fragment() { lateinit var binding: FragmentChattingBinding @@ -24,6 +26,12 @@ class ChattingFragment : Fragment() { binding = FragmentChattingBinding.inflate(inflater, container, false) setPharmacistData() + try { + val chattingRoomAdapter = ChattingRoomsRVAdapter(requireContext()) + binding.chattingRoomsRv.adapter = chattingRoomAdapter + } catch (e : Exception) { + Log.d("ChattingFragment", e.message.toString()) + } return binding.root } @@ -56,4 +64,10 @@ class ChattingFragment : Fragment() { } } + // μ±„νŒ…λ°© + private fun setChattingRoomsData() { + val chattingRoomAdapter = ChattingRoomsRVAdapter(requireContext()) + binding.chattingRoomsRv.adapter = chattingRoomAdapter + } + } \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingRoomsRVAdapter.kt b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingRoomsRVAdapter.kt new file mode 100644 index 0000000..47f5317 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/main/chatting/ChattingRoomsRVAdapter.kt @@ -0,0 +1,122 @@ +package com.example.mapforgirls.ui.main.chatting + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Context.MODE_PRIVATE +import android.util.Log +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.mapforgirls.PharmacyData +import com.example.mapforgirls.R +import com.example.mapforgirls.UserInfo +import com.example.mapforgirls.data.model.ChatModel +import com.example.mapforgirls.databinding.ActivityCertifyBinding.bind +import com.example.mapforgirls.databinding.DialogPharmacistBinding.bind +import com.example.mapforgirls.databinding.ItemChattingRoomBinding +import com.example.mapforgirls.databinding.ItemPharmacistBinding +import com.google.firebase.database.* +import com.google.firebase.database.ktx.getValue + +class ChattingRoomsRVAdapter(val context: Context): RecyclerView.Adapter() { + val chatRoomList = ArrayList() // μ±„νŒ…λ°© 데이터듀 + val chatRoomKeys = ArrayList() // μ±„νŒ…λ°© ν‚€ + val userId = context.getSharedPreferences("userInfo", MODE_PRIVATE).getString("uid", "") + val adapter = this + + val database = FirebaseDatabase.getInstance().reference + + init { + getChattingRoomsData() + Log.d("data", "inint") + + Log.d("data", chatRoomList.size.toString()) + } + + override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder { + var view = LayoutInflater.from(context).inflate(R.layout.item_chatting_room, viewGroup, false) + Log.d("data", "create") + Log.d("data", chatRoomList.size.toString()) + return ViewHolder(ItemChattingRoomBinding.bind(view)) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + var destinationUid: String + if(chatRoomList[position].users!!.keys.first() != userId) { + destinationUid = chatRoomList[position].users!!.keys.first() + } else { + destinationUid = chatRoomList[position].users!!.keys.last() + } + database.child("users").orderByKey().equalTo(destinationUid) + .addListenerForSingleValueEvent(object: ValueEventListener { + override fun onDataChange(snapshot: DataSnapshot) { + holder.destinationUser = snapshot.getValue()!! + holder.binding.itemChattingPharmacistTv.text = snapshot.child("name").value.toString() + } + + override fun onCancelled(error: DatabaseError) { + Log.d("ChattinRoomRVAdapter", error.message) + } + }) + +// holder.background.setOnClickListener() //μ±„νŒ…λ°© ν•­λͺ© 선택 μ‹œ +// { +// try { +// var intent = Intent(context, ChatRoomActivity::class.java) +// intent.putExtra("ChatRoom", chatRooms.get(position)) //μ±„νŒ…λ°© 정보 +// intent.putExtra("Opponent", holder.opponentUser) //μƒλŒ€λ°© μ‚¬μš©μž 정보 +// intent.putExtra("ChatRoomKey", chatRoomKeys[position]) //μ±„νŒ…λ°© ν‚€ 정보 +// context.startActivity(intent) //ν•΄λ‹Ή μ±„νŒ…λ°©μœΌλ‘œ 이동 +// (context as AppCompatActivity).finish() +// }catch (e:Exception) +// { +// e.printStackTrace() +// Toast.makeText(context,"μ±„νŒ…λ°© 이동 쀑 λ¬Έμ œκ°€ λ°œμƒν•˜μ˜€μŠ΅λ‹ˆλ‹€.",Toast.LENGTH_SHORT).show() +// } +// } + + if (chatRoomList[position].comments!!.size > 0) { //μ±„νŒ…λ°© λ©”μ‹œμ§€κ°€ μ‘΄μž¬ν•˜λŠ” 경우 + setLatestMessage(holder, position) // κ°€μž₯ 졜근 λ©”μ‹œμ§€ + countMessage(holder, position) + } + + Log.d("data", "bind") + } + + override fun getItemCount(): Int = chatRoomList.size + + inner class ViewHolder(val binding : ItemChattingRoomBinding) : RecyclerView.ViewHolder(binding.root) { + lateinit var destinationUser: UserInfo + } + @SuppressLint("NotifyDataSetChanged") + private fun getChattingRoomsData() { //전체 μ±„νŒ…λ°© λͺ©λ‘ μ΄ˆκΈ°ν™” 및 μ—…λ°μ΄νŠΈ + database.child("chattingRooms") + .orderByChild("users/$userId").equalTo(true) + .addListenerForSingleValueEvent(object : ValueEventListener { + override fun onDataChange(snapshot: DataSnapshot) { + chatRoomList.clear() + for (data in snapshot.children) { + chatRoomList.add(data.getValue()!!) + chatRoomKeys.add(data.key!!) + } + Log.d("data", chatRoomList.size.toString()) + notifyDataSetChanged() + } + override fun onCancelled(error: DatabaseError) { + Log.d("ChattingRoomsRVAdapter", error.message) + } + }) + adapter.notifyDataSetChanged() + } + + private fun setLatestMessage(holder: ViewHolder, position: Int) { + var latest = chatRoomList[position].comments!!.values.sortedWith(compareBy({it.time})).last() //κ°€μž₯ 졜근 λ©”μ‹œμ§€ + holder.binding.itemChattingContentTv.text = latest.message.toString() + holder.binding.itemChattingDateTv.text = latest.time.toString() + } + + private fun countMessage(holder: ViewHolder, position: Int) { + //ν™•μΈν•˜μ§€ μ•Šμ€ λ©”μ‹œμ§€ 개수 + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/columns/Category1Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/main/columns/Category1Fragment.kt index 3ee5486..e19d404 100644 --- a/app/src/main/java/com/example/mapforgirls/ui/main/columns/Category1Fragment.kt +++ b/app/src/main/java/com/example/mapforgirls/ui/main/columns/Category1Fragment.kt @@ -57,7 +57,7 @@ class Category1Fragment : Fragment() { var img = activity?.resources!!.getIdentifier(i.child("image").value.toString(), "drawable", activity?.packageName) columnList.add( ColumnData( - i.ref.parent?.parent?.key, i.key, img, i.child("title").value.toString(), + i.ref.parent?.parent?.key, i.key, img, i.child("title").value.toString(), i.child("subTitle").value.toString(), i.child("author").value.toString(), i.child("content").value.toString()) ) } diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnDetailActivity.kt b/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnDetailActivity.kt index 722f395..bb13365 100644 --- a/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnDetailActivity.kt +++ b/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnDetailActivity.kt @@ -22,6 +22,7 @@ class ColumnDetailActivity : AppCompatActivity() { binding.columnDetailCoverIv.setImageResource(column.cover!!) binding.columnDetailAuthorTv.text = column.author binding.columnDetailTitleTv.text = column.title + binding.columnDetailSubTitleTv.text = column.subTitle binding.columnDetailContentTv.text = column.content.replace("\\n", "\n") isScrapped = isScrappedColumn(column.sectionName!!, column.columnId!!) @@ -55,7 +56,7 @@ class ColumnDetailActivity : AppCompatActivity() { private fun isScrappedColumn(sectionName : String, columnId: String): Boolean { val columnDB = ColumnDatabase.getInstance(this@ColumnDetailActivity)!! - val isScrapped: Int? = columnDB.columnDao().isScrapedColumn(sectionName, columnId) + // val isScrapped: Int? = columnDB.columnDao().isScrapedColumn(sectionName, columnId) return isScrapped != null } diff --git a/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnsFragment.kt b/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnsFragment.kt index 75f9468..4d1d6fa 100644 --- a/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnsFragment.kt +++ b/app/src/main/java/com/example/mapforgirls/ui/main/columns/ColumnsFragment.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import com.example.mapforgirls.MainActivity import com.example.mapforgirls.R -import com.example.mapforgirls.TestActivity +import com.example.mapforgirls.ui.test.TestActivity import com.example.mapforgirls.databinding.FragmentColumnsBinding class ColumnsFragment : Fragment(), View.OnClickListener { diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/Test1Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/Test1Fragment.kt new file mode 100644 index 0000000..dff221d --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/Test1Fragment.kt @@ -0,0 +1,65 @@ +package com.example.mapforgirls.ui.test + +import android.graphics.Color +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.FragmentTest1Binding + +class Test1Fragment : Fragment(), View.OnClickListener { + lateinit var binding: FragmentTest1Binding + lateinit var testActivity : TestActivity + var point1 = 0 + var point2 = 0 + var point3 = 0 + var point4 = 0 + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTest1Binding.inflate(inflater, container, false) + testActivity = activity as TestActivity + + binding.test1NextBtn.isEnabled = false + + binding.test1NextBtn.setOnClickListener(this) + binding.test1CheckOk.setOnClickListener(this) + binding.test1CheckNo.setOnClickListener(this) + + return binding.root + } + + override fun onClick(v: View?) { + when(v?.id) { + R.id.test1_check_ok -> { + binding.test1NextBtn.isEnabled = true + binding.test1NextBtn.setBackgroundResource(R.drawable.round_red) + binding.test1NextBtn.setTextColor(Color.WHITE) + binding.test1CheckOk.setBackgroundResource(R.drawable.test_ok_select) + binding.test1CheckNo.setBackgroundResource(R.drawable.test_no) + point2 = 1 + point4 = 1 + } + R.id.test1_check_no -> { + binding.test1NextBtn.isEnabled = true + binding.test1NextBtn.setBackgroundResource(R.drawable.round_red) + binding.test1CheckOk.setBackgroundResource(R.drawable.test_ok) + binding.test1CheckNo.setBackgroundResource(R.drawable.test_no_select) + point1 = 1 + point3 = 1 + } + R.id.test1_next_btn -> { + testActivity.addPoint(point1, point2, point3, point4) + testActivity.changeFragment(2) + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/Test2Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/Test2Fragment.kt new file mode 100644 index 0000000..f021f20 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/Test2Fragment.kt @@ -0,0 +1,131 @@ +package com.example.mapforgirls.ui.test + +import android.graphics.Color +import android.graphics.drawable.Drawable +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.FragmentTest2Binding + +class Test2Fragment : Fragment(), View.OnClickListener { + lateinit var binding: FragmentTest2Binding + lateinit var testActivity : TestActivity + + var point1 = 0 + var point2 = 0 + var point3 = 0 + var point4 = 0 + var a1 = false + var a2 = false + var a3 = false + var a4 = false + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTest2Binding.inflate(inflater, container, false) + testActivity = activity as TestActivity + + binding.test2NextBtn.isEnabled = false + + binding.test2NextBtn.setOnClickListener(this) + binding.test2Answer1Btn.setOnClickListener(this) + binding.test2Answer2Btn.setOnClickListener(this) + binding.test2Answer3Btn.setOnClickListener(this) + binding.test2Answer4Btn.setOnClickListener(this) + + + return binding.root + } + + override fun onClick(v: View?) { + binding.test2NextBtn.isEnabled = true + when(v?.id) { + R.id.test2_answer1_btn -> { + if(a1) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test2Answer1Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1 -= 1 + point3 -= 1 + point4 -= 1 + } else { + binding.test2Answer1Btn.setBackgroundResource(R.drawable.round_green) + point1 += 1 + point3 += 1 + point4 += 1 + } + a1 = !a1 + setBtn() + } + R.id.test2_answer2_btn -> { + if(a2) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test2Answer2Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1 -= 1 + point2 -= 1 + point3 -= 1 + } else { + binding.test2Answer2Btn.setBackgroundResource(R.drawable.round_green) + point1 += 1 + point2 += 1 + point3 += 1 + } + a2 = !a2 + setBtn() + } + R.id.test2_answer3_btn -> { + if(a3) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test2Answer3Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point2 -= 1 + point4 -= 1 + } else { + binding.test2Answer3Btn.setBackgroundResource(R.drawable.round_green) + point2 += 1 + point4 += 1 + } + a3 = !a3 + setBtn() + } + R.id.test2_answer4_btn -> { + if(a4) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test2Answer4Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1 -= 1 + point2 -= 1 + point3 -= 1 + point4 -= 1 + } else { + binding.test2Answer4Btn.setBackgroundResource(R.drawable.round_green) + point1 += 1 + point2 += 1 + point3 += 1 + point4 += 1 + } + a4 = !a4 + setBtn() + } + R.id.test2_next_btn -> { + testActivity.addPoint(point1, point2, point3, point4) + testActivity.changeFragment(3) + } + } + } + + fun setBtn() { + binding.test2NextBtn.isEnabled = !(!a1 && !a2 && !a3 && !a4) + if (binding.test2NextBtn.isEnabled) { + binding.test2NextBtn.setBackgroundResource(R.drawable.round_red) + binding.test2NextBtn.setTextColor(Color.WHITE) + } else { + binding.test2NextBtn.setBackgroundResource(R.drawable.round_grey) + binding.test2NextBtn.setTextColor(Color.parseColor("#A9A9A9")) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/Test3Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/Test3Fragment.kt new file mode 100644 index 0000000..850e831 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/Test3Fragment.kt @@ -0,0 +1,130 @@ +package com.example.mapforgirls.ui.test + +import android.graphics.Color +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.FragmentTest2Binding +import com.example.mapforgirls.databinding.FragmentTest3Binding + +class Test3Fragment : Fragment(), View.OnClickListener { + lateinit var binding: FragmentTest3Binding + lateinit var testActivity : TestActivity + + var point1 = 0 + var point2 = 0 + var point3 = 0 + var point4 = 0 + var a1 = false + var a2 = false + var a3 = false + var a4 = false + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTest3Binding.inflate(inflater, container, false) + testActivity = activity as TestActivity + + binding.test3NextBtn.isEnabled = false + + binding.test3NextBtn.setOnClickListener(this) + binding.test3Answer1Btn.setOnClickListener(this) + binding.test3Answer2Btn.setOnClickListener(this) + binding.test3Answer3Btn.setOnClickListener(this) + binding.test3Answer4Btn.setOnClickListener(this) + + + return binding.root + } + + override fun onClick(v: View?) { + when(v?.id) { + R.id.test3_answer1_btn -> { + if(a1) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test3Answer1Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1-- + point3-- + } else { + binding.test3Answer1Btn.setBackgroundResource(R.drawable.round_green) + point1++ + point3++ + } + a1 = !a1 + setBtn() + } + R.id.test3_answer2_btn -> { + if(a2) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test3Answer2Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1-- + point3-- + point4-- + } else { + binding.test3Answer2Btn.setBackgroundResource(R.drawable.round_green) + point1++ + point3++ + point4++ + } + a2 = !a2 + setBtn() + } + R.id.test3_answer3_btn -> { + if(a3) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test3Answer3Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1-- + point2-- + point4-- + } else { + binding.test3Answer3Btn.setBackgroundResource(R.drawable.round_green) + point1++ + point2++ + point4++ + } + a3 = !a3 + setBtn() + } + R.id.test3_answer4_btn -> { + if(a4) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test3Answer4Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1-- + point2-- + point3-- + point4-- + } else { + binding.test3Answer4Btn.setBackgroundResource(R.drawable.round_green) + point1++ + point2++ + point3++ + point4++ + } + a4 = !a4 + setBtn() + } + R.id.test3_next_btn -> { + testActivity.addPoint(point1, point2, point3, point4) + testActivity.changeFragment(4) + } + } + } + + fun setBtn() { + binding.test3NextBtn.isEnabled = !(!a1 && !a2 && !a3 && !a4) + if (binding.test3NextBtn.isEnabled) { + binding.test3NextBtn.setBackgroundResource(R.drawable.round_red) + binding.test3NextBtn.setTextColor(Color.WHITE) + } else { + binding.test3NextBtn.setBackgroundResource(R.drawable.round_grey) + binding.test3NextBtn.setTextColor(Color.parseColor("#A9A9A9")) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/Test4Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/Test4Fragment.kt new file mode 100644 index 0000000..5897e0f --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/Test4Fragment.kt @@ -0,0 +1,115 @@ +package com.example.mapforgirls.ui.test + +import android.graphics.Color +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.FragmentTest2Binding +import com.example.mapforgirls.databinding.FragmentTest4Binding + +class Test4Fragment : Fragment(), View.OnClickListener { + lateinit var binding: FragmentTest4Binding + lateinit var testActivity : TestActivity + + var point1 = 0 + var point2 = 0 + var point3 = 0 + var point4 = 0 + var a1 = false + var a2 = false + var a3 = false + var a4 = false + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTest4Binding.inflate(inflater, container, false) + testActivity = activity as TestActivity + + binding.test4NextBtn.isEnabled = false + + binding.test4NextBtn.setOnClickListener(this) + binding.test4Answer1Btn.setOnClickListener(this) + binding.test4Answer2Btn.setOnClickListener(this) + binding.test4Answer3Btn.setOnClickListener(this) + binding.test4Answer4Btn.setOnClickListener(this) + + + return binding.root + } + + override fun onClick(v: View?) { + when(v?.id) { + R.id.test4_answer1_btn -> { + if(a1) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test4Answer1Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point1-- + } else { + binding.test4Answer1Btn.setBackgroundResource(R.drawable.round_green) + point1++ + } + a1 = !a1 + setBtn() + } + R.id.test4_answer2_btn -> { + if(a2) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test4Answer2Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point2-- + point4-- + } else { + binding.test4Answer2Btn.setBackgroundResource(R.drawable.round_green) + point2++ + point3 = point3 - 100 + point4++ + } + a2 = !a2 + setBtn() + } + R.id.test4_answer3_btn -> { + if(a3) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test4Answer3Btn.setBackgroundResource(R.drawable.round_grey_stroke) + point4-- + } else { + binding.test4Answer3Btn.setBackgroundResource(R.drawable.round_green) + point4++ + } + a3 = !a3 + setBtn() + } + R.id.test4_answer4_btn -> { + if(a4) { +// binding.test2Answer2Btn.setBackgroundResource(R.drawable.testcheck_before1) + binding.test4Answer4Btn.setBackgroundResource(R.drawable.round_grey_stroke) + } else { + binding.test4Answer4Btn.setBackgroundResource(R.drawable.round_green) + } + a4 = !a4 + setBtn() + } + R.id.test4_next_btn -> { + testActivity.addPoint(point1, point2, point3, point4) + testActivity.changeFragment(0) + } + } + } + + fun setBtn() { + binding.test4NextBtn.isEnabled = !(!a1 && !a2 && !a3 && !a4) + if (binding.test4NextBtn.isEnabled) { + binding.test4NextBtn.setBackgroundResource(R.drawable.round_red) + binding.test4NextBtn.setTextColor(Color.WHITE) + } else { + binding.test4NextBtn.setBackgroundResource(R.drawable.round_grey) + binding.test4NextBtn.setTextColor(Color.parseColor("#A9A9A9")) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestActivity.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestActivity.kt new file mode 100644 index 0000000..eed1eca --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestActivity.kt @@ -0,0 +1,62 @@ +package com.example.mapforgirls.ui.test + +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat +import com.example.mapforgirls.MapsFragment +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.ActivityColumnDetailBinding +import com.example.mapforgirls.databinding.ActivityTestBinding +import kotlinx.android.synthetic.main.activity_test.* +import kotlinx.android.synthetic.main.fragment_test1.* + + +class TestActivity : AppCompatActivity() { + lateinit var binding : ActivityTestBinding + var point1 = 0 + var point2 = 0 + var point3 = 0 + var point4 = 0 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityTestBinding.inflate(layoutInflater) + setContentView(binding.root) + + supportFragmentManager.beginTransaction() + .replace(R.id.test_frm, Test1Fragment()) + .commitAllowingStateLoss() + } + + + fun changeFragment(index: Int) { + when(index) { + 2 -> supportFragmentManager!!.beginTransaction() + .replace(R.id.test_frm, Test2Fragment()) + .commitAllowingStateLoss() + 3 -> supportFragmentManager!!.beginTransaction() + .replace(R.id.test_frm, Test3Fragment()) + .commitAllowingStateLoss() + 4 -> supportFragmentManager!!.beginTransaction() + .replace(R.id.test_frm, Test4Fragment()) + .commitAllowingStateLoss() + 0 -> { + var intent = Intent(this, TestResultActivity::class.java) + intent.putExtra("point1", point1) + intent.putExtra("point2", point2) + intent.putExtra("point3", point3) + intent.putExtra("point4", point4) + startActivity(intent) + } + } + } + + fun addPoint(point1 : Int, point2 : Int, point3 : Int, point4 : Int) { + this.point1 += point1 + this.point2 += point2 + this.point3 += point3 + this.point4 += point4 + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestResult1Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult1Fragment.kt new file mode 100644 index 0000000..b2e1a14 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult1Fragment.kt @@ -0,0 +1,29 @@ +package com.example.mapforgirls.ui.test + +import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.mapforgirls.MainActivity +import com.example.mapforgirls.databinding.FragmentTestCottonBinding + +class TestResult1Fragment: Fragment() { + lateinit var binding : FragmentTestCottonBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTestCottonBinding.inflate(inflater, container, false) + + binding.testEndCotton.setOnClickListener { + var intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestResult2Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult2Fragment.kt new file mode 100644 index 0000000..bc6bb01 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult2Fragment.kt @@ -0,0 +1,30 @@ +package com.example.mapforgirls.ui.test + +import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.mapforgirls.MainActivity +import com.example.mapforgirls.databinding.FragmentTestCottonBinding +import com.example.mapforgirls.databinding.FragmentTestCupBinding + +class TestResult2Fragment: Fragment() { + lateinit var binding : FragmentTestCupBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTestCupBinding.inflate(inflater, container, false) + + binding.testEndCup.setOnClickListener { + var intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestResult3Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult3Fragment.kt new file mode 100644 index 0000000..69ee908 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult3Fragment.kt @@ -0,0 +1,30 @@ +package com.example.mapforgirls.ui.test + +import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.mapforgirls.MainActivity +import com.example.mapforgirls.databinding.FragmentTestCottonBinding +import com.example.mapforgirls.databinding.FragmentTestPadBinding + +class TestResult3Fragment: Fragment() { + lateinit var binding : FragmentTestPadBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTestPadBinding.inflate(inflater, container, false) + + binding.testEndPad.setOnClickListener { + var intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestResult4Fragment.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult4Fragment.kt new file mode 100644 index 0000000..56434ee --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestResult4Fragment.kt @@ -0,0 +1,29 @@ +package com.example.mapforgirls.ui.test + +import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.mapforgirls.MainActivity +import com.example.mapforgirls.databinding.FragmentTestTamponBinding + +class TestResult4Fragment: Fragment() { + lateinit var binding : FragmentTestTamponBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentTestTamponBinding.inflate(inflater, container, false) + + binding.testEndTampon.setOnClickListener { + var intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestResultActivity.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestResultActivity.kt new file mode 100644 index 0000000..7efc8e0 --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestResultActivity.kt @@ -0,0 +1,62 @@ +package com.example.mapforgirls.ui.test + +import android.os.Bundle +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import com.example.mapforgirls.R +import com.example.mapforgirls.databinding.ActivityTestResultBinding + +class TestResultActivity : AppCompatActivity() { + lateinit var binding : ActivityTestResultBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityTestResultBinding.inflate(layoutInflater) + setContentView(binding.root) + + var point1 = intent.getIntExtra("point1", 0) + var point2 = intent.getIntExtra("point2", 0) + var point3 = intent.getIntExtra("point3", 0) + var point4 = intent.getIntExtra("point4", 0) + + + var arr = arrayOf(point1, point2, point3, point4) + var result = arr.max() + Log.d("dd", arr.toString()) + Log.d("dd", result.toString()) + + if(point1 == result) { + setFragment("point1") + }else if (point2 == result){ + setFragment("point2") + }else if (point3 == result){ + setFragment("point3") + }else{ + setFragment("point4") + } + + + + } + + fun setFragment(result: String) { + when(result) { + "point1" -> {supportFragmentManager.beginTransaction() + .replace(R.id.test_result_frm, TestResult1Fragment()) + .commitAllowingStateLoss() + } + "point1" -> {supportFragmentManager.beginTransaction() + .replace(R.id.test_result_frm, TestResult2Fragment()) + .commitAllowingStateLoss() + } + "point3" -> {supportFragmentManager.beginTransaction() + .replace(R.id.test_result_frm, TestResult3Fragment()) + .commitAllowingStateLoss() + } + "point4" -> {supportFragmentManager.beginTransaction() + .replace(R.id.test_result_frm, TestResult4Fragment()) + .commitAllowingStateLoss() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mapforgirls/ui/test/TestVPAdapter.kt b/app/src/main/java/com/example/mapforgirls/ui/test/TestVPAdapter.kt new file mode 100644 index 0000000..b6164cd --- /dev/null +++ b/app/src/main/java/com/example/mapforgirls/ui/test/TestVPAdapter.kt @@ -0,0 +1,18 @@ +package com.example.mapforgirls.ui.test + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter + +class TestVPAdapter(fragment : FragmentActivity) : FragmentStateAdapter(fragment) { + override fun getItemCount(): Int = 4 + + override fun createFragment(position: Int): Fragment { + return when (position) { + 0 -> Test1Fragment() + 1 -> Test2Fragment() + 2-> Test3Fragment() + else -> Test4Fragment() + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_hambuger.png b/app/src/main/res/drawable/ic_hambuger.png new file mode 100644 index 0000000..f6b04a2 Binary files /dev/null and b/app/src/main/res/drawable/ic_hambuger.png differ diff --git a/app/src/main/res/drawable/ic_search.png b/app/src/main/res/drawable/ic_search.png new file mode 100644 index 0000000..a96c27e Binary files /dev/null and b/app/src/main/res/drawable/ic_search.png differ diff --git a/app/src/main/res/drawable/ic_x.png b/app/src/main/res/drawable/ic_x.png new file mode 100644 index 0000000..0511132 Binary files /dev/null and b/app/src/main/res/drawable/ic_x.png differ diff --git a/app/src/main/res/drawable/round_white_50dp.xml b/app/src/main/res/drawable/round_white_50dp.xml new file mode 100644 index 0000000..5f0e354 --- /dev/null +++ b/app/src/main/res/drawable/round_white_50dp.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_chatting_detail.xml b/app/src/main/res/layout/activity_chatting_detail.xml index fae8513..f6408de 100644 --- a/app/src/main/res/layout/activity_chatting_detail.xml +++ b/app/src/main/res/layout/activity_chatting_detail.xml @@ -20,7 +20,7 @@ android:id="@+id/chatting_detail_pharmacist_civ" android:layout_width="70dp" android:layout_height="70dp" - android:src="@drawable/ic_launcher_background" + android:src="@drawable/img_women_nostroke" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -29,18 +29,23 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" + android:text="0000μ•½κ΅­ 약사" - android:textSize="24sp" + android:textSize="60px" android:textStyle="bold" android:textColor="@color/black" + app:layout_constraintTop_toTopOf="@id/chatting_detail_pharmacist_civ" app:layout_constraintBottom_toBottomOf="@id/chatting_detail_pharmacist_civ" app:layout_constraintStart_toEndOf="@id/chatting_detail_pharmacist_civ"/>