glide bug fix

easyhooon · Jun 20, 2021 · 59c52af · 59c52af
1 parent 4c021ee
commit 59c52af
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/AccountInfoActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/AccountInfoActivity.kt
@@ -131,7 +131,8 @@ class AccountInfoActivity : AppCompatActivity() {
  }
  }
 
- //todo 수정 필요
+ //수정 필요
+ //이건 데이터만 지우는 거임
  //User 탈퇴하면 그 유저가 쓴거 다 날려야되네?
  private fun deleteAccount() {
  val deleteRef: StorageReference = storageRef.child("profile images/${firebaseUser.uid}.jpg")

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/EditProfileActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/EditProfileActivity.kt
@@ -26,6 +26,10 @@ import kr.ac.konkuk.koogle.Adapter.AddTagAdapter
 import kr.ac.konkuk.koogle.Adapter.TagAdapter
 import kr.ac.konkuk.koogle.DBKeys
 import kr.ac.konkuk.koogle.DBKeys.Companion.DB_USERS
+import kr.ac.konkuk.koogle.DBKeys.Companion.SUB_TAGS
+import kr.ac.konkuk.koogle.DBKeys.Companion.TAG_INDEX
+import kr.ac.konkuk.koogle.DBKeys.Companion.TAG_TYPE
+import kr.ac.konkuk.koogle.DBKeys.Companion.TAG_VALUE
 import kr.ac.konkuk.koogle.DBKeys.Companion.USER_NAME
 import kr.ac.konkuk.koogle.DBKeys.Companion.USER_PROFILE_IMAGE_PATH
 import kr.ac.konkuk.koogle.DBKeys.Companion.USER_PROFILE_IMAGE_URL
@@ -64,10 +68,10 @@ class EditProfileActivity : ProfileCommonActivity() {
  for ((i, s) in value.sub_tag_list.withIndex()) {
  newSubTag[s] = i
  }
- newTag[DBKeys.TAG_INDEX] = j
- newTag[DBKeys.SUB_TAGS] = newSubTag
- newTag[DBKeys.TAG_TYPE] = value.tag_type
- newTag[DBKeys.TAG_VALUE] = value.value
+ newTag[TAG_INDEX] = j
+ newTag[SUB_TAGS] = newSubTag
+ newTag[TAG_TYPE] = value.tag_type
+ newTag[TAG_VALUE] = value.value
  tags[value.main_tag_name] = newTag
  j++
  }
@@ -251,11 +255,11 @@ class EditProfileActivity : ProfileCommonActivity() {
  private fun initUserInfo() {
  //입력 로그인용 유저의 데이터를 불러오기 위한 uid
  val uid = firebaseUser.uid
- val currentUserRef = Firebase.database.reference.child(DBKeys.DB_USERS).child(uid)
+ val currentUserRef = Firebase.database.reference.child(DB_USERS).child(uid)
 // val userRef = FirebaseDatabase.getInstance().getReference(DB_USERS).child(uid)와 같다
 
 // 파이어베이스 데이터베이스의 정보 가져오기
- currentUserRef.addValueEventListener(object : ValueEventListener {
+ currentUserRef.addListenerForSingleValueEvent(object : ValueEventListener {
  override fun onDataChange(snapshot: DataSnapshot) {
  if (snapshot.exists()) {
  val userModel: UserModel? = snapshot.getValue(UserModel::class.java)

diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
@@ -135,7 +135,7 @@
  android:id="@+id/locationInfoLayout"
  android:layout_width="match_parent"
  android:layout_height="0dp"
- android:layout_weight="1.2"
+ android:layout_weight="1.6"
  android:orientation="horizontal"
  android:background="@drawable/borderline_top_bottom">
 
@@ -197,9 +197,11 @@
 
  <Button
  android:id="@+id/contactButton"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
  android:layout_height="0dp"
- android:layout_weight="1"
+ android:layout_gravity="center"
+ android:ems="10"
+ android:layout_weight="1.4"
  android:layout_margin="10dp"
  android:text="@string/contact" />
 

diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -4,7 +4,7 @@
  xmlns:tools="http:https://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- android:background="#92A8D1"
+ android:background="@color/colorMain"
  tools:context=".Activity.SplashActivity">
 
  <ImageView