Merge pull request #248 from TeamPINGLE/fix-3rd-sprint-qa-jieun

[fix] 3차 스프린트 QA 수정사항 반영
TeamPINGLE · Mar 12, 2024 · 26c22c9 · 26c22c9
2 parents 7b9727c + 009a320
commit 26c22c9
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 24 deletions.
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupSuccessActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupSuccessActivity.kt
@@ -13,10 +13,10 @@ import org.sopt.pingle.presentation.ui.main.MainActivity
 import org.sopt.pingle.util.AmplitudeUtils
 import org.sopt.pingle.util.activity.setDoubleBackPressToExit
 import org.sopt.pingle.util.base.BindingActivity
+import org.sopt.pingle.util.makeEllipsisGroupName
 
 class JoinGroupSuccessActivity :
     BindingActivity<ActivityJoinGroupSuccessBinding>(R.layout.activity_join_group_success) {
-    private lateinit var groupName: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,7 +27,7 @@ class JoinGroupSuccessActivity :
     }
 
     private fun initLayout() {
-        groupName = intent.getStringExtra(JoinGroupCodeActivity.GROUP_NAME).toString()
+        val groupName = intent.getStringExtra(JoinGroupCodeActivity.GROUP_NAME).toString().makeEllipsisGroupName()
 
         binding.tvJoinGroupSuccessDescriptionGroupName.text = SpannableString(
             getString(

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/mygroup/MyGroupActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/mygroup/MyGroupActivity.kt
@@ -14,11 +14,13 @@ import org.sopt.pingle.databinding.ActivityMyGroupBinding
 import org.sopt.pingle.domain.model.MyGroupEntity
 import org.sopt.pingle.presentation.type.SnackbarType
 import org.sopt.pingle.presentation.ui.onboarding.onboarding.OnboardingActivity
+import org.sopt.pingle.presentation.ui.onboarding.onboarding.OnboardingActivity.Companion.FROM_ACTIVITY
 import org.sopt.pingle.util.AmplitudeUtils
 import org.sopt.pingle.util.base.BindingActivity
 import org.sopt.pingle.util.component.PingleSnackbar
 import org.sopt.pingle.util.context.sharePingle
 import org.sopt.pingle.util.context.stringOf
+import org.sopt.pingle.util.makeEllipsisGroupName
 import org.sopt.pingle.util.view.UiState
 import org.sopt.pingle.util.view.copyGroupCode
 import timber.log.Timber
@@ -101,7 +103,7 @@ class MyGroupActivity : BindingActivity<ActivityMyGroupBinding>(R.layout.activit
         MyGroupModalDialogFragment(
             title = getString(
                 R.string.my_group_modal_move_question,
-                clickedEntity.name
+                clickedEntity.name.makeEllipsisGroupName()
             ),
             buttonText = stringOf(R.string.my_group_modal_change),
             textButtonText = stringOf(R.string.my_group_modal_back),
@@ -138,13 +140,15 @@ class MyGroupActivity : BindingActivity<ActivityMyGroupBinding>(R.layout.activit
     private fun navigateToNewGroupInfo() {
         AmplitudeUtils.trackEvent(CLICK_NEWGROUP)
         Intent(this, OnboardingActivity::class.java).apply {
+            putExtra(FROM_ACTIVITY, MY_GROUP_ACTIVITY)
             startActivity(this)
         }
     }
 
     companion object {
         private const val CHANGE_MODAL = "ChangeGroupModal"
         private const val SNACKBAR_BOTTOM_MARGIN = 57
+        const val MY_GROUP_ACTIVITY = "MyGroupActivity"
 
         const val CLICK_INVITECODE = "click_invitecode"
         const val CLICK_INVITECODE_COPY = "click_invitecode_copy"

diff --git a/...sopt/pingle/presentation/ui/newgroup/newgroupannouncement/NewGroupAnnouncementActivity.kt b/...sopt/pingle/presentation/ui/newgroup/newgroupannouncement/NewGroupAnnouncementActivity.kt
@@ -17,6 +17,7 @@ import org.sopt.pingle.presentation.ui.newgroup.newgroupcodeshare.NewGroupCodeSh
 import org.sopt.pingle.util.AmplitudeUtils
 import org.sopt.pingle.util.Intent.getCompatibleParcelableExtra
 import org.sopt.pingle.util.base.BindingActivity
+import org.sopt.pingle.util.makeEllipsisGroupName
 
 @AndroidEntryPoint
 class NewGroupAnnouncementActivity :
@@ -78,16 +79,18 @@ class NewGroupAnnouncementActivity :
     }
 
     private fun spannableGroupName() {
+        val newGroupName = newGroupModel.name.makeEllipsisGroupName()
+
         binding.tvNewGroupAnnouncementGroupName.text = SpannableString(
-            getString(R.string.new_group_announcement_group_name, newGroupModel.name)
+            getString(R.string.new_group_announcement_group_name, newGroupName)
         ).apply {
             setSpan(
                 TextAppearanceSpan(
                     this@NewGroupAnnouncementActivity,
                     R.style.TextAppearance_Pingle_Sub_Semi_16
                 ),
                 GROUP_NAME_START,
-                newGroupModel.name.length,
+                newGroupName.length,
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
             )
 
@@ -99,7 +102,7 @@ class NewGroupAnnouncementActivity :
                     )
                 ),
                 GROUP_NAME_START,
-                newGroupModel.name.length,
+                newGroupName.length,
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
             )
         }

diff --git a/...src/main/java/org/sopt/pingle/presentation/ui/onboarding/onboarding/OnboardingActivity.kt b/...src/main/java/org/sopt/pingle/presentation/ui/onboarding/onboarding/OnboardingActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import org.sopt.pingle.R
 import org.sopt.pingle.databinding.ActivityOnboardingBinding
 import org.sopt.pingle.presentation.ui.joingroup.JoinGroupSearchActivity
+import org.sopt.pingle.presentation.ui.mygroup.MyGroupActivity.Companion.MY_GROUP_ACTIVITY
 import org.sopt.pingle.presentation.ui.newgroup.NewGroupActivity
 import org.sopt.pingle.util.AmplitudeUtils
 import org.sopt.pingle.util.activity.setDoubleBackPressToExit
@@ -16,8 +17,15 @@ class OnboardingActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        initLayout()
         addListeners()
-        setDoubleBackPressToExit(binding.root)
+    }
+
+    private fun initLayout() {
+        when (intent.getStringExtra(FROM_ACTIVITY)) {
+            MY_GROUP_ACTIVITY -> Unit
+            else -> setDoubleBackPressToExit(binding.root)
+        }
     }
 
     private fun addListeners() {
@@ -49,5 +57,7 @@ class OnboardingActivity :
         const val OPTION = "option"
         const val EXISTING_GROUP = "existing_group"
         const val CREATE_GROUP = "create_group"
+
+        const val FROM_ACTIVITY = "fromActivity"
     }
 }
diff --git a/app/src/main/java/org/sopt/pingle/util/ExtensionUtils.kt b/app/src/main/java/org/sopt/pingle/util/ExtensionUtils.kt
@@ -3,3 +3,13 @@ package org.sopt.pingle.util
 import android.content.res.Resources
 
 fun Int.toPx(): Int = (this * Resources.getSystem().displayMetrics.density).toInt()
+
+fun String.makeEllipsisGroupName(): String = when {
+    this.length > GROUP_NAME_MAX_LENGTH -> this.substring(SUBSTRING_START_INDEX, SUBSTRING_END_INDEX) + ELLIPSIS
+    else -> this
+}
+
+private const val SUBSTRING_START_INDEX = 0
+private const val SUBSTRING_END_INDEX = 12
+private const val GROUP_NAME_MAX_LENGTH = 13
+private const val ELLIPSIS = "..."
diff --git a/app/src/main/res/drawable/ic_my_group_owner_57.xml b/app/src/main/res/drawable/ic_my_group_owner_57.xml
@@ -7,13 +7,13 @@
       android:pathData="M0,13C0,5.82 5.82,0 13,0H57L29,28L0,57V13Z"
       android:fillColor="#363E45"/>
   <path
-      android:pathData="M57,44C57,51.18 51.18,57 44,57L0,57L28,29L57,0L57,44Z"
+      android:pathData="M57,57L0,57L28,29L57,0L57,57Z"
       android:fillColor="#15181B"/>
   <group>
     <clip-path
-        android:pathData="M3.029,19l16.971,-16.971l16.971,16.971l-16.971,16.971z"/>
+        android:pathData="M3,18.971l16.971,-16.971l16.971,16.971l-16.971,16.971z"/>
     <path
-        android:pathData="M16.506,15.464L22.241,16.8L22.634,11.693L27.427,18.686L19.727,26.385L12.735,21.593L17.841,21.2L16.506,15.464Z"
+        android:pathData="M16.477,15.435L22.212,16.771L22.605,11.664L27.398,18.656L19.698,26.356L12.706,21.563L17.813,21.17L16.477,15.435Z"
         android:strokeLineJoin="round"
         android:strokeWidth="1.5"
         android:fillColor="#00000000"

diff --git a/app/src/main/res/drawable/ic_my_group_selected_owner_58.xml b/app/src/main/res/drawable/ic_my_group_selected_owner_58.xml
@@ -10,13 +10,13 @@
       android:pathData="M1,14C1,6.82 6.82,1 14,1H58L30,29L1,58V14Z"
       android:fillColor="#363E45"/>
   <path
-      android:pathData="M58,45C58,52.18 52.18,58 45,58L1,58L29,30L58,1L58,45Z"
+      android:pathData="M58,58L1,58L29,30L58,1L58,58Z"
       android:fillColor="#15181B"/>
   <group>
     <clip-path
-        android:pathData="M4.029,20l16.971,-16.971l16.971,16.971l-16.971,16.971z"/>
+        android:pathData="M4,19.971l16.971,-16.971l16.971,16.971l-16.971,16.971z"/>
     <path
-        android:pathData="M17.506,16.464L23.241,17.8L23.634,12.693L28.427,19.686L20.727,27.385L13.735,22.593L18.841,22.2L17.506,16.464Z"
+        android:pathData="M17.477,16.435L23.212,17.771L23.605,12.664L28.398,19.656L20.698,27.356L13.706,22.563L18.813,22.17L17.477,16.435Z"
         android:strokeLineJoin="round"
         android:strokeWidth="1.5"
         android:fillColor="#00000000"

diff --git a/app/src/main/res/layout/activity_onboarding_explanation.xml b/app/src/main/res/layout/activity_onboarding_explanation.xml
@@ -14,20 +14,22 @@
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/vp_onboarding_explanation"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_onboarding_explanation_skip"
-            app:layout_constraintBottom_toTopOf="@id/tl_onboarding_indicator" />
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_onboarding_explanation_skip" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tl_onboarding_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="18dp"
             android:background="@null"
+            app:layout_constraintBottom_toTopOf="@id/btn_onboarding_explanation_next"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/btn_onboarding_explanation_next"
-            android:layout_marginBottom="58dp"
+            app:layout_constraintTop_toBottomOf="@id/vp_onboarding_explanation"
             app:tabBackground="@drawable/selector_indicator_onboarding"
             app:tabIndicatorHeight="0dp"
             app:tabPaddingStart="@dimen/spacing4" />

diff --git a/app/src/main/res/layout/fragment_more.xml b/app/src/main/res/layout/fragment_more.xml
@@ -72,13 +72,15 @@
 
             <TextView
                 android:id="@+id/tv_more_my_group_content"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
+                android:layout_marginEnd="4dp"
                 android:textAppearance="@style/TextAppearance.Pingle.Sub.Bold.18"
                 android:textColor="@color/white"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:maxLines="2"
                 app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/iv_more_move_to_my_group"
                 app:layout_constraintTop_toBottomOf="@id/tv_more_my_group_title"
                 tools:text="SOPT" />
 

diff --git a/app/src/main/res/layout/item_onboarding_explanation_description.xml b/app/src/main/res/layout/item_onboarding_explanation_description.xml
@@ -16,7 +16,6 @@
         <ImageView
             android:id="@+id/iv_onboarding_explanation"
             android:layout_width="match_parent"
-            android:layout_marginTop="58dp"
             android:layout_height="wrap_content"
             android:src="@{context.getDrawable(onboardingExplanationType.image)}"
             app:layout_constraintBottom_toTopOf="@id/tv_onboarding_explanation_description"
@@ -33,7 +32,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:gravity="center"
-            android:paddingBottom="@dimen/spacing8"
             android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.20"
             android:textColor="@color/white"
             android:text="@{context.getString(onboardingExplanationType.description)}" />

diff --git a/app/src/main/res/layout/item_onboarding_explanation_title.xml b/app/src/main/res/layout/item_onboarding_explanation_title.xml
@@ -14,7 +14,6 @@
             android:id="@+id/iv_onboarding_explanation_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="58dp"
             android:src="@drawable/img_onboarding_explanation_logo"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"