diff --git a/app/build.gradle b/app/build.gradle
index a3cad58..8bafa3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ android {
applicationId "kr.co.vividnext.sodalive"
minSdk 23
targetSdk 33
- versionCode 48
- versionName "1.9.1"
+ versionCode 49
+ versionName "1.10.0"
}
buildTypes {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
index 6f3d6a0..68287fe 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
@@ -9,6 +9,7 @@ import android.content.Intent
import android.graphics.Bitmap
import android.graphics.drawable.Drawable
import android.media.AudioAttributes
+import android.media.AudioManager
import android.media.MediaPlayer
import android.os.Build
import android.os.Handler
@@ -367,6 +368,7 @@ class AudioContentPlayService :
mediaPlayer.setOnCompletionListener(this)
mediaPlayer.setAudioAttributes(
AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build()
)
diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml
index b8ca3ed..bc49ee8 100644
--- a/app/src/main/res/layout/activity_live_room.xml
+++ b/app/src/main/res/layout/activity_live_room.xml
@@ -37,7 +37,7 @@
android:paddingStart="20dp"
android:paddingEnd="0dp"
app:layout_constraintBottom_toTopOf="@+id/rl_input_chat"
- app:layout_constraintEnd_toStartOf="@+id/ll_option_buttons"
+ app:layout_constraintEnd_toStartOf="@+id/rl_option_buttons"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fl_margin"
app:layout_goneMarginEnd="0dp" />
@@ -334,6 +334,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="5.3dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -341,7 +342,6 @@
android:id="@+id/tv_creator_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="2.7dp"
android:ellipsize="end"
android:fontFamily="@font/gmarket_sans_medium"
android:lines="1"
@@ -491,73 +491,22 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <LinearLayout
- android:id="@+id/ll_option_buttons"
+ <RelativeLayout
+ android:id="@+id/rl_option_buttons"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
+ android:layout_height="0dp"
android:paddingStart="6.7dp"
android:paddingEnd="13.3dp"
app:layout_constraintBottom_toTopOf="@+id/rl_input_chat"
- app:layout_constraintEnd_toEndOf="parent">
-
- <FrameLayout
- android:id="@+id/fl_roulette"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp"
- android:visibility="gone">
-
- <ImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_roulette" />
- </FrameLayout>
-
- <FrameLayout
- android:id="@+id/fl_roulette_settings"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp"
- android:visibility="gone">
-
- <ImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_roulette_settings" />
- </FrameLayout>
-
- <FrameLayout
- android:id="@+id/fl_microphone_mute"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp"
- android:visibility="gone">
-
- <ImageView
- android:id="@+id/iv_microphone_mute"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_mic_on" />
- </FrameLayout>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/fl_margin">
<FrameLayout
android:id="@+id/fl_speaker_mute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="13.3dp"
android:background="@drawable/bg_round_corner_10_99525252"
android:padding="10dp">
@@ -570,40 +519,99 @@
android:src="@drawable/ic_speaker_on" />
</FrameLayout>
- <FrameLayout
- android:id="@+id/fl_donation"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp">
+ android:layout_alignParentBottom="true"
+ android:orientation="vertical">
- <ImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_donation" />
- </FrameLayout>
+ <FrameLayout
+ android:id="@+id/fl_roulette"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
- <FrameLayout
- android:id="@+id/fl_donation_message_list"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp"
- android:visibility="gone">
+ <ImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_roulette" />
+ </FrameLayout>
- <ImageView
- android:id="@+id/iv_donation_message_list"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_donation_message_list" />
- </FrameLayout>
- </LinearLayout>
+ <FrameLayout
+ android:id="@+id/fl_roulette_settings"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
+
+ <ImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_roulette_settings" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/fl_microphone_mute"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
+
+ <ImageView
+ android:id="@+id/iv_microphone_mute"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_mic_on" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/fl_donation"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp">
+
+ <ImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_donation" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/fl_donation_message_list"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
+
+ <ImageView
+ android:id="@+id/iv_donation_message_list"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_donation_message_list" />
+ </FrameLayout>
+ </LinearLayout>
+ </RelativeLayout>
<TextView
android:id="@+id/tv_new_chat"
@@ -665,13 +673,12 @@
<ImageView
android:id="@+id/iv_signature"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginHorizontal="20dp"
- android:layout_marginBottom="65dp"
+ android:layout_marginTop="100dp"
android:contentDescription="@null"
- android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/settings.gradle b/settings.gradle
index fad6707..ecb2f64 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,18 +12,6 @@ dependencyResolutionManagement {
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
- // Maven Remote Repo PointClick aar
- flatDir {
- dirs 'libs' }
- // PointClick SDK Repository
- maven {
- url "s3://repo.pointclick.co.kr/releases"
- credentials(AwsCredentials) {
- accessKey "AKIAWRZUK5MFH2MNFOWX"
- secretKey "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"
- }
- }
- // Maven Remote Repo PointClick aar
}
}
rootProject.name = "SodaLive"