diff --git a/app/build.gradle b/app/build.gradle index 3129fdc..c5b9aa3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,15 +6,14 @@ plugins { } android { - compileSdk 33 - buildToolsVersion '30.0.3' + compileSdk 34 defaultConfig { applicationId "com.c3r5b8.telegram_monet" minSdk 31 - targetSdk 33 - versionCode 23081901 - versionName '9.9.9' + targetSdk 34 + versionCode 23111901 + versionName '10.2.0' resConfigs 'ar', 'bn_IN', 'de', 'es', 'fa_IR', 'fil', 'fr', 'hi', 'hr', 'in', 'it', 'iw', 'kab', 'ml', 'nl', 'pl', 'pt', 'pt_BR', 'ro', 'ru', 'tl', 'tr_TR', 'uk_UA', 'uz', 'vi', 'zh_CN' } diff --git a/app/src/main/assets/monet_dark.attheme b/app/src/main/assets/monet_dark.attheme index 697e27e..49dac6f 100644 --- a/app/src/main/assets/monet_dark.attheme +++ b/app/src/main/assets/monet_dark.attheme @@ -47,13 +47,6 @@ avatar_background2Pink=n2_800 avatar_background2Red=n2_800 avatar_background2Saved=n2_800 avatar_background2Violet=n2_800 -avatar_nameInMessageBlue=a1_400 -avatar_nameInMessageCyan=a1_400 -avatar_nameInMessageGreen=a1_400 -avatar_nameInMessageOrange=a1_400 -avatar_nameInMessagePink=a1_400 -avatar_nameInMessageRed=a1_400 -avatar_nameInMessageViolet=a1_400 avatar_subtitleInProfileBlue=n1_50 avatar_text=a1_100 calls_callReceivedGreenIcon=monetGreenCall @@ -262,7 +255,7 @@ chat_messagePanelVoiceDelete=a1_100 chat_messagePanelVoiceDuration=a1_100 chat_messagePanelVoicePressed=n1_0 chat_messageTextIn=n1_50 -chat_messageTextOut=n1_900 +chat_messageTextOut=n1_800 chat_muteIcon=a1_100 chat_outAdminSelectedText=n1_500 chat_outAdminText=n1_500 @@ -495,7 +488,7 @@ key_player_progressCachedBackground=a2_300 key_sheet_other=a1_100 key_sheet_scrollUp=a1_100 kvoipgroup_overlayAlertMutedByAdmin2=a3_100 -listSelectorSDK21=n2_800 +listSelectorSDK21=350681087 location_actionActiveIcon=a1_300 location_actionBackground=n1_900 location_actionIcon=a1_300 diff --git a/app/src/main/assets/monet_light.attheme b/app/src/main/assets/monet_light.attheme index 0830cb3..d9ecbc8 100644 --- a/app/src/main/assets/monet_light.attheme +++ b/app/src/main/assets/monet_light.attheme @@ -47,13 +47,6 @@ avatar_background2Pink=a1_600 avatar_background2Red=a1_600 avatar_background2Saved=a1_600 avatar_background2Violet=a1_600 -avatar_nameInMessageBlue=a1_400 -avatar_nameInMessageCyan=a1_400 -avatar_nameInMessageGreen=a1_400 -avatar_nameInMessageOrange=a1_400 -avatar_nameInMessagePink=a1_400 -avatar_nameInMessageRed=a1_400 -avatar_nameInMessageViolet=a1_400 avatar_subtitleInProfileBlue=a1_1000 avatar_text=n1_50 calls_callReceivedGreenIcon=monetGreenCall @@ -262,7 +255,7 @@ chat_messagePanelVoiceDelete=a1_600 chat_messagePanelVoiceDuration=n1_50 chat_messagePanelVoicePressed=n1_50 chat_messageTextIn=a1_1000 -chat_messageTextOut=n1_50 +chat_messageTextOut=n1_0 chat_muteIcon=a1_600 chat_outAdminSelectedText=n1_0 chat_outAdminText=n1_0 @@ -495,7 +488,7 @@ key_player_progressCachedBackground=a2_300 key_sheet_other=a1_600 key_sheet_scrollUp=a1_600 kvoipgroup_overlayAlertMutedByAdmin2=a3_100 -listSelectorSDK21=a1_100 +listSelectorSDK21=251658240 location_actionActiveIcon=a1_600 location_actionBackground=n1_50 location_actionIcon=a1_600 diff --git a/app/src/main/java/com/c3r5b8/telegram_monet/MainActivity.kt b/app/src/main/java/com/c3r5b8/telegram_monet/MainActivity.kt index bb90513..6c206bc 100644 --- a/app/src/main/java/com/c3r5b8/telegram_monet/MainActivity.kt +++ b/app/src/main/java/com/c3r5b8/telegram_monet/MainActivity.kt @@ -31,6 +31,7 @@ class MainActivity : AppCompatActivity() { val buttonTelegramLight: Button = findViewById(R.id.setup_light_button) val useGradient: SwitchCompat = findViewById(R.id.switchGradient) val useGradientAvatars: SwitchCompat = findViewById(R.id.switchGradientAvatars) + val useColorNick: SwitchCompat = findViewById(R.id.switchColorsOfNickNames) //Buttons TelegramX val buttonTelegramXDark: Button = findViewById(R.id.setup_x_dark_button) @@ -59,15 +60,52 @@ class MainActivity : AppCompatActivity() { darkThemeImport = darkThemeImport.replace("noGradient", "chat_outBubbleGradient") } - if(useGradientAvatars.isChecked) { - darkThemeImport = darkThemeImport.replace("avatar_backgroundBlue=n2_800", "avatar_backgroundBlue=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundCyan=n2_800", "avatar_backgroundCyan=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundGreen=n2_800", "avatar_backgroundGreen=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundOrange=n2_800", "avatar_backgroundOrange=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundPink=n2_800", "avatar_backgroundPink=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundRed=n2_800", "avatar_backgroundRed=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundSaved=n2_800", "avatar_backgroundSaved=n2_700") - darkThemeImport = darkThemeImport.replace("avatar_backgroundViolet=n2_800", "avatar_backgroundViolet=n2_700") + if (useColorNick.isChecked) { + darkThemeImport = darkThemeImport.replace( + "\nend", + "\navatar_nameInMessageBlue=a1_400\n" + + "avatar_nameInMessageCyan=a1_400\n" + + "avatar_nameInMessageGreen=a1_400\n" + + "avatar_nameInMessageOrange=a1_400\n" + + "avatar_nameInMessagePink=a1_400\n" + + "avatar_nameInMessageRed=a1_400\n" + + "avatar_nameInMessageViolet=a1_400\nend" + ) + } + + if (useGradientAvatars.isChecked) { + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundBlue=n2_800", + "avatar_backgroundBlue=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundCyan=n2_800", + "avatar_backgroundCyan=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundGreen=n2_800", + "avatar_backgroundGreen=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundOrange=n2_800", + "avatar_backgroundOrange=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundPink=n2_800", + "avatar_backgroundPink=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundRed=n2_800", + "avatar_backgroundRed=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundSaved=n2_800", + "avatar_backgroundSaved=n2_700" + ) + darkThemeImport = darkThemeImport.replace( + "avatar_backgroundViolet=n2_800", + "avatar_backgroundViolet=n2_700" + ) } val themeString = changeTextTelegram(darkThemeImport, applicationContext) @@ -91,15 +129,52 @@ class MainActivity : AppCompatActivity() { lightThemeImport = lightThemeImport.replace("noGradient", "chat_outBubbleGradient") } - if(useGradientAvatars.isChecked) { - lightThemeImport = lightThemeImport.replace("avatar_backgroundBlue=a1_600", "avatar_backgroundBlue=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundCyan=a1_600", "avatar_backgroundCyan=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundGreen=a1_600", "avatar_backgroundGreen=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundOrange=a1_600", "avatar_backgroundOrange=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundPink=a1_600", "avatar_backgroundPink=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundRed=a1_600", "avatar_backgroundRed=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundSaved=a1_600", "avatar_backgroundSaved=a1_500") - lightThemeImport = lightThemeImport.replace("avatar_backgroundViolet=a1_600", "avatar_backgroundViolet=a1_500") + if (useColorNick.isChecked) { + lightThemeImport = lightThemeImport.replace( + "\nend", + "\navatar_nameInMessageBlue=a1_400\n" + + "avatar_nameInMessageCyan=a1_400\n" + + "avatar_nameInMessageGreen=a1_400\n" + + "avatar_nameInMessageOrange=a1_400\n" + + "avatar_nameInMessagePink=a1_400\n" + + "avatar_nameInMessageRed=a1_400\n" + + "avatar_nameInMessageViolet=a1_400\nend" + ) + } + + if (useGradientAvatars.isChecked) { + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundBlue=a1_600", + "avatar_backgroundBlue=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundCyan=a1_600", + "avatar_backgroundCyan=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundGreen=a1_600", + "avatar_backgroundGreen=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundOrange=a1_600", + "avatar_backgroundOrange=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundPink=a1_600", + "avatar_backgroundPink=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundRed=a1_600", + "avatar_backgroundRed=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundSaved=a1_600", + "avatar_backgroundSaved=a1_500" + ) + lightThemeImport = lightThemeImport.replace( + "avatar_backgroundViolet=a1_600", + "avatar_backgroundViolet=a1_500" + ) } val themeString = changeTextTelegram(lightThemeImport, applicationContext) @@ -178,9 +253,10 @@ class MainActivity : AppCompatActivity() { intent.type = "*/*" val flags = PackageManager.MATCH_DEFAULT_ONLY - val resolveInfos : List + val resolveInfos: List if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - resolveInfos = packageManager.queryIntentActivities(intent, ResolveInfoFlags.of(flags.toLong())) + resolveInfos = + packageManager.queryIntentActivities(intent, ResolveInfoFlags.of(flags.toLong())) } else { resolveInfos = packageManager.queryIntentActivities(intent, flags) } @@ -190,7 +266,11 @@ class MainActivity : AppCompatActivity() { .setMessage(R.string.fast_import_description) .setPositiveButton(R.string.fast_import_method_fast_import) { dialog, which -> resolveInfos.forEach { - grantUriPermission(it.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION) + grantUriPermission( + it.activityInfo.packageName, + uri, + Intent.FLAG_GRANT_READ_URI_PERMISSION + ) } val runIntent = Intent("org.telegram.messenger.IMPORT_THEME") @@ -200,7 +280,12 @@ class MainActivity : AppCompatActivity() { runIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK startActivity(Intent.createChooser(runIntent, theme)) } - .setNegativeButton(R.string.fast_import_method_regular) { dialog, which -> shareThemeRegular(theme, uri) } + .setNegativeButton(R.string.fast_import_method_regular) { dialog, which -> + shareThemeRegular( + theme, + uri + ) + } .show() return @@ -226,10 +311,13 @@ class MainActivity : AppCompatActivity() { val useGradient: SwitchCompat = findViewById(R.id.switchGradient) val useGradientAvatars: SwitchCompat = findViewById(R.id.switchGradientAvatars) val isAmoledMode: SwitchCompat = findViewById(R.id.switchAmoledPhone) + val useColorNick: SwitchCompat = findViewById(R.id.switchColorsOfNickNames) + sharedPreferencesEditor.putBoolean("useGradient", useGradient.isChecked) sharedPreferencesEditor.putBoolean("useGradientAvatars", useGradientAvatars.isChecked) sharedPreferencesEditor.putBoolean("isAmoledMode", isAmoledMode.isChecked) + sharedPreferencesEditor.putBoolean("useColorNick", useColorNick.isChecked) sharedPreferencesEditor.apply() } @@ -240,10 +328,12 @@ class MainActivity : AppCompatActivity() { val useGradient: SwitchCompat = findViewById(R.id.switchGradient) val useGradientAvatars: SwitchCompat = findViewById(R.id.switchGradientAvatars) val isAmoledMode: SwitchCompat = findViewById(R.id.switchAmoledPhone) + val useColorNick: SwitchCompat = findViewById(R.id.switchColorsOfNickNames) useGradient.isChecked = sharedPreferences.getBoolean("useGradient", false) useGradientAvatars.isChecked = sharedPreferences.getBoolean("useGradientAvatars", false) isAmoledMode.isChecked = sharedPreferences.getBoolean("isAmoledMode", false) + useColorNick.isChecked = sharedPreferences.getBoolean("useColorNick", true) } override fun onPause() { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b76d11f..a86445a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".MainActivity"> - + + + diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 319e1ee..fe19b54 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1,14 +1,19 @@ - נושא - מחולל ערכות נושא פשוט של Telegram Monet + ערכת נושא + מחולל ערכת נושא פשוט של Telegram Monet. ערוץ הטלגרם שלנו - אפל - צור נושא כהה מגווני מערכת. נהדר ללילה - אוֹר - צור נושא קל מגוני מערכת. נראה טוב במהלך היום - להגדיר + כהה + צור ערכת נושא מגווני המערכת. מתאים לשעות הלילה. + בהיר + צור ערכת נושא מגווני המערכת. מתאים לשעות היום. + הגדר הגדרות - אפשר שיפוע (Telegram) - אפשר מעבר צבע עבור אווטרים + אפשר מעבר צבע הדרגתי (Telegram) + אפשר מעבר צבע עבור אווטארים + אפשר מעברי צבע עבור שמות אנשי קשר + במה להשתמש? + האפליקציה זיהתה אפליקציות טלגרם התומכות בייבוא מהיר של ערכות נושא. + ייבוא מהיר + רגיל (שיתוף) \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8739898..c93788d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -16,4 +16,10 @@ Настройки Включить градиент (Telegram) Включить градиент для аватарок + Использовать Monet для ников + + Что использовать? + У Вас установлен Telegram, который поддерживает быстрый импорт тем + Быстрый импорт + Обычный (поделиться) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc4c685..b4753b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,7 @@ Settings Enable gradient (Telegram) Enable gradient for avatars + Enable monet for nicknames What to use? The app has detected Telegram apps that supports fast theme importing. diff --git a/gradlew b/gradlew old mode 100755 new mode 100644