From e544b440867d72ff2d644ec22e2dc3bdac71ad9d Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Wed, 7 Dec 2022 00:53:21 +0800 Subject: [PATCH] Separate overwrite resources for different versions (#2287) --- .../common/res/values-night-v31/colors.xml | 19 ++++++++++++ app/src/common/res/values-night/colors.xml | 19 ++++++++++++ app/src/common/res/values-v31/colors.xml | 19 ++++++++++++ app/src/common/res/values/colors.xml | 19 ++++++++++++ .../org/lsposed/manager/util/Telemetry.java | 19 ++++++++++++ .../manager/ui/dialog/FlashDialogBuilder.java | 19 ++++++++++++ .../manager/ui/dialog/WelcomeDialog.java | 19 ++++++++++++ .../manager/ui/widget/ScrollWebView.java | 19 ++++++++++++ .../ui/widget/StatefulRecyclerView.java | 19 ++++++++++++ .../util/EmptyAccessibilityDelegate.java | 19 ++++++++++++ .../lsposed/manager/util/ShortcutUtil.java | 19 ++++++++++++ .../manager/util/SimpleStatefulAdaptor.java | 19 ++++++++++++ .../org/lsposed/manager/util/UpdateUtil.java | 19 ++++++++++++ .../res/drawable/ic_assignment_checkable.xml | 19 ++++++++++++ .../drawable/ic_baseline_assignment_24.xml | 19 ++++++++++++ .../main/res/drawable/ic_baseline_chat_24.xml | 19 ++++++++++++ .../res/drawable/ic_baseline_extension_24.xml | 19 ++++++++++++ .../res/drawable/ic_baseline_get_app_24.xml | 19 ++++++++++++ .../main/res/drawable/ic_baseline_home_24.xml | 19 ++++++++++++ .../main/res/drawable/ic_baseline_info_24.xml | 19 ++++++++++++ .../res/drawable/ic_baseline_search_24.xml | 19 ++++++++++++ .../res/drawable/ic_baseline_settings_24.xml | 19 ++++++++++++ ...ic_baseline_settings_backup_restore_24.xml | 19 ++++++++++++ .../res/drawable/ic_extension_checkable.xml | 20 +++++++++++++ .../res/drawable/ic_get_app_checkable.xml | 19 ++++++++++++ .../main/res/drawable/ic_home_checkable.xml | 19 ++++++++++++ .../ic_outline_add_to_home_screen_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_android_24.xml | 19 ++++++++++++ .../drawable/ic_outline_app_shortcut_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_assignment_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_extension_24.xml | 19 ++++++++++++ .../ic_outline_format_color_fill_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_get_app_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_groups_24.xml | 19 ++++++++++++ .../main/res/drawable/ic_outline_home_24.xml | 19 ++++++++++++ .../drawable/ic_outline_invert_colors_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_language_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_merge_type_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_restore_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_settings_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_shield_24.xml | 19 ++++++++++++ .../drawable/ic_outline_speaker_notes_24.xml | 19 ++++++++++++ .../res/drawable/ic_outline_translate_24.xml | 19 ++++++++++++ .../res/drawable/ic_round_bug_report_24.xml | 19 ++++++++++++ .../res/drawable/ic_round_check_circle_24.xml | 19 ++++++++++++ .../drawable/ic_round_error_outline_24.xml | 19 ++++++++++++ .../res/drawable/ic_round_settings_24.xml | 19 ++++++++++++ .../main/res/drawable/ic_round_warning_24.xml | 19 ++++++++++++ .../res/drawable/ic_settings_checkable.xml | 19 ++++++++++++ .../main/res/layout/item_master_switch.xml | 19 ++++++++++++ app/src/main/res/values-sw600dp/integer.xml | 19 ++++++++++++ app/src/main/res/values-v28/themes.xml | 29 +++++++++++++++++++ app/src/main/res/values-v29/settings.xml | 19 ++++++++++++ app/src/main/res/values-v30/themes.xml | 29 +++++++++++++++++++ app/src/main/res/values/integer.xml | 19 ++++++++++++ app/src/main/res/values/settings.xml | 19 ++++++++++++ app/src/main/res/values/themes.xml | 8 ++--- 57 files changed, 1087 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/values-v28/themes.xml create mode 100644 app/src/main/res/values-v30/themes.xml diff --git a/app/src/common/res/values-night-v31/colors.xml b/app/src/common/res/values-night-v31/colors.xml index 91b4e4f1..d5b9c2e2 100644 --- a/app/src/common/res/values-night-v31/colors.xml +++ b/app/src/common/res/values-night-v31/colors.xml @@ -1,4 +1,23 @@ + + @android:color/system_accent1_800 @android:color/system_accent1_200 diff --git a/app/src/common/res/values-night/colors.xml b/app/src/common/res/values-night/colors.xml index aca20406..fbe79c35 100644 --- a/app/src/common/res/values-night/colors.xml +++ b/app/src/common/res/values-night/colors.xml @@ -1,3 +1,22 @@ + + #F06292 #E1F5FE diff --git a/app/src/common/res/values-v31/colors.xml b/app/src/common/res/values-v31/colors.xml index b08d0d82..41881b35 100644 --- a/app/src/common/res/values-v31/colors.xml +++ b/app/src/common/res/values-v31/colors.xml @@ -1,4 +1,23 @@ + + @android:color/system_accent1_0 @android:color/system_accent1_600 diff --git a/app/src/common/res/values/colors.xml b/app/src/common/res/values/colors.xml index 0f78a648..034b22fb 100644 --- a/app/src/common/res/values/colors.xml +++ b/app/src/common/res/values/colors.xml @@ -1,3 +1,22 @@ + + #FFFFFF #F48FB1 diff --git a/app/src/debug/java/org/lsposed/manager/util/Telemetry.java b/app/src/debug/java/org/lsposed/manager/util/Telemetry.java index ebb091b5..3545aa3e 100644 --- a/app/src/debug/java/org/lsposed/manager/util/Telemetry.java +++ b/app/src/debug/java/org/lsposed/manager/util/Telemetry.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.util; import android.app.Application; diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java index b95f2f03..dc4155b0 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.ui.dialog; import static org.lsposed.manager.App.TAG; diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java index 7bd3453e..82ab7b6c 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.ui.dialog; import android.app.Dialog; diff --git a/app/src/main/java/org/lsposed/manager/ui/widget/ScrollWebView.java b/app/src/main/java/org/lsposed/manager/ui/widget/ScrollWebView.java index 07cc03a8..559bd1c0 100644 --- a/app/src/main/java/org/lsposed/manager/ui/widget/ScrollWebView.java +++ b/app/src/main/java/org/lsposed/manager/ui/widget/ScrollWebView.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.ui.widget; import android.annotation.SuppressLint; diff --git a/app/src/main/java/org/lsposed/manager/ui/widget/StatefulRecyclerView.java b/app/src/main/java/org/lsposed/manager/ui/widget/StatefulRecyclerView.java index c267fdd2..b017df3d 100644 --- a/app/src/main/java/org/lsposed/manager/ui/widget/StatefulRecyclerView.java +++ b/app/src/main/java/org/lsposed/manager/ui/widget/StatefulRecyclerView.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.ui.widget; import android.content.Context; diff --git a/app/src/main/java/org/lsposed/manager/util/EmptyAccessibilityDelegate.java b/app/src/main/java/org/lsposed/manager/util/EmptyAccessibilityDelegate.java index 15f18ad1..6df1d9fd 100644 --- a/app/src/main/java/org/lsposed/manager/util/EmptyAccessibilityDelegate.java +++ b/app/src/main/java/org/lsposed/manager/util/EmptyAccessibilityDelegate.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.util; import android.os.Bundle; diff --git a/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java b/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java index 5bf178a4..5708f8da 100644 --- a/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.util; import android.annotation.SuppressLint; diff --git a/app/src/main/java/org/lsposed/manager/util/SimpleStatefulAdaptor.java b/app/src/main/java/org/lsposed/manager/util/SimpleStatefulAdaptor.java index 3d989ef5..a4db646d 100644 --- a/app/src/main/java/org/lsposed/manager/util/SimpleStatefulAdaptor.java +++ b/app/src/main/java/org/lsposed/manager/util/SimpleStatefulAdaptor.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.util; import android.os.Bundle; diff --git a/app/src/main/java/org/lsposed/manager/util/UpdateUtil.java b/app/src/main/java/org/lsposed/manager/util/UpdateUtil.java index abff00bd..4115961a 100644 --- a/app/src/main/java/org/lsposed/manager/util/UpdateUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/UpdateUtil.java @@ -1,3 +1,22 @@ +/* + * This file is part of LSPosed. + * + * LSPosed is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LSPosed is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LSPosed. If not, see . + * + * Copyright (C) 2022 LSPosed Contributors + */ + package org.lsposed.manager.util; import android.util.Log; diff --git a/app/src/main/res/drawable/ic_assignment_checkable.xml b/app/src/main/res/drawable/ic_assignment_checkable.xml index 96ea7b4a..953092d0 100644 --- a/app/src/main/res/drawable/ic_assignment_checkable.xml +++ b/app/src/main/res/drawable/ic_assignment_checkable.xml @@ -1,4 +1,23 @@ + + diff --git a/app/src/main/res/drawable/ic_baseline_assignment_24.xml b/app/src/main/res/drawable/ic_baseline_assignment_24.xml index 6a49f3f7..64b5cff2 100644 --- a/app/src/main/res/drawable/ic_baseline_assignment_24.xml +++ b/app/src/main/res/drawable/ic_baseline_assignment_24.xml @@ -1,3 +1,22 @@ + + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + + + + diff --git a/app/src/main/res/drawable/ic_get_app_checkable.xml b/app/src/main/res/drawable/ic_get_app_checkable.xml index 6624b29d..e08a1f9b 100644 --- a/app/src/main/res/drawable/ic_get_app_checkable.xml +++ b/app/src/main/res/drawable/ic_get_app_checkable.xml @@ -1,4 +1,23 @@ + + diff --git a/app/src/main/res/drawable/ic_home_checkable.xml b/app/src/main/res/drawable/ic_home_checkable.xml index 206c3bf6..7a087431 100644 --- a/app/src/main/res/drawable/ic_home_checkable.xml +++ b/app/src/main/res/drawable/ic_home_checkable.xml @@ -1,4 +1,23 @@ + + diff --git a/app/src/main/res/drawable/ic_outline_add_to_home_screen_24.xml b/app/src/main/res/drawable/ic_outline_add_to_home_screen_24.xml index 438c3253..35f8e3dc 100644 --- a/app/src/main/res/drawable/ic_outline_add_to_home_screen_24.xml +++ b/app/src/main/res/drawable/ic_outline_add_to_home_screen_24.xml @@ -1,3 +1,22 @@ + + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + . + ~ + ~ Copyright (C) 2022 LSPosed Contributors + --> + + + diff --git a/app/src/main/res/layout/item_master_switch.xml b/app/src/main/res/layout/item_master_switch.xml index 4295067f..4b3029ca 100644 --- a/app/src/main/res/layout/item_master_switch.xml +++ b/app/src/main/res/layout/item_master_switch.xml @@ -1,4 +1,23 @@ + + + + 0x50 diff --git a/app/src/main/res/values-v28/themes.xml b/app/src/main/res/values-v28/themes.xml new file mode 100644 index 00000000..be5c2c91 --- /dev/null +++ b/app/src/main/res/values-v28/themes.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/values-v29/settings.xml b/app/src/main/res/values-v29/settings.xml index 52f7c43a..ebb9cc6e 100644 --- a/app/src/main/res/values-v29/settings.xml +++ b/app/src/main/res/values-v29/settings.xml @@ -1,4 +1,23 @@ + + true diff --git a/app/src/main/res/values-v30/themes.xml b/app/src/main/res/values-v30/themes.xml new file mode 100644 index 00000000..b182fe6b --- /dev/null +++ b/app/src/main/res/values-v30/themes.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/values/integer.xml b/app/src/main/res/values/integer.xml index 92ead4e0..f12b67ba 100644 --- a/app/src/main/res/values/integer.xml +++ b/app/src/main/res/values/integer.xml @@ -1,4 +1,23 @@ + + 0x00800007 0x30 diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml index 0a2326fd..bd53f027 100644 --- a/app/src/main/res/values/settings.xml +++ b/app/src/main/res/values/settings.xml @@ -1,4 +1,23 @@ + + false diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0b4251fa..06810bdd 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -37,9 +37,7 @@ ?colorPrimary - + - +