Release 9.6.0

- Add new and remove old values for Telegram - Some other changes
mi-g-alex · Apr 22, 2023 · b6b4041 · b6b4041
1 parent 1db0d2a
commit b6b4041
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 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 23040101
-        versionName '9.5.7'
+        versionCode 23042301
+        versionName '9.6.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'
     }
 
@@ -50,8 +50,8 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
 

diff --git a/app/src/main/assets/monet_dark.attheme b/app/src/main/assets/monet_dark.attheme
@@ -225,7 +225,6 @@ chat_inSiteNameText=n1_50
 chat_inTextSelectionHighlight=1237106360
 chat_inTimeSelectedText=n1_50
 chat_inTimeText=n1_50
-chat_inUpCall=monetRedCall
 chat_inVenueInfoSelectedText=a1_100
 chat_inVenueInfoText=n1_50
 chat_inViaBotNameText=a1_100
@@ -355,15 +354,14 @@ chat_replyPanelClose=a1_100
 chat_replyPanelIcons=a1_100
 chat_replyPanelLine=n1_900
 chat_replyPanelName=a1_100
-chat_reportSpam=a3_200
 chat_searchPanelIcons=a1_100
 chat_searchPanelText=n1_50
 chat_secretChatStatusText=n1_50
 chat_secretTimeText=a1_0
 chat_selectedBackground=a2_700
 chat_sentError=n1_800
 chat_sentErrorIcon=monetRedDark
-chat_serviceBackground=n1_700
+chat_serviceBackground=n2_800
 chat_serviceBackgroundSelected=n1_900
 chat_serviceBackgroundSelector=n1_800
 chat_serviceIcon=a1_100
@@ -436,7 +434,6 @@ dialogLinkSelection=a1_200
 dialogRadioBackground=a1_300
 dialogRadioBackgroundChecked=a1_100
 dialogReactionMentionBackground=a3_300
-dialogRedIcon=monetRedDark
 dialogRoundCheckBox=a1_200
 dialogRoundCheckBoxCheck=n1_900
 dialogScrollGlow=n1_800
@@ -456,7 +453,6 @@ dialogTextGray3=a1_100
 dialogTextGray4=a1_100
 dialogTextHint=n1_300
 dialogTextLink=n1_50
-dialogTextRed=monetRedDark
 dialogTopBackground=n1_900
 dialog_inlineProgress=a1_100
 dialog_inlineProgressBackground=n1_900
@@ -476,6 +472,8 @@ featuredStickers_unread=a1_600
 files_folderIcon=a1_50
 files_folderIconBackground=a1_500
 files_iconText=a1_100
+fill_RedNormal=monetRedCall
+fill_RedDark=monetRedCall
 graySection=n1_900
 groupcreate_cursor=a1_100
 groupcreate_hintText=n1_50
@@ -501,7 +499,7 @@ listSelectorSDK21=n2_800
 location_actionActiveIcon=a1_300
 location_actionBackground=n1_900
 location_actionIcon=a1_300
-location_actionPressedBackground=n1_900
+locatioDividern_actionPressedBackground=n1_900
 location_liveLocationProgress=a1_100
 location_placeLocationBackground=n1_900
 location_sendLiveLocationBackground=a1_300
@@ -512,6 +510,7 @@ location_sendLocationIcon=a1_0
 location_sendLocationText=a2_200
 login_progressInner=a1_700
 login_progressOuter=a1_300
+paintDivider=n1_900
 passport_authorizeBackground=n1_900
 passport_authorizeBackgroundSelected=n1_900
 passport_authorizeText=n1_50
@@ -601,6 +600,8 @@ switchTrackBlueSelectorChecked=a1_100
 switchTrackBlueThumb=a1_100
 switchTrackBlueThumbChecked=n1_900
 switchTrackChecked=a1_300
+text_RedRegular=monetRedDark
+text_RedBold=monetRedDark
 topics_unreadCounter=a1_100
 topics_unreadCounterMuted=a2_600
 undo_background=n2_800
@@ -700,10 +701,5 @@ windowBackgroundWhiteInputField=a1_200
 windowBackgroundWhiteInputFieldActivated=a1_100
 windowBackgroundWhiteLinkSelection=n1_600
 windowBackgroundWhiteLinkText=a3_100
-windowBackgroundWhiteRedText=monetRedDark
-windowBackgroundWhiteRedText2=monetRedDark
-windowBackgroundWhiteRedText3=monetRedDark
-windowBackgroundWhiteRedText4=monetRedDark
-windowBackgroundWhiteRedText5=monetRedDark
 windowBackgroundWhiteValueText=a1_100
 end
diff --git a/app/src/main/assets/monet_light.attheme b/app/src/main/assets/monet_light.attheme
@@ -225,7 +225,6 @@ chat_inSiteNameText=a1_1000
 chat_inTextSelectionHighlight=1230789978
 chat_inTimeSelectedText=a1_1000
 chat_inTimeText=a1_1000
-chat_inUpCall=monetRedCall
 chat_inVenueInfoSelectedText=a1_1000
 chat_inVenueInfoText=n1_50
 chat_inViaBotNameText=a1_600
