fix: 改善较旧版本直接升级的兼容性
This commit is contained in:
HuanCheng65
parent
a289a193b0
commit
26d85c7577
|
|
@ -156,6 +156,24 @@
|
|||
android:resource="@xml/shortcut_new" />
|
||||
</activity>
|
||||
|
||||
<activity-alias
|
||||
android:name=".activities.MainActivity"
|
||||
android:enabled="false"
|
||||
android:exported="true"
|
||||
android:icon="@mipmap/ic_launcher_new"
|
||||
android:roundIcon="@mipmap/ic_launcher_new_round"
|
||||
android:targetActivity=".MainActivityV2">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/shortcut_new" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
android:name=".MainActivityIconThemed"
|
||||
android:enabled="false"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ object LauncherIcons {
|
|||
const val NEW_ICON_THEMED = "com.huanchengfly.tieba.post.MainActivityIconThemed"
|
||||
const val NEW_ICON_INVERT = "com.huanchengfly.tieba.post.MainActivityIconInvert"
|
||||
const val OLD_ICON = "com.huanchengfly.tieba.post.MainActivityIconOld"
|
||||
const val DISABLE = "com.huanchengfly.tieba.post.MainActivityV2Disabled"
|
||||
|
||||
const val DEFAULT_ICON = NEW_ICON
|
||||
|
||||
|
|
@ -22,6 +21,8 @@ object LauncherIcons {
|
|||
val THEMED_ICON_MAPPING = mapOf(
|
||||
NEW_ICON to NEW_ICON_THEMED,
|
||||
)
|
||||
|
||||
const val OLD_LAUNCHER_ICON = "com.huanchengfly.tieba.post.activities.MainActivity"
|
||||
}
|
||||
|
||||
object AppIconUtil {
|
||||
|
|
@ -38,7 +39,7 @@ object AppIconUtil {
|
|||
isThemed: Boolean = appPreferences.useThemedIcon,
|
||||
) {
|
||||
val useThemedIcon = isThemed && LauncherIcons.SUPPORT_THEMED_ICON.contains(icon)
|
||||
var newIcon = if (LauncherIcons.ICONS.contains(icon) || icon == LauncherIcons.DISABLE) {
|
||||
var newIcon = if (LauncherIcons.ICONS.contains(icon)) {
|
||||
icon
|
||||
} else LauncherIcons.DEFAULT_ICON
|
||||
if (useThemedIcon) {
|
||||
|
|
@ -51,6 +52,12 @@ object AppIconUtil {
|
|||
context.packageManager.disableComponent(ComponentName(context, it))
|
||||
}
|
||||
}
|
||||
context.packageManager.disableComponent(
|
||||
ComponentName(
|
||||
context,
|
||||
LauncherIcons.OLD_LAUNCHER_ICON
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -103,16 +103,20 @@
|
|||
<color name="theme_color_new_primary_night">#FF5588D7</color>
|
||||
|
||||
<color name="theme_color_chip_light">#FFF8F8F8</color>
|
||||
<color name="theme_color_chip_dark">#242F3D</color>
|
||||
<color name="theme_color_chip_blue_dark">#242F3D</color>
|
||||
<color name="theme_color_chip_grey_dark">#323232</color>
|
||||
<color name="theme_color_chip_amoled_dark">#1E1E1E</color>
|
||||
<color name="theme_color_chip_translucent">#18F8F8F8</color>
|
||||
<color name="theme_color_chip_translucent_light">#18F8F8F8</color>
|
||||
<color name="theme_color_chip_translucent_dark">#2A323232</color>
|
||||
|
||||
<color name="theme_color_on_chip_light">#FF808080</color>
|
||||
<color name="theme_color_on_chip_dark">#68737E</color>
|
||||
<color name="theme_color_on_chip_blue_dark">#68737E</color>
|
||||
<color name="theme_color_on_chip_grey_dark">#FF808080</color>
|
||||
<color name="theme_color_on_chip_amoled_dark">#FF808080</color>
|
||||
<color name="theme_color_on_chip_translucent">@color/theme_color_on_chip_light</color>
|
||||
<color name="theme_color_on_chip_translucent_light">@color/theme_color_on_chip_light</color>
|
||||
<color name="theme_color_on_chip_translucent_dark">@color/theme_color_on_chip_grey_dark</color>
|
||||
|
||||
|
|
@ -121,6 +125,9 @@
|
|||
<color name="theme_color_window_background_blue_dark">#17212B</color>
|
||||
<color name="theme_color_window_background_grey_dark">#FF202020</color>
|
||||
<color name="theme_color_window_background_amoled_dark">#FF1E1E1E</color>
|
||||
<color name="theme_color_window_background_translucent">
|
||||
@color/theme_color_window_background_grey_dark
|
||||
</color>
|
||||
<color name="theme_color_window_background_translucent_light">
|
||||
@color/theme_color_window_background_grey_dark
|
||||
</color>
|
||||
|
|
@ -129,21 +136,24 @@
|
|||
</color>
|
||||
|
||||
<color name="theme_color_toolbar_white">@color/white</color>
|
||||
<color name="theme_color_toolbar_dark">#FF15202B</color>
|
||||
<color name="theme_color_toolbar_dark">#17212B</color>
|
||||
<color name="theme_color_toolbar_blue_dark">#17212B</color>
|
||||
<color name="theme_color_toolbar_grey_dark">#202020</color>
|
||||
<color name="theme_color_toolbar_amoled_dark">#000000</color>
|
||||
<color name="theme_color_toolbar_translucent">#00FFFFFF</color>
|
||||
<color name="theme_color_toolbar_translucent_light">#00FFFFFF</color>
|
||||
<color name="theme_color_toolbar_translucent_dark">#00000000</color>
|
||||
|
||||
<color name="theme_color_toolbar_item_light">#FF000000</color>
|
||||
<color name="theme_color_toolbar_item_dark">@color/white</color>
|
||||
<color name="theme_color_toolbar_item_night">#EEEEEE</color>
|
||||
<color name="theme_color_toolbar_item_translucent">#DFFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_translucent_light">#DFFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_translucent_dark">#FF000000</color>
|
||||
|
||||
<color name="theme_color_toolbar_item_secondary_white">#DD545967</color>
|
||||
<color name="theme_color_toolbar_item_secondary_light">#99FFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_secondary_translucent">#8AFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_secondary_translucent_light">#8AFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_secondary_translucent_dark">#B3000000</color>
|
||||
<color name="theme_color_toolbar_item_secondary_dark">#CCE6E7EE</color>
|
||||
|
|
@ -152,6 +162,7 @@
|
|||
<color name="theme_color_toolbar_item_secondary_amoled_dark">#CCEEEEEE</color>
|
||||
|
||||
<color name="theme_color_toolbar_item_active_white">@color/theme_color_accent_white</color>
|
||||
<color name="theme_color_toolbar_item_active_translucent">#FFFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_active_translucent_light">#FFFFFFFF</color>
|
||||
<color name="theme_color_toolbar_item_active_translucent_dark">#FF000000</color>
|
||||
<color name="theme_color_toolbar_item_active_dark">@color/white</color>
|
||||
|
|
@ -160,9 +171,11 @@
|
|||
<color name="theme_color_toolbar_item_active_amoled_dark">@color/white</color>
|
||||
|
||||
<color name="theme_color_toolbar_surface_light">#F8F8F8</color>
|
||||
<color name="theme_color_toolbar_surface_dark">#242F3D</color>
|
||||
<color name="theme_color_toolbar_surface_blue_dark">#242F3D</color>
|
||||
<color name="theme_color_toolbar_surface_grey_dark">#2C2C2C</color>
|
||||
<color name="theme_color_toolbar_surface_amoled_dark">#1E1E1E</color>
|
||||
<color name="theme_color_toolbar_surface_translucent">#10FFFFFF</color>
|
||||
<color name="theme_color_toolbar_surface_translucent_light">#10FFFFFF</color>
|
||||
<color name="theme_color_toolbar_surface_translucent_dark">#20000000</color>
|
||||
|
||||
|
|
@ -171,6 +184,9 @@
|
|||
<color name="theme_color_on_toolbar_surface_blue_dark">#626C79</color>
|
||||
<color name="theme_color_on_toolbar_surface_grey_dark">#5C5C5C</color>
|
||||
<color name="theme_color_on_toolbar_surface_amoled_dark">#5C5C5C</color>
|
||||
<color name="theme_color_on_toolbar_surface_translucent">
|
||||
@color/theme_color_on_toolbar_surface_light
|
||||
</color>
|
||||
<color name="theme_color_on_toolbar_surface_translucent_light">
|
||||
@color/theme_color_on_toolbar_surface_light
|
||||
</color>
|
||||
|
|
@ -179,6 +195,7 @@
|
|||
</color>
|
||||
|
||||
<color name="theme_color_nav_bar_surface_light">#FFF8F8F8</color>
|
||||
<color name="theme_color_nav_bar_surface_dark">#141F2A</color>
|
||||
<color name="theme_color_nav_bar_surface_blue_dark">#141F2A</color>
|
||||
<color name="theme_color_nav_bar_surface_grey_dark">#242424</color>
|
||||
<color name="theme_color_nav_bar_surface_amoled_dark">#282828</color>
|
||||
|
|
@ -197,6 +214,7 @@
|
|||
<color name="theme_color_on_accent_blue_dark">#FF17212B</color>
|
||||
<color name="theme_color_on_accent_grey_dark">#FF202020</color>
|
||||
<color name="theme_color_on_accent_amoled_dark">#FF000000</color>
|
||||
<color name="theme_color_on_accent_translucent">#FFFFFFFF</color>
|
||||
<color name="theme_color_on_accent_translucent_light">#FFFFFFFF</color>
|
||||
<color name="theme_color_on_accent_translucent_dark">#FF212121</color>
|
||||
|
||||
|
|
@ -207,6 +225,7 @@
|
|||
<color name="theme_color_nav_amoled_dark">#FF171717</color>
|
||||
|
||||
<color name="theme_color_unselected_day">@color/colorUnselected</color>
|
||||
<color name="theme_color_unselected_translucent">#43FFFFFF</color>
|
||||
<color name="theme_color_unselected_translucent_light">#43FFFFFF</color>
|
||||
<color name="theme_color_unselected_translucent_dark">#4D000000</color>
|
||||
<color name="theme_color_unselected_dark">#FF415C68</color>
|
||||
|
|
@ -215,6 +234,7 @@
|
|||
<color name="theme_color_unselected_amoled_dark">#FF808080</color>
|
||||
|
||||
<color name="theme_color_floor_card_light">#FFF8F8F8</color>
|
||||
<color name="theme_color_floor_card_translucent">#15FFFFFF</color>
|
||||
<color name="theme_color_floor_card_translucent_light">#15FFFFFF</color>
|
||||
<color name="theme_color_floor_card_translucent_dark">#2A000000</color>
|
||||
<color name="theme_color_floor_card_dark">#FF1A2A39</color>
|
||||
|
|
@ -223,6 +243,7 @@
|
|||
<color name="theme_color_floor_card_amoled_dark">#FF1E1E1E</color>
|
||||
|
||||
<color name="theme_color_card_light">#FFFFFFFF</color>
|
||||
<color name="theme_color_card_translucent">#10FFFFFF</color>
|
||||
<color name="theme_color_card_translucent_light">#10FFFFFF</color>
|
||||
<color name="theme_color_card_translucent_dark">#20000000</color>
|
||||
<color name="theme_color_card_dark">#FF131D27</color>
|
||||
|
|
@ -231,6 +252,7 @@
|
|||
<color name="theme_color_card_amoled_dark">#FF101010</color>
|
||||
|
||||
<color name="theme_color_indicator_light">#FFFFFFFF</color>
|
||||
<color name="theme_color_indicator_translucent">#FFFFFFFF</color>
|
||||
<color name="theme_color_indicator_translucent_light">#FFFFFFFF</color>
|
||||
<color name="theme_color_indicator_translucent_dark">#FF1C1C1C</color>
|
||||
<color name="theme_color_indicator_dark">#FF1C2938</color>
|
||||
|
|
@ -239,6 +261,7 @@
|
|||
<color name="theme_color_indicator_amoled_dark">#FF1C1C1C</color>
|
||||
|
||||
<color name="theme_color_divider_light">#FFF5F5F5</color>
|
||||
<color name="theme_color_divider_translucent">#10FFFFFF</color>
|
||||
<color name="theme_color_divider_translucent_light">#10FFFFFF</color>
|
||||
<color name="theme_color_divider_translucent_dark">#15000000</color>
|
||||
<color name="theme_color_divider_dark">#FF10171D</color>
|
||||
|
|
@ -250,9 +273,11 @@
|
|||
<color name="theme_color_shadow_night">#FE191919</color>
|
||||
|
||||
<color name="theme_color_placeholder_light">#FFF0F0F0</color>
|
||||
<color name="theme_color_placeholder_dark">#99000000</color>
|
||||
<color name="theme_color_placeholder_blue_dark">#99000000</color>
|
||||
<color name="theme_color_placeholder_grey_dark">#99000000</color>
|
||||
<color name="theme_color_placeholder_amoled_dark">#99000000</color>
|
||||
<color name="theme_color_placeholder_translucent">#15FFFFFF</color>
|
||||
<color name="theme_color_placeholder_translucent_light">#15FFFFFF</color>
|
||||
<color name="theme_color_placeholder_translucent_dark">#30000000</color>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue