Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into fdroid #38

Merged
merged 10 commits into from
Feb 9, 2024
Merged

Merge master into fdroid #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c214ca
Remove unused class
Mahmud0808 Feb 8, 2024
fb28758
Fix onboarding crash on landscape view
Mahmud0808 Feb 9, 2024
23cf94a
New Crowdin translations by GitHub Action
crowdin-bot Feb 9, 2024
ee532e2
Update .gitignore
Mahmud0808 Feb 9, 2024
bbf9628
Update README.md
Mahmud0808 Feb 9, 2024
9605d86
Merge remote-tracking branch 'origin/master'
Mahmud0808 Feb 9, 2024
139fbd5
Merge pull request #36 from Mahmud0808/localization
Mahmud0808 Feb 9, 2024
962b9eb
Merge remote-tracking branch 'origin/master'
Mahmud0808 Feb 9, 2024
c8d554a
Bump version code
Mahmud0808 Feb 9, 2024
cccf6d7
Merge pull request #37 from Mahmud0808/fdroid
Mahmud0808 Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ local.properties
*.apk
*.jks
/app/debug/
/app/release/
/app/release/
/*.hprof
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
Elevate your creativity with effortless material customization. Instantly tweak colors for a personalized touch in just a few taps.
</p>
<div align="center">
<a href="https://f-droid.org/en/packages/com.drdisagree.colorblendr/"><img src="https://gitlab.com/fdroid/artwork/-/raw/master/badge/get-it-on-en.png" width="34.4%" alt="Get it on F-Droid" /></a>
<br>
<a href="https://www.buymeacoffee.com/DrDisagree"><img src="https://raw.githubusercontent.com/Mahmud0808/ColorBlendr/master/.github/resources/bmc-button.png" width="30%" alt="Buy me a coffee" /></a>
<br><br>
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
defaultConfig {
minSdk = 31
targetSdk = 34
versionCode = 9
versionName = "v1.1"
versionCode = 10
versionName = "v1.2"
}

buildTypes {
Expand Down
52 changes: 0 additions & 52 deletions app/src/main/java/com/drdisagree/colorblendr/utils/ShizukuShell.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions app/src/main/java/com/drdisagree/colorblendr/utils/ShizukuUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

public class ShizukuUtil {

public static ShizukuShell mShizukuShell = null;

public static boolean isShizukuAvailable() {
return Shizuku.pingBinder();
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/fragment_onboarding_item3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
app:layout_constraintTop_toTopOf="@id/guidelineTop">

<com.drdisagree.colorblendr.ui.widgets.SelectableViewWidget
android:id="@+id/post_notifications"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:descriptionText="@string/mode_one_desc"
app:titleText="@string/mode_one_title" />

<com.drdisagree.colorblendr.ui.widgets.SelectableViewWidget
android:id="@+id/read_media_images"
android:id="@+id/shizuku"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down
10 changes: 8 additions & 2 deletions app/src/main/res/values-af-rZA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string name="dev_bio">Learner | Developer | Designer</string>
<string name="news">News</string>
<string name="support">Support</string>
<string name="github">Github</string>
<string name="github">GitHub</string>
<string name="version">Version</string>
<string name="pitch_black_theme_title">Pitch black theme</string>
<string name="pitch_black_theme_desc">Black background in dark mode</string>
Expand Down Expand Up @@ -73,6 +73,7 @@
<string name="confirmation_title">Are you sure?</string>
<string name="confirmation_desc">This will override your current theme and configuration.</string>
<string name="root_service_not_found">Root permission not granted.</string>
<string name="shizuku_service_not_found">Shizuku permission not granted.</string>
<string name="something_went_wrong">Something went wrong.</string>
<string name="permission_must_be_granted">Permission must be granted</string>
<string name="grant">Grant</string>
Expand Down Expand Up @@ -131,5 +132,10 @@
<string name="neutral_1">Neutral 1</string>
<string name="neutral_2">Neutral 2</string>
<string name="long_press_to_reset">Long press to reset</string>
<string name="this_cannot_be_undone">Please note that the outcome of this action is final and irreversible.</string>
<string name="this_cannot_be_undone">Please be aware that the outcome of this action is definitive and cannot be reverted.</string>
<string name="select_method">Select a method to proceed</string>
<string name="mode_one_title">Root</string>
<string name="mode_one_desc">Use root access to change colors. All customization options will be available.</string>
<string name="mode_two_title">Shizuku</string>
<string name="mode_two_desc">Use shizuku to work without root. Limited customization options will be available.</string>
</resources>
102 changes: 54 additions & 48 deletions app/src/main/res/values-ar-rSA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
<string name="accurate_shades_title">ظلال دقيقة</string>
<string name="accurate_shades_desc">احتفظ بظلال دقيقة لألوان التمييز</string>
<string name="monet_style_title">أسلوب Monet</string>
<string name="accent_saturation">Accent saturation</string>
<string name="background_saturation">Background saturation</string>
<string name="accent_saturation">تشبع لون التمييز</string>
<string name="background_saturation">تشبع الخلفية</string>
<string name="background_lightness">سطوع الخلفية</string>
<string name="icon">أيقونة</string>
<string name="reset">إعادة ضبط</string>
<string name="opt_selected1">المحدد: %s</string>
<string name="opt_selected2">المحدد: %s%s</string>
<string name="btn_apply">تطبيق التخصيص</string>
<string name="dev_bio">متعلم | مطوّر | مصمّم</string>
<string name="news">News</string>
<string name="support">Support</string>
<string name="news">أخبار</string>
<string name="support">دعم</string>
<string name="github">جيت هاب</string>
<string name="version">الإصدار</string>
<string name="pitch_black_theme_title">سمة الأسود المطفي</string>
<string name="pitch_black_theme_desc">خلفية سوداء في الوضع المظلم</string>
<string name="change_style_to_apply">إذا كانت مفاتيح التبديل لا تقم بالتطبيق على الفور، فحاول ضبط أحد أشرطة التمرير لتطبيق التغييرات على الفور.</string>
<string name="color_picker_preview">معاينة اختيار الألوان</string>
<string name="seed_color_picker_title">Custom primary color</string>
<string name="seed_color_picker_title">لون أساسي مخصص</string>
<string name="seed_color_picker_desc">Create palette based on custom color</string>
<string name="colorPickerDialog_dialogName">Color Picker</string>
<string name="colorPickerDialog_reset">Reset</string>
<string name="colorPickerDialog_dialogName">متنقي الألوان</string>
<string name="colorPickerDialog_reset">إعادة ضبط</string>
<string name="colorPickerDialog_preset">Preset</string>
<string name="colorPickerDialog_image">صورة</string>
<string name="colorPickerDialog_imageColorPicker">Pick Color from Image</string>
Expand Down Expand Up @@ -62,20 +62,21 @@
<string name="reset_all_success">تمت إعادة ضبط جميع الألوان بنجاح</string>
<string name="backup_restore_title">Backup &amp; restore configs</string>
<string name="backup_restore_desc">Share the delight of your theme\'s unique look and feel by saving and sharing your configuration</string>
<string name="backup">Backup</string>
<string name="restore">Restore</string>
<string name="backup_success">Backup successful</string>
<string name="backup_fail">Backup failed</string>
<string name="restore_success">Restore successful</string>
<string name="backup">نسخ احتياطي</string>
<string name="restore">استعادة</string>
<string name="backup_success">تم النسخ الاحتياطي بنجاح</string>
<string name="backup_fail">فشل النسخ الاحتياطي</string>
<string name="restore_success">تمت الاستعادة بنجاح</string>
<string name="restore_fail">Restore failed</string>
<string name="restart">Restart</string>
<string name="retry">Retry</string>
<string name="restart">إعادة تشغيل</string>
<string name="retry">إعادة المحاولة</string>
<string name="confirmation_title">Are you sure?</string>
<string name="confirmation_desc">This will override your current theme and configuration.</string>
<string name="root_service_not_found">Root permission not granted.</string>
<string name="shizuku_service_not_found">Shizuku permission not granted.</string>
<string name="something_went_wrong">Something went wrong.</string>
<string name="permission_must_be_granted">Permission must be granted</string>
<string name="grant">Grant</string>
<string name="grant">منح</string>
<string name="background_service_notification_title">Background service</string>
<string name="background_service_notification_text">Useless notification. Tap to disable.</string>
<string name="background_service_notification_channel_title">Background service</string>
Expand All @@ -88,8 +89,8 @@
<string name="perm_two_desc">This permission is required to retrieve home and lockscreen wallpaper.</string>
<string name="perm_three_title">All Files Access</string>
<string name="perm_three_desc">This permission is required to retrieve home and lockscreen wallpaper.</string>
<string name="start">Start</string>
<string name="btn_continue">Continue</string>
<string name="start">إبدأ</string>
<string name="btn_continue">استمر</string>
<string name="monet_neutral_desc">Lively and refreshing color palette inspired by the effervescence of spritz beverages.</string>
<string name="monet_monochrome_desc">Harmonious scheme using variations of a single hue for a sleek and minimalist aesthetic.</string>
<string name="monet_tonalspot_desc">Palette featuring subtle variations in tone, creating a sophisticated and nuanced visual impact.</string>
Expand All @@ -100,36 +101,41 @@
<string name="monet_fruitsalad_desc">Eclectic blend of colors reminiscent of a vibrant assortment of fresh and juicy fruits.</string>
<string name="monet_content_desc">Balanced and calming palette, promoting a sense of tranquility and contentment.</string>
<string name="per_app_theme_warn">You may have noticed that certain apps not following system theme, a result of the MaterialComponents update (v1.11.0+). Manually select those apps here to apply the theme, and remember to close and reopen those apps to see the changes take effect.</string>
<string name="colors">Colors</string>
<string name="per_app_theme">Per app theme</string>
<string name="settings">Settings</string>
<string name="styles">Styles</string>
<string name="theme">Theme</string>
<string name="wallpaper_colors">Wallpaper colors</string>
<string name="basic_colors">Basic colors</string>
<string name="force_per_app_theme_title">Force per app theme</string>
<string name="force_per_app_theme_desc">Apply custom colors to specific apps which do not follow system monet</string>
<string name="back">Back</string>
<string name="permissions">Permissions</string>
<string name="choose_method">Choose method</string>
<string name="auto_startup">Auto startup</string>
<string name="auto_startup_title">Start service on boot</string>
<string name="auto_startup_desc">%s will automatically initiate its service upon system boot.<![CDATA[<br /><br />]]>If this is not the case, please verify whether your system or any third-party tools may be restricting %s. For detailed instructions, you can refer to <![CDATA[<a href="https://dontkillmyapp.com"><b><u>Don\'t kill my app!</u></b></a>]]>.</string>
<string name="about_this_app_title">About this app</string>
<string name="about_this_app_desc">Information about this app and its developer</string>
<string name="search_hint">Search here…</string>
<string name="note_title">Note:</string>
<string name="grant_all_permissions">Please grant all permissions to proceed</string>
<string name="app_service_title">%s service</string>
<string name="app_service_desc_on">Theming is active</string>
<string name="app_service_desc_off">Theming is inactive</string>
<string name="tint_text_title">Tint text color</string>
<string name="colors">ألوان</string>
<string name="per_app_theme">سمة لكل تطبيق</string>
<string name="settings">الإعدادات</string>
<string name="styles">النمط</string>
<string name="theme">مظهر</string>
<string name="wallpaper_colors">ألوان الخلفية</string>
<string name="basic_colors">الألوان الأساسية</string>
<string name="force_per_app_theme_title">فرض سمة لكل تطبيق</string>
<string name="force_per_app_theme_desc">تطبيق ألوان مخصصة على تطبيقات محددة لا تتبع Monet الخاص بالنظام</string>
<string name="back">عودة</string>
<string name="permissions">صلاحيات</string>
<string name="choose_method">اختر طريقة</string>
<string name="auto_startup">تشغيل تلقائي</string>
<string name="auto_startup_title">بدء الخدمة عند الإقلاع</string>
<string name="auto_startup_desc">%s سيبدأ خدمته تلقائيًا عند تشغيل النظام.<![CDATA[<br /><br />]]>إذا لم يكن الأمر كذلك، يرجى التحقق مما إذا كان النظام الخاص بك أو أي أدوات الطرف الثالث قد تقيد %s. للحصول على تعليمات مفصلة، يمكنك الرجوع إلى <![CDATA[<a href="https://dontkillmyapp.com"><b><u>لا تقتل تطبيقي!</u></b></a>]]>.</string>
<string name="about_this_app_title">حول هذا التطبيق</string>
<string name="about_this_app_desc">معلومات حول هذا التطبيق ومطوره</string>
<string name="search_hint">ابحث هنا…</string>
<string name="note_title">ملاحظة:</string>
<string name="grant_all_permissions">يرجى منح جميع الصلاحيات للمتابعة</string>
<string name="app_service_title">خدمة %s</string>
<string name="app_service_desc_on">السمة نشطة</string>
<string name="app_service_desc_off">السمة غير نشطة</string>
<string name="tint_text_title">لون نص Tint</string>
<string name="tint_text_desc">Maintain a subtle tint for text</string>
<string name="primary">Primary</string>
<string name="secondary">Secondary</string>
<string name="tertiary">Tertiary</string>
<string name="neutral_1">Neutral 1</string>
<string name="neutral_2">Neutral 2</string>
<string name="long_press_to_reset">Long press to reset</string>
<string name="this_cannot_be_undone">Please note that the outcome of this action is final and irreversible.</string>
<string name="primary">اساسي</string>
<string name="secondary">ثانوي</string>
<string name="tertiary">ثالثي</string>
<string name="neutral_1">حيادي 1</string>
<string name="neutral_2">حيادي 2</string>
<string name="long_press_to_reset">اضغط مطولاً لإعادة التعيين</string>
<string name="this_cannot_be_undone">يرجى أن تكون على علم بأن نتيجة هذا الإجراء نهائية ولا يمكن التراجع عنها.</string>
<string name="select_method">اختر طريقة للمتابعة</string>
<string name="mode_one_title">روت</string>
<string name="mode_one_desc">استخدم صلاحيات الروت لتغيير الألوان. جميع خيارات التخصيص ستكون متاحة.</string>
<string name="mode_two_title">Shizuku</string>
<string name="mode_two_desc">استخدم Shizuku للعمل بدون روت. ستكون خيارات التخصيص المحدودة متاحة.</string>
</resources>
10 changes: 8 additions & 2 deletions app/src/main/res/values-ca-rES/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string name="dev_bio">Learner | Developer | Designer</string>
<string name="news">News</string>
<string name="support">Support</string>
<string name="github">Github</string>
<string name="github">GitHub</string>
<string name="version">Version</string>
<string name="pitch_black_theme_title">Pitch black theme</string>
<string name="pitch_black_theme_desc">Black background in dark mode</string>
Expand Down Expand Up @@ -73,6 +73,7 @@
<string name="confirmation_title">Are you sure?</string>
<string name="confirmation_desc">This will override your current theme and configuration.</string>
<string name="root_service_not_found">Root permission not granted.</string>
<string name="shizuku_service_not_found">Shizuku permission not granted.</string>
<string name="something_went_wrong">Something went wrong.</string>
<string name="permission_must_be_granted">Permission must be granted</string>
<string name="grant">Grant</string>
Expand Down Expand Up @@ -131,5 +132,10 @@
<string name="neutral_1">Neutral 1</string>
<string name="neutral_2">Neutral 2</string>
<string name="long_press_to_reset">Long press to reset</string>
<string name="this_cannot_be_undone">Please note that the outcome of this action is final and irreversible.</string>
<string name="this_cannot_be_undone">Please be aware that the outcome of this action is definitive and cannot be reverted.</string>
<string name="select_method">Select a method to proceed</string>
<string name="mode_one_title">Root</string>
<string name="mode_one_desc">Use root access to change colors. All customization options will be available.</string>
<string name="mode_two_title">Shizuku</string>
<string name="mode_two_desc">Use shizuku to work without root. Limited customization options will be available.</string>
</resources>
Loading