[Hotfix/#94] : team tag color

app/src/main/AndroidManifest.xml

@@ -13,7 +13,6 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application
         android:name=".WableApp"

core/common/src/main/res/raw/tab_lottie.json

@@ -1 +1 @@
-{"nm":"Main Scene","ddd":0,"h":4,"w":360,"meta":{"g":"@lottiefiles/creator 1.22.0"},"layers":[{"ty":4,"nm":"Rectangle 1","sr":1,"st":0,"op":150,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0.5,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[180.5,1]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"rc","bm":0,"hd":false,"nm":"Rectangle Path 1","d":1,"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[360,2]}},{"ty":"gf","bm":0,"hd":false,"nm":"Fill","e":{"a":0,"k":[188,0]},"g":{"p":2,"k":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0,0.5607843137254902,0.29411764705882354,1,1,0.00784313725490196,0.9137254901960784,0.8117647058823529],"t":0},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0,0.00784313725490196,0.9137254901960784,0.8117647058823529,1,0.5607843137254902,0.29411764705882354,1],"t":60},{"s":[0,0.5607843137254902,0.29411764705882354,1,1,0.00784313725490196,0.9137254901960784,0.8117647058823529],"t":120}]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[-188,0]},"r":2,"o":{"a":0,"k":100}}],"ind":1}],"v":"5.7.0","fr":30,"op":120,"ip":0,"assets":[]}
+{"nm":"Main Scene","ddd":0,"h":4,"w":360,"meta":{"g":"@lottiefiles/creator 1.25.0"},"layers":[{"ty":4,"nm":"Rectangle 1","sr":1,"st":0,"op":150,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[180,3]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"rc","bm":0,"hd":false,"nm":"Rectangle Path 1","d":1,"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[360,2]}},{"ty":"gf","bm":0,"hd":false,"nm":"Fill","e":{"a":0,"k":[188,0]},"g":{"p":2,"k":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0,0.5607843137254902,0.29411764705882354,1,1,0.00784313725490196,0.9137254901960784,0.8117647058823529],"t":0},{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0,0.00784313725490196,0.9137254901960784,0.8117647058823529,1,0.5607843137254902,0.29411764705882354,1],"t":60},{"s":[0,0.5607843137254902,0.29411764705882354,1,1,0.00784313725490196,0.9137254901960784,0.8117647058823529],"t":120}]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[-188,0]},"r":2,"o":{"a":0,"k":100}}],"ind":1}],"v":"5.7.0","fr":30,"op":120,"ip":0,"assets":[]}

core/ui/src/main/res/values/colors.xml

@@ -33,8 +33,8 @@
     <color name="bro_10">#FFE3EAE7</color>
     <color name="drx_50">#FF1004A4</color>
     <color name="drx_10">#FFE4E3F3</color>
-    <color name="dk_50">#FF4A4A4A</color>
-    <color name="dk_10">#FFEDEDED</color>
+    <color name="dk_50">#FF4F5551</color>
+    <color name="dk_10">#FFE0F7E7</color>
     <color name="kt_50">#FFFF0A09</color>
     <color name="kt_10">#FFFCE4E4</color>
     <color name="fox_50">#FFD31F28</color>

feature/home/src/main/java/com/teamwable/home/HomeFragment.kt

@@ -27,6 +27,7 @@ import com.teamwable.ui.extensions.setDividerWithPadding
 import com.teamwable.ui.extensions.stringOf
 import com.teamwable.ui.extensions.viewLifeCycle
 import com.teamwable.ui.extensions.viewLifeCycleScope
+import com.teamwable.ui.extensions.visible
 import com.teamwable.ui.shareAdapter.FeedAdapter
 import com.teamwable.ui.shareAdapter.FeedClickListener
 import com.teamwable.ui.shareAdapter.FeedViewHolder
@@ -179,6 +180,13 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(FragmentHomeBinding::i
                 }
             }
         }
+
+        viewLifeCycleScope.launch {
+            feedAdapter.loadStateFlow.collectLatest { loadStates ->
+                val isEmptyList = loadStates.refresh is LoadState.NotLoading && feedAdapter.itemCount == 0
+                binding.tvEmpty.visible(isEmptyList)
+            }
+        }
     }
 
     private fun setSwipeLayout() {

feature/home/src/main/res/layout/fragment_home.xml

@@ -10,7 +10,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:backgroundTint="@color/white"
-        android:paddingBottom="2dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -71,4 +70,16 @@
             app:pressedTranslationZ="0dp"
             app:tint="@null" />
     </FrameLayout>
+
+    <TextView
+        android:id="@+id/tv_empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="아직 작성된 글이 없어요."
+        android:textAppearance="@style/TextAppearance.Wable.Body2"
+        android:textColor="@color/gray_500"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

feature/news/src/main/java/com/teamwable/news/rank/NewsRankFragment.kt

@@ -1,7 +1,5 @@
 package com.teamwable.news.rank
 
-import android.content.Intent
-import android.net.Uri
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
@@ -37,7 +35,8 @@ class NewsRankFragment : BindingFragment<FragmentNewsRankBinding>(FragmentNewsRa
     private fun setupGameTypeObserve() {
         viewModel.gameTypeUiState.flowWithLifecycle(viewLifeCycle).onEach {
             when (it) {
-                is UiState.Success -> setSeasonText(it.data)
+                // 임시 하드 코딩
+                is UiState.Success -> setSeasonText("2024 LCK Summer")
                 else -> Unit
             }
         }.launchIn(viewLifeCycleScope)
@@ -76,7 +75,7 @@ class NewsRankFragment : BindingFragment<FragmentNewsRankBinding>(FragmentNewsRa
         spannableString.setSpan(
             ForegroundColorSpan(colorOf(com.teamwable.ui.R.color.sky_50)),
             16, spannableString.length,
-            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
         )
 
         binding.btnNewsRankOpinion.text = spannableString

feature/profile/src/main/java/com/teamwable/profile/profile/BindingProfileFragment.kt

@@ -28,7 +28,7 @@ abstract class BindingProfileFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View? {
-        _binding = FragmentProfileBinding.inflate(layoutInflater)
+        _binding = FragmentProfileBinding.inflate(inflater, container, false)
         return binding.root
     }
 

feature/profile/src/main/java/com/teamwable/profile/profile/ProfileMemberFragment.kt

@@ -28,7 +28,7 @@ class ProfileMemberFragment : BindingProfileFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        userId = arguments?.getLong(Arg.PROFILE_USER_ID) ?: -1L
+        userId = arguments?.getLong(Arg.PROFILE_USER_ID) ?: return
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {