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

Merge branch 'master' into dev_random_pk

Browse Source 
# Conflicts:
#	live/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2022-12-05 17:46:57 +08:00
parent ed6b531b8d 2a2672587c
commit 9ead9a6fb8
207 changed files with 7020 additions and 3152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,7 @@
<string name="edit_profile_sex">性別</string>
<string name="apply_for_lianmai">申请連麥</string>
<string name="cancel_application">取消申請</string>
<string name="close_mic">關閉連麥</string>
<string name="quit_mic">退出連麥</string>
<string name="edit_profile_city">所在地</string>
<string name="edit_one_1">編輯個人資料</string>
@@ -617,6 +618,7 @@
<string name="glamour_list">魅力榜</string>
<string name="magnificent_list">豪氣榜</string>
<string name="no_more_mic">當前沒有人在語音連麥中</string>
<string name="live_anchor_open_mic">語音連麥未開啟</string>
<string name="load_failure">網絡請求失敗</string>
<string name="load_failure_2">請檢查網絡連接後重試~</string>
<string name="loading">加載中</string>
@@ -963,4 +965,5 @@
<string name="image_quality_selection" translatable="false">畫質選擇</string>
<string name="more_settings" translatable="false">更多設置</string>
<string name="moer">查看更多</string>
<string name="gift_way">礼物正在获取中...</string>
</resources>

28
common/src/main/res/values/style.xml
View File

@@ -6,9 +6,9 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:colorBackground">@color/background</item>
<item name="android:windowAnimationStyle">@style/Animation</item>
<item name="android:windowAnimationStyle">@style/AnimationActivity</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" >@color/colorPrimary</item>
<item name="android:statusBarColor">@color/colorPrimary</item>
</style>
<style name="dialog" parent="AppTheme">
@@ -35,6 +35,7 @@
<!--显示区域以外是否使用黑色半透明背景-->
<item name="android:backgroundDimEnabled">true</item>
</style>
<style name="dialog4" parent="AppTheme">
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
@@ -44,6 +45,7 @@
<!--显示区域以外是否使用黑色半透明背景-->
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="dialog3" parent="AppTheme">
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
@@ -69,10 +71,12 @@
<item name="android:windowEnterAnimation">@anim/left_anim_enter</item>
<item name="android:windowExitAnimation">@anim/left_anim_exit</item>
</style>
<style name="RightLeftToAnim" parent="android:Animation">
<item name="android:windowEnterAnimation">@anim/right_anim_enter</item>
<item name="android:windowExitAnimation">@anim/right_anim_exit</item>
</style>
<style name="groupLast" parent="AppTheme">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
@@ -93,6 +97,7 @@
<item name="android:paddingLeft">15dp</item>
<item name="android:paddingRight">15dp</item>
</style>
<style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
@@ -107,15 +112,22 @@
<style name="Animation">
<item name="android:activityOpenEnterAnimation">@null</item>
<item name="android:activityOpenExitAnimation">@null</item>
<item name="android:activityCloseEnterAnimation">@null</item>
<item name="android:activityCloseExitAnimation">@null</item>
<item name="android:activityCloseEnterAnimation">@anim/out_from_right</item>
<item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
<item name="android:taskOpenEnterAnimation">@null</item>
<item name="android:taskOpenExitAnimation">@null</item>
<item name="android:taskCloseEnterAnimation">@null</item>
<item name="android:taskCloseExitAnimation">@null</item>
<item name="android:taskCloseEnterAnimation">@anim/out_from_right</item>
<item name="android:taskCloseExitAnimation">@anim/out_from_right</item>
<item name="android:taskToFrontEnterAnimation">@null</item>
<item name="android:taskToFrontExitAnimation">@null</item>
<item name="android:taskToBackEnterAnimation">@null</item>
<item name="android:taskToBackExitAnimation">@null</item>
<item name="android:taskToBackEnterAnimation">@anim/out_from_right</item>
<item name="android:taskToBackExitAnimation">@anim/out_from_right</item>
</style>
<!-- 页面弹出（入场出场）动画 -->
<style name="AnimationActivity" parent="@android:style/Animation">
<item name="android:activityOpenEnterAnimation">@anim/in_from_right</item>
<item name="android:activityOpenExitAnimation">@anim/in_from_right_abit</item>
<item name="android:activityCloseEnterAnimation">@anim/out_to_right_abit</item>
<item name="android:activityCloseExitAnimation">@anim/out_to_right</item>
</style>
</resources>