Merge pull request #9 from Number869/dev

1.2.1

app/build.gradle

@@ -3,8 +3,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
-def version = "1.2.0"
-def versionNumber = 3
+def version = "1.2.1"
+def versionNumber = 4
 
 android {
     namespace 'com.number869.telemone'
@@ -51,31 +51,31 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0-rc01'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-    implementation 'androidx.activity:activity-compose:1.8.0-alpha06'
-    implementation platform('androidx.compose:compose-bom:2023.03.00')
-    implementation 'androidx.compose.ui:ui:1.6.0-alpha04'
-    implementation 'androidx.compose.ui:ui-graphics:1.6.0-alpha04'
-    implementation 'androidx.compose.ui:ui-tooling-preview:1.6.0-alpha04'
-    implementation 'androidx.compose.material3:material3:1.2.0-alpha06'
-    implementation 'com.google.android.material:material:1.10.0-alpha06'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
+    implementation 'androidx.activity:activity-compose:1.8.0-beta01'
+    implementation platform('androidx.compose:compose-bom:2023.09.00')
+    implementation 'androidx.compose.ui:ui:1.6.0-alpha05'
+    implementation 'androidx.compose.ui:ui-graphics:1.6.0-alpha05'
+    implementation 'androidx.compose.ui:ui-tooling-preview:1.6.0-alpha05'
+    implementation 'androidx.compose.material3:material3:1.2.0-alpha07'
+    implementation 'com.google.android.material:material:1.11.0-alpha02'
     implementation 'com.github.SmartToolFactory:Compose-Extended-Colors:1.0.0-alpha07'
     implementation 'androidx.test:core-ktx:1.5.0'
-    implementation 'androidx.compose.animation:animation-tooling-internal:1.5.0'
+    implementation 'androidx.compose.animation:animation-tooling-internal:1.6.0-alpha05'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00')
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.6.0-alpha04'
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.0-alpha04'
-    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.6.0-alpha04'
+    androidTestImplementation platform('androidx.compose:compose-bom:2023.09.00')
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.6.0-alpha05'
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.0-alpha05'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest:1.6.0-alpha05'
 
-    implementation 'com.google.accompanist:accompanist-navigation-animation:0.31.2-alpha'
-    implementation 'com.google.accompanist:accompanist-systemuicontroller:0.30.0'
+    implementation 'com.google.accompanist:accompanist-navigation-animation:0.32.0'
+    implementation 'com.google.accompanist:accompanist-systemuicontroller:0.32.0'
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
-    implementation 'androidx.compose.material:material-icons-extended:1.6.0-alpha04'
+    implementation 'androidx.compose.material:material-icons-extended:1.6.0-alpha05'
     implementation 'com.github.nanihadesuka:LazyColumnScrollbar:1.7.2'
 }

app/src/main/assets/defaultDarkFile.attheme

@@ -68,43 +68,43 @@ chat_addContact=primary_container_light
 chat_adminSelectedText=surface_container_highest_light
 chat_adminText=neutral_70
 chat_attachActiveTab=primary_container_light
-chat_attachAudioBackground=primary_50
-chat_attachAudioIcon=primary_95
-chat_attachAudioText=primary_container_light
-chat_attachCheckBoxBackground=neutral_20
-chat_attachCheckBoxCheck=primary_container_light
-chat_attachContactBackground=primary_50
-chat_attachContactIcon=primary_95
-chat_attachContactText=primary_container_light
+chat_attachAudioBackground=outline_variant_dark
+chat_attachAudioIcon=on_surface_dark
+chat_attachAudioText=on_surface_dark
+chat_attachCheckBoxBackground=primary_dark
+chat_attachCheckBoxCheck=surface_container_high_dark
+chat_attachContactBackground=outline_variant_dark
+chat_attachContactIcon=on_surface_dark
+chat_attachContactText=on_surface_dark
 chat_attachEmptyImage=primary_container_light
