Merge remote-tracking branch 'origin/master'

easyhooon · Jun 20, 2021 · f969708 · f969708
2 parents 80991bd + be82098
commit f969708
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt
@@ -220,6 +220,8 @@ class ArticleActivity : AppCompatActivity() {
  private fun deleteArticle() {
  currentArticleRef.setValue(null)
  currentGroupRef.setValue(null)
+ //유저의 그룹에서도 삭제
+ currentUserGroupRef.setValue(null)
  val storageRef = storage.reference.child(ARTICLE_IMAGE_PATH)
  for (name in fileNameList) {
  storageRef.child(name).delete()

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/CheckProfileActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/CheckProfileActivity.kt
@@ -44,12 +44,6 @@ class CheckProfileActivity : AppCompatActivity() {
 
  private var userCommentList = mutableListOf<CommentModel>()
 
- private val auth:FirebaseAuth by lazy {
- Firebase.auth
- }
-
- private val firebaseUser= auth.currentUser!!
-
  private val userRef: DatabaseReference by lazy {
  Firebase.database.reference.child(DB_USERS)
  }

diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
@@ -46,6 +46,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:src="@drawable/ic_my_location"
+ android:backgroundTint="@color/colorMain"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintBottom_toBottomOf="@id/mapFragment"
  android:layout_marginEnd="32dp"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -15,7 +15,7 @@
  <color name="tint">#F7CAC9</color>
  <color name="facebook">#5D91EC</color>
 
- <color name="colorMain">#0077b6</color>
+ <color name="colorMain">#6D95DD</color>
  <color name="color1">#bde0fe</color>
  <color name="color2">#ffafcc</color>
  <color name="color3">#ffc8dd</color>