yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_20221020

Browse Source 
# Conflicts:
#	settings.gradle
This commit is contained in:
zlzw
2022-10-20 11:17:52 +08:00
parent e4ba0b7f80 4b5f3a9560
commit 79aadad668
15 changed files with 109 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/res/layout/view_live_total.xml
View File

@@ -266,6 +266,27 @@
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/float_settings_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_fenestrule" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/small_window"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/system_notice"

6
common/src/main/res/values/strings.xml
View File

@@ -926,4 +926,10 @@
<string name="star_change">%s星挑战</string>
<string name="star_success">恭喜 %s，完成了%s %s星 挑戰，快去一睹主播芳容吧！</string>
<string name="star">星</string>
<string name="small_window_settings">小窗播放設置</string>
<string name="small_window">小窗播放</string>
<string name="app_window">APP內小窗播放</string>
<string name="app_window_hint">讓直播間內容在本APP主頁面中小窗播放</string>
<string name="system_window">APP全應用小窗播放</string>
<string name="system_window_hint">讓直播間內容在所有APP及頁面中小窗播放</string>
</resources>