-chat_attachFileBackground=primary_50
-chat_attachFileIcon=primary_95
-chat_attachFileText=primary_container_light
-chat_attachGalleryBackground=primary_50
-chat_attachGalleryIcon=primary_95
-chat_attachGalleryText=primary_container_light
-chat_attachLocationBackground=primary_50
-chat_attachLocationIcon=primary_95
-chat_attachLocationText=primary_container_light
+chat_attachFileBackground=outline_variant_dark
+chat_attachFileIcon=on_surface_dark
+chat_attachFileText=on_surface_dark
+chat_attachGalleryBackground=outline_variant_dark
+chat_attachGalleryIcon=on_surface_dark
+chat_attachGalleryText=on_surface_dark
+chat_attachLocationBackground=outline_variant_dark
+chat_attachLocationIcon=on_surface_dark
+chat_attachLocationText=on_surface_dark
 chat_attachMediaBanBackground=primary_container_light
 chat_attachMediaBanText=surface_container_highest_light
 chat_attachPermissionImage=primary_dark
 chat_attachPermissionMark=white
 chat_attachPermissionText=primary_dark
-chat_attachPhotoBackground=secondary_container_dark
-chat_attachPollBackground=primary_50
-chat_attachPollIcon=primary_95
-chat_attachPollText=primary_container_light
+chat_attachPhotoBackground=surface_container_high_dark
+chat_attachPollBackground=outline_variant_dark
+chat_attachPollIcon=on_surface_dark
+chat_attachPollText=on_surface_dark
 chat_attachUnactiveTab=neutral_40
 chat_botButtonText=secondary_container_light
 chat_botKeyboardButtonBackground=outline_light
 chat_botKeyboardButtonBackgroundPressed=neutral_20
 chat_botKeyboardButtonText=surface_container_highest_light
 chat_botProgress=primary_95
 chat_botSwitchToInlineText=surface_container_highest_light
-chat_emojiBottomPanelIcon=secondary_60
+chat_emojiBottomPanelIcon=primary_60
 chat_emojiPanelBackground=surface_elevation_level_3_dark
-chat_emojiPanelBackspace=secondary_70
+chat_emojiPanelBackspace=primary_70
 chat_emojiPanelBadgeBackground=surface_elevation_level_3_dark
 chat_emojiPanelBadgeText=surface_container_highest_light
 chat_emojiPanelEmptyText=surface_container_highest_light
@@ -117,7 +117,7 @@ chat_emojiPanelNewTrending=primary_container_light
 chat_emojiPanelShadowLine=transparent
 chat_emojiPanelStickerPackSelector=neutral_20
 chat_emojiPanelStickerPackSelectorLine=primary_container_light
-chat_emojiPanelStickerSetName=secondary_container_light
+chat_emojiPanelStickerSetName=primary_80
 chat_emojiPanelStickerSetNameHighlight=tertiary_dark
 chat_emojiPanelStickerSetNameIcon=primary_container_light
 chat_emojiPanelTrendingDescription=on_surface_light
@@ -146,7 +146,7 @@ chat_inAudioSeekbarSelected=surface_container_highest_light
 chat_inAudioSelectedProgress=surface_container_highest_light
 chat_inAudioTitleText=surface_container_highest_light
 chat_inBubble=neutral_20
-chat_inBubbleSelected=on_surface_variant_light
+chat_inBubbleSelected=neutral_20
 chat_inBubbleShadow=transparent
 chat_inContactBackground=on_surface_light
 chat_inContactIcon=primary_container_light
@@ -260,8 +260,8 @@ chat_outBubbleGradient=primary_dark
 chat_outBubbleGradient2=primary_dark
 chat_outBubbleGradient3=primary_dark
 chat_outBubbleGradientAnimated=white
-chat_outBubbleGradientSelectedOverlay=primary_container_light
-chat_outBubbleSelected=primary_container_light
+chat_outBubbleGradientSelectedOverlay=primary_dark
+chat_outBubbleSelected=primary_dark
 chat_outBubbleShadow=transparent
 chat_outContactBackground=on_primary_container_light
 chat_outContactIcon=on_primary_container_light
