Merge branch 'main' into feature/i18n

app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt

@@ -3,11 +3,11 @@ package kr.co.vividnext.sodalive.mypage
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Rect
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.webkit.URLUtil
 import android.widget.Toast
+import androidx.core.net.toUri
 import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -166,10 +166,17 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
     }
 
     private fun setupView() {
+        binding.ivApplyCreator.setOnClickListener {
+            val url = "https://bit.ly/4h7pVks"
+            if (URLUtil.isValidUrl(url)) {
+                startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
+            }
+        }
+
         binding.ivIntroduceVoiceon.setOnClickListener {
             val url = "https://blog.naver.com/sodalive_official"
             if (URLUtil.isValidUrl(url)) {
-                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
             }
         }
 

app/src/main/java/kr/co/vividnext/sodalive/splash/SplashActivity.kt

@@ -31,8 +31,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setLayoutParams(binding.tvText1, start = 0, end = 0, top = 580, bottom = 0)
+        setLayoutParams(binding.ivText, start = 0, end = 0, top = 0, bottom = 668)
-        setLayoutParams(binding.tvText2, start = 0, end = 0, top = 0, bottom = 100)
 
         setupRemoteConfig()
         fetchAndroidLatestVersion()

app/src/main/res/layout/activity_splash.xml

@@ -15,36 +15,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_text_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/pretendard_bold"
-        android:text="@string/screen_splash_tagline"
-        android:textSize="21sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textColor="@color/white"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <ImageView
-        android:id="@+id/iv_text_logo"
+        android:id="@+id/iv_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@null"
-        android:src="@drawable/splash_text_logo"
+        android:src="@drawable/splash_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_text_1" />
-
-    <TextView
-        android:id="@+id/tv_text_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/pretendard_bold"
-        android:text="@string/screen_splash_brand_name"
-        android:textColor="@color/white"
-        android:textSize="21sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

app/src/main/res/layout/fragment_my.xml

@@ -358,6 +358,16 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <ImageView
+                android:id="@+id/iv_apply_creator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginBottom="32dp"
+                android:contentDescription="@null"
+                android:src="@drawable/img_apply_creator" />
+
             <ImageView
                 android:id="@+id/iv_introduce_voiceon"
                 android:layout_width="match_parent"