klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

음소거 버튼 위치 - top 

크리에이터 팔로우 버튼 margin_top = 5.3
시그니처 후원 움짤 위치 - 우측 중간으로 이동
This commit is contained in:
klaus 2024-04-12 12:45:17 +09:00
parent 5529872bd5
commit dfd92d6db6
4 changed files with 104 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -40,8 +40,8 @@ android {
applicationId "kr.co.vividnext.sodalive" applicationId "kr.co.vividnext.sodalive"
minSdk 23 minSdk 23
targetSdk 33 targetSdk 33
versionCode 48 versionCode 49
versionName "1.9.1" versionName "1.10.0"
} }
buildTypes { buildTypes {

2
app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
View File

@ -9,6 +9,7 @@ import android.content.Intent
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.media.AudioAttributes import android.media.AudioAttributes
import android.media.AudioManager
import android.media.MediaPlayer import android.media.MediaPlayer
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
@ -367,6 +368,7 @@ class AudioContentPlayService :
mediaPlayer.setOnCompletionListener(this) mediaPlayer.setOnCompletionListener(this)
mediaPlayer.setAudioAttributes( mediaPlayer.setAudioAttributes(
AudioAttributes.Builder() AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build() .build()
) )

193
app/src/main/res/layout/activity_live_room.xml
View File

@ -37,7 +37,7 @@
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
app:layout_constraintBottom_toTopOf="@+id/rl_input_chat" 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_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fl_margin" app:layout_constraintTop_toBottomOf="@+id/fl_margin"
app:layout_goneMarginEnd="0dp" /> app:layout_goneMarginEnd="0dp" />
@ -334,6 +334,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5.3dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -341,7 +342,6 @@
android:id="@+id/tv_creator_nickname" android:id="@+id/tv_creator_nickname"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2.7dp"
android:ellipsize="end" android:ellipsize="end"
android:fontFamily="@font/gmarket_sans_medium" android:fontFamily="@font/gmarket_sans_medium"
android:lines="1" android:lines="1"
@ -491,73 +491,22 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <RelativeLayout
android:id="@+id/ll_option_buttons" android:id="@+id/rl_option_buttons"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:orientation="vertical"
android:paddingStart="6.7dp" android:paddingStart="6.7dp"
android:paddingEnd="13.3dp" android:paddingEnd="13.3dp"
app:layout_constraintBottom_toTopOf="@+id/rl_input_chat" app:layout_constraintBottom_toTopOf="@+id/rl_input_chat"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fl_margin">
<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>
<FrameLayout <FrameLayout
android:id="@+id/fl_speaker_mute" android:id="@+id/fl_speaker_mute"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:background="@drawable/bg_round_corner_10_99525252"
android:padding="10dp"> android:padding="10dp">
@ -570,40 +519,99 @@
android:src="@drawable/ic_speaker_on" /> android:src="@drawable/ic_speaker_on" />
</FrameLayout> </FrameLayout>
<FrameLayout <LinearLayout
android:id="@+id/fl_donation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp" android:layout_alignParentBottom="true"
android:background="@drawable/bg_round_corner_10_99525252" android:orientation="vertical">
android:padding="10dp">
<ImageView <FrameLayout
android:layout_width="24dp" android:id="@+id/fl_roulette"
android:layout_height="24dp" android:layout_width="wrap_content"
android:layout_gravity="center" android:layout_height="wrap_content"
android:contentDescription="@null" android:layout_marginBottom="13.3dp"
android:src="@drawable/ic_donation" /> android:background="@drawable/bg_round_corner_10_99525252"
</FrameLayout> android:padding="10dp"
android:visibility="gone">
<FrameLayout <ImageView
android:id="@+id/fl_donation_message_list" android:layout_width="24dp"
android:layout_width="wrap_content" android:layout_height="24dp"
android:layout_height="wrap_content" android:layout_gravity="center"
android:layout_marginBottom="13.3dp" android:contentDescription="@null"
android:background="@drawable/bg_round_corner_10_99525252" android:src="@drawable/ic_roulette" />
android:padding="10dp" </FrameLayout>
android:visibility="gone">
<ImageView <FrameLayout
android:id="@+id/iv_donation_message_list" android:id="@+id/fl_roulette_settings"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginBottom="13.3dp"
android:contentDescription="@null" android:background="@drawable/bg_round_corner_10_99525252"
android:src="@drawable/ic_donation_message_list" /> android:padding="10dp"
</FrameLayout> android:visibility="gone">
</LinearLayout>
<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 <TextView
android:id="@+id/tv_new_chat" android:id="@+id/tv_new_chat"
@ -665,13 +673,12 @@
<ImageView <ImageView
android:id="@+id/iv_signature" android:id="@+id/iv_signature"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginHorizontal="20dp" android:layout_marginHorizontal="20dp"
android:layout_marginBottom="65dp" android:layout_marginTop="100dp"
android:contentDescription="@null" android:contentDescription="@null"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

12
settings.gradle
View File

@ -12,18 +12,6 @@ dependencyResolutionManagement {
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { url 'https://jitpack.io' } 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" rootProject.name = "SodaLive"