diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 43ae24e..85373de 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
+
-
+
diff --git a/app/google-services.json b/app/google-services.json
deleted file mode 100644
index 7da96d2..0000000
--- a/app/google-services.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "project_info": {
- "project_number": "629312312506",
- "project_id": "wonderwoman-6c8cf",
- "storage_bucket": "wonderwoman-6c8cf.appspot.com"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "1:629312312506:android:8acd9b21d3fbc9d20c1e83",
- "android_client_info": {
- "package_name": "com.example.wonderwoman"
- }
- },
- "oauth_client": [
- {
- "client_id": "629312312506-9rv911n3ke8jo3a2d284cr2kj91kr6th.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyAOtug-wbpqwI3xutRXR7jzY8xJZCyNuOA"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "629312312506-9rv911n3ke8jo3a2d284cr2kj91kr6th.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3815a9c..f7d3e9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,26 +13,20 @@
android:theme="@style/Theme.WonderWoman"
tools:targetApi="31">
-
-
-
-
+
+
+
+
-
+
+
+
-
-
-
-
-
-
(R.id.receive_name_id)
+ supportaction.text=receiverName
+
+ val supportaction2= findViewById(R.id.receive_name_text)
+ supportaction2.text=receiverName
+
//메세지전송
binding.sendBtn.setOnClickListener{
diff --git a/app/src/main/java/com/example/wonderwoman/Login.kt b/app/src/main/java/com/example/wonderwoman/Login.kt
index ac0da52..12af7a9 100644
--- a/app/src/main/java/com/example/wonderwoman/Login.kt
+++ b/app/src/main/java/com/example/wonderwoman/Login.kt
@@ -16,7 +16,7 @@ class Login : AppCompatActivity() {
private lateinit var mDbRef: DatabaseReference
- val name = "somin333"
+ val name = "익명3"
val email = "somin455@nate.com"
val password = "somin455"
@@ -48,7 +48,7 @@ class Login : AppCompatActivity() {
mAuth.signInWithEmailAndPassword(email, password)
.addOnCompleteListener(this) { task ->
if (task.isSuccessful) {
- val intent2: Intent = Intent(this,UserList::class.java)
+ val intent2: Intent = Intent(this,Main1Activity::class.java)
startActivity(intent2)
finish()
Toast.makeText(this,"로그인성공", Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/example/wonderwoman/LoginActivity.kt b/app/src/main/java/com/example/wonderwoman/LoginActivity.kt
index a65a7ba..303ba25 100644
--- a/app/src/main/java/com/example/wonderwoman/LoginActivity.kt
+++ b/app/src/main/java/com/example/wonderwoman/LoginActivity.kt
@@ -51,6 +51,9 @@ class LoginActivity : AppCompatActivity() {
if(type.equals("success")){
dialog.setTitle("로그인 성공")
dialog.setMessage("로그인 성공!")
+ val intent: Intent = Intent(this,MainActivity::class.java)
+ startActivity(intent)
+ finish()
}
else if(type.equals("fail")){
dialog.setTitle("로그인 실패")
diff --git a/app/src/main/java/com/example/wonderwoman/MainActivity.kt b/app/src/main/java/com/example/wonderwoman/MainActivity.kt
index 1286cdc..7b64879 100644
--- a/app/src/main/java/com/example/wonderwoman/MainActivity.kt
+++ b/app/src/main/java/com/example/wonderwoman/MainActivity.kt
@@ -47,8 +47,11 @@ class MainActivity : AppCompatActivity() {
writeBtn.visibility = View.VISIBLE
}
R.id.chat_menu -> {
- chatFragment = ChatFragment.newInstance()
- supportFragmentManager.beginTransaction().replace(R.id.fragment,chatFragment).commit()
+ val intent = Intent(this, UserList.newInstance()::class.java)
+// startActivity(intent)
+// writeBtn.visibility = View.INVISIBLE
+// chatFragment = UserList.newInstance()
+ supportFragmentManager.beginTransaction().replace(R.id.fragment,UserList.newInstance()).commit()
writeBtn.visibility = View.INVISIBLE
}
R.id.mypage_menu -> {
diff --git a/app/src/main/java/com/example/wonderwoman/UserAdapter.kt b/app/src/main/java/com/example/wonderwoman/UserAdapter.kt
index 6e53f17..b52dddc 100644
--- a/app/src/main/java/com/example/wonderwoman/UserAdapter.kt
+++ b/app/src/main/java/com/example/wonderwoman/UserAdapter.kt
@@ -10,12 +10,12 @@ import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
class UserAdapter (val context: Context, private val userList:ArrayList):
-RecyclerView.Adapter(){
+ RecyclerView.Adapter(){
//화면설정
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserViewHolder {
val view: View = LayoutInflater.from(context).
- inflate(R.layout.activity_userlist_item,parent,false)
+ inflate(R.layout.activity_userlist_item_gui,parent,false)
return UserViewHolder(view)
}
diff --git a/app/src/main/java/com/example/wonderwoman/UserList.kt b/app/src/main/java/com/example/wonderwoman/UserList.kt
index 0da7b99..dcdab24 100644
--- a/app/src/main/java/com/example/wonderwoman/UserList.kt
+++ b/app/src/main/java/com/example/wonderwoman/UserList.kt
@@ -1,10 +1,15 @@
package com.example.wonderwoman
import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import com.example.wonderwoman.databinding.ActivityUserlistBinding
+import com.example.wonderwoman.databinding.ActivityUserlistGuiBinding
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.ktx.auth
import com.google.firebase.database.DataSnapshot
@@ -14,9 +19,9 @@ import com.google.firebase.database.ValueEventListener
import com.google.firebase.database.ktx.database
import com.google.firebase.ktx.Firebase
-class UserList :AppCompatActivity() {
+class UserList :Fragment() {
- lateinit var binding: ActivityUserlistBinding
+ lateinit var binding: ActivityUserlistGuiBinding
lateinit var adapter: UserAdapter
lateinit var mAuth: FirebaseAuth
@@ -24,11 +29,20 @@ class UserList :AppCompatActivity() {
lateinit var userList: ArrayList
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- binding=ActivityUserlistBinding.inflate(layoutInflater)
- setContentView(binding.root)
-
+ companion object {
+ fun newInstance() : UserList {
+ return UserList()
+ }
+ }
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = ActivityUserlistGuiBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
//인증초기화
mAuth= Firebase.auth
@@ -39,9 +53,9 @@ class UserList :AppCompatActivity() {
userList=ArrayList()
//
- adapter=UserAdapter(this,userList)
+ adapter=UserAdapter(context = requireContext(), userList = userList)
- binding.userRecyclerview.layoutManager=LinearLayoutManager(this)
+ binding.userRecyclerview.layoutManager=LinearLayoutManager(requireContext())
binding.userRecyclerview.adapter=adapter
//사용자정보가져오기
diff --git a/app/src/main/res/drawable/chat_announcement.png b/app/src/main/res/drawable/chat_announcement.png
new file mode 100644
index 0000000..a96350a
Binary files /dev/null and b/app/src/main/res/drawable/chat_announcement.png differ
diff --git a/app/src/main/res/drawable/chat_back.png b/app/src/main/res/drawable/chat_back.png
new file mode 100644
index 0000000..ddc9938
Binary files /dev/null and b/app/src/main/res/drawable/chat_back.png differ
diff --git a/app/src/main/res/drawable/chat_dot3.png b/app/src/main/res/drawable/chat_dot3.png
new file mode 100644
index 0000000..2fed1b1
Binary files /dev/null and b/app/src/main/res/drawable/chat_dot3.png differ
diff --git a/app/src/main/res/drawable/chat_ing.png b/app/src/main/res/drawable/chat_ing.png
new file mode 100644
index 0000000..ebfa874
Binary files /dev/null and b/app/src/main/res/drawable/chat_ing.png differ
diff --git a/app/src/main/res/drawable/chat_place.png b/app/src/main/res/drawable/chat_place.png
new file mode 100644
index 0000000..fda2e66
Binary files /dev/null and b/app/src/main/res/drawable/chat_place.png differ
diff --git a/app/src/main/res/drawable/chat_send.png b/app/src/main/res/drawable/chat_send.png
new file mode 100644
index 0000000..6fdd24e
Binary files /dev/null and b/app/src/main/res/drawable/chat_send.png differ
diff --git a/app/src/main/res/drawable/ic_chating_ing.png b/app/src/main/res/drawable/ic_chating_ing.png
new file mode 100644
index 0000000..e3f97a0
Binary files /dev/null and b/app/src/main/res/drawable/ic_chating_ing.png differ
diff --git a/app/src/main/res/drawable/ic_userlist_item.xml b/app/src/main/res/drawable/ic_userlist_item.xml
new file mode 100644
index 0000000..9e0794f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_userlist_item.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/font/noto_sans.xml b/app/src/main/res/font/noto_sans.xml
index cc18438..7545c14 100644
--- a/app/src/main/res/font/noto_sans.xml
+++ b/app/src/main/res/font/noto_sans.xml
@@ -1,8 +1,10 @@
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+
diff --git a/app/src/main/res/font/noto_sans_bold.xml b/app/src/main/res/font/noto_sans_bold.xml
index df10303..868905c 100644
--- a/app/src/main/res/font/noto_sans_bold.xml
+++ b/app/src/main/res/font/noto_sans_bold.xml
@@ -1,7 +1,9 @@
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+
diff --git a/app/src/main/res/layout/activity_chat_gui.xml b/app/src/main/res/layout/activity_chat_gui.xml
new file mode 100644
index 0000000..9652801
--- /dev/null
+++ b/app/src/main/res/layout/activity_chat_gui.xml
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_receive.xml b/app/src/main/res/layout/activity_receive.xml
index 8a03462..5e8c427 100644
--- a/app/src/main/res/layout/activity_receive.xml
+++ b/app/src/main/res/layout/activity_receive.xml
@@ -11,7 +11,8 @@
android:layout_margin="5dp"
android:background="@drawable/ic_receive"
android:padding="10dp"
- android:text="보내는 메세지"
+ android:text="받는 메세지"
+ android:textColor="@color/gray3"
android:textSize="18sp"/>
diff --git a/app/src/main/res/layout/activity_send.xml b/app/src/main/res/layout/activity_send.xml
index 657ed21..ab124b3 100644
--- a/app/src/main/res/layout/activity_send.xml
+++ b/app/src/main/res/layout/activity_send.xml
@@ -11,7 +11,8 @@
android:layout_margin="5dp"
android:background="@drawable/ic_send"
android:padding="10dp"
- android:text="받는메세지"
+ android:text="보내는 메시지"
+ android:textColor="@color/gray3"
android:textSize="18sp"/>
diff --git a/app/src/main/res/layout/activity_userlist_gui.xml b/app/src/main/res/layout/activity_userlist_gui.xml
new file mode 100644
index 0000000..8893b35
--- /dev/null
+++ b/app/src/main/res/layout/activity_userlist_gui.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_userlist_item_gui.xml b/app/src/main/res/layout/activity_userlist_item_gui.xml
new file mode 100644
index 0000000..3c0c453
--- /dev/null
+++ b/app/src/main/res/layout/activity_userlist_item_gui.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file