Skip to content

Commit e753d6f

Browse files
AbySwifterAbySwifter
authored
Merge pull request #22 from xanderzhao-zb/main
【AtomicX】【Android】publish atomicx beta version 3.6.1
2 parents 0b2c9dd + 44bf57c commit e753d6f

File tree

21 files changed

+460
-73
lines changed

21 files changed

+460
-73
lines changed

‎atomic_x/src/main/java/io/trtc/tuikit/atomicx/karaoke/store/KaraokeStore.kt‎

Lines changed: 216 additions & 38 deletions
Large diffs are not rendered by default.

‎atomic_x/src/main/java/io/trtc/tuikit/atomicx/karaoke/view/KaraokeSettingPanel.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ class KaraokeSettingPanel @JvmOverloads constructor(
5252

5353
private fun initEnableOriginView() {
5454
val switchOrigin = findViewById<SwitchCompat>(R.id.sc_enable_origin)
55-
switchOrigin.isChecked =
56-
store.currentTrack.value == TXChorusOriginalSong
57-
switchOrigin.setOnCheckedChangeListener { _, enable ->
58-
if (enable) {
55+
switchOrigin.isChecked = store.currentTrack.value == TXChorusOriginalSong
56+
switchOrigin.setOnCheckedChangeListener { _, isChecked ->
57+
if (isChecked) {
5958
store.switchMusicTrack(TXChorusOriginalSong)
6059
} else {
6160
store.switchMusicTrack(TXChorusAccompaniment)
6261
}
62+
switchOrigin.isChecked = store.currentTrack.value == TXChorusOriginalSong
6363
}
6464
}
6565

‎atomic_x/src/main/java/io/trtc/tuikit/atomicx/widget/basicwidget/popover/AtomicPopover.kt‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ open class AtomicPopover(
5050
private var isAnimating = false
5151
private val showAnimation: Boolean = panelGravity == PanelGravity.BOTTOM
5252
private var useTransparentBackground: Boolean = false
53+
private var showMask: Boolean = true
5354

5455
enum class PanelGravity {
5556
BOTTOM, CENTER
@@ -131,7 +132,10 @@ open class AtomicPopover(
131132
}
132133
}
133134

134-
addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
135+
if (showMask) {
136+
addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
137+
}
138+
addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED)
135139
}
136140

137141
setPanelBackground()
@@ -230,6 +234,13 @@ open class AtomicPopover(
230234
}
231235
}
232236

237+
fun setShowMask(show: Boolean) {
238+
showMask = show
239+
if (isShowing) {
240+
setMaskColor()
241+
}
242+
}
243+
233244
private fun showWithAnimation() {
234245
contentContainer.visibility = View.VISIBLE
235246

@@ -313,8 +324,15 @@ open class AtomicPopover(
313324
}
314325

315326
private fun setMaskColor() {
327+
if (!showMask) {
328+
window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
329+
window?.setDimAmount(0f)
330+
return
331+
}
332+
window?.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
316333
val maskColor = getCurrentTokens(context).color.bgColorMask
317-
window?.setDimAmount(Color.alpha(maskColor) / 255f)
334+
val dimAmount = Color.alpha(maskColor) / 255f
335+
window?.setDimAmount(dimAmount)
318336
}
319337

320338
private fun setPanelBackground() {

‎atomic_x/src/main/res-advance-setting/color/switch_thumb_bg.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
3+
<item android:color="@color/white" android:state_checked="false"/>
4+
<item android:color="@color/white" android:state_checked="true"/>
5+
</selector>

‎atomic_x/src/main/res-advance-setting/color/switch_track_bg.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
3+
<item android:color="@color/advance_setting_switch_track_unchecked" android:state_checked="false"/>
4+
<item android:color="@color/advance_setting_switch_track_checked" android:state_checked="true"/>
5+
</selector>

‎atomic_x/src/main/res-advance-setting/drawable/bg_advance_setting_button.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="oval">
4+
<solid android:color="@color/advance_setting_panel_bg" />
5+
</shape>

‎atomic_x/src/main/res-advance-setting/drawable/bg_advance_setting_panel.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<solid android:color="@color/advance_setting_panel_bg" />
5+
<corners android:radius="20dp" />
6+
</shape>

‎atomic_x/src/main/res-advance-setting/drawable/switch_thumb.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_checked="true">
4+
<shape android:shape="oval">
5+
<solid android:color="@color/switch_thumb_bg" />
6+
<size android:width="24dp" android:height="24dp" />
7+
</shape>
8+
</item>
9+
<item>
10+
<shape android:shape="oval">
11+
<solid android:color="@color/switch_thumb_bg" />
12+
<size android:width="24dp" android:height="24dp" />
13+
</shape>
14+
</item>
15+
</selector>

‎atomic_x/src/main/res-advance-setting/drawable/switch_track.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_checked="true">
4+
<shape android:shape="rectangle">
5+
<solid android:color="@color/switch_track_bg" />
6+
<corners android:radius="12dp" />
7+
<size android:width="36dp" android:height="24dp" />
8+
</shape>
9+
</item>
10+
<item>
11+
<shape android:shape="rectangle">
12+
<solid android:color="@color/switch_track_bg" />
13+
<corners android:radius="12dp" />
14+
<size android:width="36dp" android:height="24dp" />
15+
</shape>
16+
</item>
17+
</selector>

‎atomic_x/src/main/res-advance-setting/layout/advance_setting_button.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="wrap_content"
4+
android:layout_height="wrap_content"
5+
android:background="@drawable/bg_advance_setting_button"
6+
android:orientation="vertical">
7+
8+
<TextView
9+
android:layout_width="50dp"
10+
android:layout_height="50dp"
11+
android:gravity="center"
12+
android:text="@string/advance_setting_button_text"
13+
android:textColor="@color/advance_setting_text_color"
14+
android:textSize="14sp"
15+
android:textStyle="bold" />
16+
</LinearLayout>

0 commit comments

Comments
 (0)