Release 9.3.0

- New values for Telegram Themes - Fix bugs for TgX Themes
mi-g-alex · Jan 1, 2023 · c11624b · c11624b
1 parent 2c5a870
commit c11624b
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.c3r5b8.telegram_monet"
         minSdk 31
         targetSdk 33
-        versionCode 22120302
-        versionName '9.1.4'
+        versionCode 23010101
+        versionName '9.3.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
@@ -405,6 +405,7 @@ chat_sentError=monetRedDark
 chat_sentErrorIcon=monetRedDark
 chat_serviceBackground=n1_700
 chat_serviceBackgroundSelected=n1_900
+chat_serviceBackgroundSelector=n1_800
 chat_serviceIcon=a1_100
 chat_serviceLink=a1_100
 chat_serviceText=a1_100
@@ -624,12 +625,14 @@ statisticChartHintLine=a1_100
 statisticChartInactivePickerChart=333639417
 statisticChartLineEmpty=n1_800
 statisticChartLine_blue=a1_400
+statisticChartLine_cyan=a2_600
 statisticChartLine_golden=a1_500
 statisticChartLine_green=a1_700
 statisticChartLine_indigo=a1_200
 statisticChartLine_lightblue=a3_200
 statisticChartLine_lightgreen=a3_700
 statisticChartLine_orange=a3_500
+statisticChartLine_purple=a2_400
 statisticChartLine_red=a3_300
 statisticChartRipple=a1_800
 statisticChartSignature=a1_100

diff --git a/app/src/main/assets/monet_light.attheme b/app/src/main/assets/monet_light.attheme
@@ -405,6 +405,7 @@ chat_sentError=monetRedLight
 chat_sentErrorIcon=monetRedLight
 chat_serviceBackground=a1_600
 chat_serviceBackgroundSelected=a1_600
+chat_serviceBackgroundSelector=a1_700
 chat_serviceIcon=n1_50
 chat_serviceLink=n1_50
 chat_serviceText=n1_50
@@ -624,12 +625,14 @@ statisticChartHintLine=a1_600
 statisticChartInactivePickerChart=662406276
 statisticChartLineEmpty=n1_50
 statisticChartLine_blue=a1_300
+statisticChartLine_cyan=a2_600
 statisticChartLine_golden=a1_500
 statisticChartLine_green=a1_700
 statisticChartLine_indigo=a2_300
 statisticChartLine_lightblue=a3_300
 statisticChartLine_lightgreen=a3_500
 statisticChartLine_orange=a3_700
+statisticChartLine_purple=a2_400
 statisticChartLine_red=a2_500
 statisticChartRipple=a1_300
 statisticChartSignature=a1_600

diff --git a/app/src/main/assets/monet_x_dark.tgx-theme b/app/src/main/assets/monet_x_dark.tgx-theme
@@ -17,6 +17,25 @@ fillingNegative: a3_600
 fillingPositive: a1_100
 fillingPositiveContent: n1_900
 
+<!--- Reactions --->
+bubbleIn_fillingActive: a2_700
+bubbleIn_fillingActiveContent: n1_50
+
+bubbleIn_fillingPositive: a1_300
+bubbleIn_fillingPositiveContent: n1_900
+
+bubbleIn_fillingPositive_overlay: a1_300
+bubbleIn_fillingPositiveContent_overlay: n1_900
+
+bubbleOut_fillingActive: a1_300
+bubbleOut_fillingActiveContent: n1_1000
+
+bubbleOut_fillingPositive: a1_500
+bubbleOut_fillingPositiveContent: n1_0
+
+bubbleOut_fillingPositive_overlay: a1_300
+bubbleOut_fillingPositiveContent_overlay: n1_900
+
 <!--- Text --->
 text: n1_50
 textSelectionHighlight: n1_600
@@ -38,11 +57,8 @@ background_icon: n1_300
 icon: a1_100
 iconLight: n1_200
 iconActive: a1_100
-iconPositive: a1_100
-iconNegative: a3_100
-
-
-
+iconPositive: monetGreenCall
+iconNegative: monetRedCall
 
 
 <!--- HEADER --->

diff --git a/app/src/main/assets/monet_x_light.tgx-theme b/app/src/main/assets/monet_x_light.tgx-theme
@@ -16,6 +16,25 @@ fillingNegative: a3_600
 fillingPositive: a1_600
 fillingPositiveContent: n1_50
 
+<!--- Reactions --->
+bubbleIn_fillingActive: a2_200
+bubbleIn_fillingActiveContent: n1_1000
+
+bubbleIn_fillingPositive: a1_600
+bubbleIn_fillingPositiveContent: n1_50
+
+bubbleIn_fillingPositive_overlay: a1_600
+bubbleIn_fillingPositiveContent_overlay: n1_50
+
+bubbleOut_fillingActive: a1_500
+bubbleOut_fillingActiveContent: n1_0
+
+bubbleOut_fillingPositive: a1_200
+bubbleOut_fillingPositiveContent: n1_1000
+
+bubbleOut_fillingPositive_overlay: a1_600
+bubbleOut_fillingPositiveContent_overlay: n1_50
+
 <!--- Text --->
 text: a1_1000
 textSelectionHighlight: n1_400
@@ -37,11 +56,8 @@ background_icon: n1_500
 icon: n1_600
 iconLight: n1_600
 iconActive: a1_600
-iconPositive: a1_600
-iconNegative: a3_600
-
-
-
+iconPositive: monetGreenCall
+iconNegative: monetRedCall
 
 
 <!--- HEADER --->

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -47,16 +47,20 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:overScrollMode="always"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:overScrollMode="always">
 
-                <include layout="@layout/light_card"/>
+                <include layout="@layout/light_card" />
 
-                <include layout="@layout/dark_card"/>
+                <include layout="@layout/dark_card" />
 
-                <include layout="@layout/settings_card"/>
+                <include layout="@layout/settings_card" />
 
-                <include layout="@layout/about_card"/>
+                <include layout="@layout/about_card" />
+
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="15dp" />
 
             </LinearLayout>
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.application' version '7.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Mar 20 15:04:08 EET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME