diff --git a/app/build.gradle b/app/build.gradle index 878bd9e..d8b4e42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,8 +40,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 33 - versionCode 78 - versionName "1.12.1" + versionCode 79 + versionName "1.12.2" } buildTypes { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/splash/SplashActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/splash/SplashActivity.kt index ad0b68c..96152b6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/splash/SplashActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/splash/SplashActivity.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Bundle import android.os.Handler import android.os.Looper +import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.os.bundleOf import com.google.firebase.dynamiclinks.PendingDynamicLinkData @@ -33,18 +34,41 @@ class SplashActivity : BaseActivity(ActivitySplashBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val lp = binding.ivText.layoutParams as ConstraintLayout.LayoutParams - lp.topMargin = screenHeight * 302 / 2337 - binding.ivText.layoutParams = lp - - val lp2 = binding.ivText2.layoutParams as ConstraintLayout.LayoutParams - lp2.bottomMargin = screenHeight * 195 / 2337 - binding.ivText2.layoutParams = lp2 + setLayoutParams(binding.ivText, start = 0, end = 0, top = 390, bottom = 0) + setLayoutParams(binding.ivTextLogo, start = 0, end = 0, top = 0, bottom = 150) setupRemoteConfig() fetchAndroidLatestVersion() } + private fun setLayoutParams( + imageView: ImageView, + start: Int = 0, + end: Int = 0, + top: Int = 0, + bottom: Int = 0 + ) { + val lp = imageView.layoutParams as ConstraintLayout.LayoutParams + + if (top > 0) { + lp.topMargin = screenHeight * top / 2337 + } + + if (bottom > 0) { + lp.bottomMargin = screenHeight * bottom / 2337 + } + + if (start > 0) { + lp.leftMargin = screenWidth * start / 1080 + } + + if (end > 0) { + lp.rightMargin = screenWidth * end / 1080 + } + + imageView.layoutParams = lp + } + private fun setupRemoteConfig() { val configSettings = remoteConfigSettings { minimumFetchIntervalInSeconds = 300 diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg.jpg b/app/src/main/res/drawable-xxhdpi/splash_bg.jpg new file mode 100644 index 0000000..2c4dd5e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_bg.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg.png b/app/src/main/res/drawable-xxhdpi/splash_bg.png deleted file mode 100644 index 22b4968..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/splash_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_logo.png b/app/src/main/res/drawable-xxhdpi/splash_logo.png new file mode 100755 index 0000000..5d168e5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_logo.png differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_text.png b/app/src/main/res/drawable-xxhdpi/splash_text.png index 8a52475..8329b69 100644 Binary files a/app/src/main/res/drawable-xxhdpi/splash_text.png and b/app/src/main/res/drawable-xxhdpi/splash_text.png differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_text_2.png b/app/src/main/res/drawable-xxhdpi/splash_text_2.png deleted file mode 100644 index dfab32b..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/splash_text_2.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 583e68e..d816f56 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -27,11 +27,11 @@ app:layout_constraintTop_toTopOf="parent" />