@@ -349,7 +349,7 @@ chat_secretChatStatusText=surface_container_highest_light
 chat_secretTimeText=white
 chat_secretTimerBackground=primary_container_light
 chat_secretTimerText=on_surface_light
-chat_selectedBackground=secondary_container_dark
+chat_selectedBackground=secondary_20
 chat_sentError=error_dark
 chat_sentErrorIcon=error_dark
 chat_serviceBackground=secondary_container_dark
@@ -450,7 +450,7 @@ contextProgressOuter1=on_surface_light
 contextProgressOuter2=primary_dark
 contextProgressOuter3=primary_dark
 contextProgressOuter4=on_surface_light
-dialogBackground=surface_container_high_dark
+dialogBackground=surface_dark
 dialogBackgroundGray=surface_container_high_dark
 dialogBadgeBackground=secondary_container_dark
 dialogBadgeText=secondary_container_light
@@ -516,9 +516,9 @@ featuredStickers_buttonProgress=primary_dark
 featuredStickers_buttonText=on_surface_light
 featuredStickers_removeButtonText=tertiary_50
 featuredStickers_unread=primary_light
-files_folderIcon=primary_95
-files_folderIconBackground=primary_50
-files_iconText=primary_container_light
+files_folderIcon=on_surface_dark
+files_folderIconBackground=outline_variant_dark
+files_iconText=white
 graySection=on_surface_light
 graySectionText=outline_variant_light
 groupcreate_cursor=primary_container_light
@@ -542,7 +542,7 @@ key_player_progressCachedBackground=primary_light
 key_sheet_other=neutral_40
 key_sheet_scrollUp=neutral_40
 kvoipgroup_overlayAlertMutedByAdmin2=tertiary_container_light
-listSelectorSDK21=neutral_20
+listSelectorSDK21=secondary_20
 location_actionActiveIcon=primary_70
 location_actionBackground=on_surface_light
 location_actionIcon=primary_70
@@ -636,19 +636,19 @@ statisticChartInactivePickerChart=transparent
 statisticChartLineEmpty=neutral_20
 statisticChartLine_blue=blue_60
 statisticChartLine_cyan=cyan_60
-statisticChartLine_golden=orange_40
+statisticChartLine_golden=orange_60
 statisticChartLine_green=green_60
 statisticChartLine_indigo=violet_60
-statisticChartLine_lightblue=tertiary_60
-statisticChartLine_lightgreen=green_40
-statisticChartLine_orange=orange_60
+statisticChartLine_lightblue=primary_60
+statisticChartLine_lightgreen=tertiary_60
+statisticChartLine_orange=neutral_variant_60
 statisticChartLine_purple=pink_60
 statisticChartLine_red=red_60
 statisticChartPopupBackground=surface_container_high_dark
 statisticChartRipple=on_primary_dark
 statisticChartSignature=primary_container_light
 statisticChartSignatureAlpha=primary_container_light
-stickers_menu=primary_container_light
+stickers_menu=on_surface_dark
 stickers_menuSelector=on_surface_variant_light
 switch2Track=outline_light
 switch2TrackChecked=primary_container_light
@@ -749,8 +749,8 @@ windowBackgroundWhiteBlueText4=primary_container_light
 windowBackgroundWhiteBlueText5=primary_container_light
 windowBackgroundWhiteBlueText6=primary_container_light
 windowBackgroundWhiteBlueText7=primary_container_light
-windowBackgroundWhiteGrayIcon=primary_container_light
-windowBackgroundWhiteGrayLine=primary_container_light
+windowBackgroundWhiteGrayIcon=on_surface_variant_dark
+windowBackgroundWhiteGrayLine=on_surface_variant_dark
 windowBackgroundWhiteGrayText=outline_variant_light
 windowBackgroundWhiteGrayText2=outline_variant_light
 windowBackgroundWhiteGrayText3=outline_variant_light