@@ -355,7 +354,6 @@ chat_replyPanelClose=a1_600
 chat_replyPanelIcons=a1_600
 chat_replyPanelLine=n1_50
 chat_replyPanelName=a1_1000
-chat_reportSpam=a3_600
 chat_searchPanelIcons=a1_600
 chat_searchPanelText=a1_1000
 chat_secretChatStatusText=a1_600
@@ -436,7 +434,6 @@ dialogLinkSelection=a1_600
 dialogRadioBackground=a1_600
 dialogRadioBackgroundChecked=a1_600
 dialogReactionMentionBackground=a3_700
-dialogRedIcon=monetRedLight
 dialogRoundCheckBox=a1_600
 dialogRoundCheckBoxCheck=n1_50
 dialogScrollGlow=n1_100
@@ -456,7 +453,6 @@ dialogTextGray3=a1_600
 dialogTextGray4=a1_600
 dialogTextHint=n1_300
 dialogTextLink=a1_600
-dialogTextRed=monetRedLight
 dialogTopBackground=n1_500
 dialog_inlineProgress=a1_600
 dialog_inlineProgressBackground=n1_50
@@ -476,6 +472,8 @@ featuredStickers_unread=a1_600
 files_folderIcon=a1_0
 files_folderIconBackground=a1_600
 files_iconText=a1_1000
+fill_RedNormal=monetRedCall
+fill_RedDark=monetRedCall
 graySection=n1_50
 groupcreate_cursor=a1_600
 groupcreate_hintText=a1_700
@@ -512,6 +510,7 @@ location_sendLocationIcon=a1_0
 location_sendLocationText=a1_600
 login_progressInner=a1_100
 login_progressOuter=a1_700
+paintDivider=n1_50
 passport_authorizeBackground=n1_50
 passport_authorizeBackgroundSelected=n1_50
 passport_authorizeText=n1_900
@@ -601,6 +600,8 @@ switchTrackBlueSelectorChecked=a1_600
 switchTrackBlueThumb=n1_50
 switchTrackBlueThumbChecked=n1_50
 switchTrackChecked=a1_700
+text_RedRegular=monetRedLight
+text_RedBold=monetRedLight
 topics_unreadCounter=a1_600
 topics_unreadCounterMuted=n1_50
 undo_background=a1_600
@@ -700,10 +701,5 @@ windowBackgroundWhiteInputField=a1_300
 windowBackgroundWhiteInputFieldActivated=a1_600
 windowBackgroundWhiteLinkSelection=n1_200
 windowBackgroundWhiteLinkText=a3_500
-windowBackgroundWhiteRedText=monetRedLight
-windowBackgroundWhiteRedText2=monetRedLight
-windowBackgroundWhiteRedText3=monetRedLight
-windowBackgroundWhiteRedText4=monetRedLight
-windowBackgroundWhiteRedText5=monetRedLight
 windowBackgroundWhiteValueText=a1_600
 end
diff --git a/app/src/main/res/layout/about_card.xml b/app/src/main/res/layout/about_card.xml
@@ -29,6 +29,8 @@
                     style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:clickable="false"
+                    android:contentDescription="@string/about_card_title"
                     android:drawableLeft="@drawable/round_palette_24"
                     tools:ignore="RtlHardcoded" />
 
@@ -71,8 +73,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
                     android:layout_marginEnd="5dp"
+                    android:layout_marginBottom="5dp"
                     android:text="@string/about_card_telegram" />
 
                 <Button

diff --git a/app/src/main/res/layout/dark_card.xml b/app/src/main/res/layout/dark_card.xml
@@ -29,6 +29,8 @@
                     style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:clickable="false"
+                    android:contentDescription="@string/dark_theme_description"
                     android:drawableLeft="@drawable/round_dark_mode_24"
                     tools:ignore="RtlHardcoded" />
 

diff --git a/app/src/main/res/layout/light_card.xml b/app/src/main/res/layout/light_card.xml
@@ -29,6 +29,8 @@
                     style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:clickable="false"
+                    android:contentDescription="@string/light_theme_description"
                     android:drawableLeft="@drawable/round_light_mode_24"
                     tools:ignore="RtlHardcoded" />
 

diff --git a/app/src/main/res/layout/settings_card.xml b/app/src/main/res/layout/settings_card.xml
@@ -29,6 +29,8 @@
                     style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:clickable="false"
+                    android:contentDescription="@string/settings_card_title"
                     android:drawableLeft="@drawable/ic_baseline_settings_24"
                     tools:ignore="RtlHardcoded" />
 
@@ -45,8 +47,8 @@
             </LinearLayout>
 
             <com.google.android.material.materialswitch.MaterialSwitch
-                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:id="@+id/switchAmoledPhone"
+                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
@@ -56,8 +58,8 @@
                 android:textSize="16sp" />
 
             <com.google.android.material.materialswitch.MaterialSwitch
-                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:id="@+id/switchGradient"
+                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
@@ -67,8 +69,8 @@
                 android:textSize="16sp" />
 
             <com.google.android.material.materialswitch.MaterialSwitch
-                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:id="@+id/switchGradientAvatars"
+                style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"