Merge pull request #5 from Number869/dev

1.1.0

app/build.gradle

@@ -3,7 +3,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
-def version = "1.0.0"
+def version = "1.1.0"
+def versionNumber = 2
 
 android {
     namespace 'com.number869.telemone'
@@ -19,7 +20,7 @@ android {
         }
         signingConfig signingConfigs.debug
         versionName version
-        versionCode 1
+        versionCode versionNumber
     }
 
     buildTypes {
@@ -39,7 +40,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.4'
+        kotlinCompilerExtensionVersion '1.5.0'
     }
     packagingOptions {
         resources {
@@ -75,5 +76,5 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
 
     implementation 'androidx.compose.material:material-icons-extended:1.6.0-alpha01'
-    implementation 'com.github.nanihadesuka:LazyColumnScrollbar:1.6.3'
+    implementation 'com.github.nanihadesuka:LazyColumnScrollbar:1.7.2'
 }

app/src/main/assets/defaultDarkFile.attheme

@@ -91,7 +91,7 @@ chat_attachMediaBanText = surface_container_highest_light
 chat_attachPermissionImage = primary_dark
 chat_attachPermissionMark = on_primary_light
 chat_attachPermissionText = primary_dark
-chat_attachPhotoBackground = on_primary_light
+chat_attachPhotoBackground = secondary_30
 chat_attachPollBackground = primary_50
 chat_attachPollIcon = primary_95
 chat_attachPollText = primary_container_light
@@ -177,10 +177,10 @@ chat_inLocationBackground = surface_elevation_level_3_dark
 chat_inLocationIcon = primary_container_light
 chat_inMediaIcon = surface_container_highest_light
 chat_inMediaIconSelected = surface_container_highest_light
-chat_inMenu = surface_container_highest_light
-chat_inMenuSelected = surface_container_highest_light
-chat_inPollCorrectAnswer = tertiary_50
-chat_inPollWrongAnswer = secondary_50
+chat_inMenu = transparent
+chat_inMenuSelected = transparent
+chat_inPollCorrectAnswer = green_60
+chat_inPollWrongAnswer = error_dark
 chat_inPreviewInstantSelectedText = surface_container_highest_light
 chat_inPreviewInstantText = surface_container_highest_light
 chat_inPreviewLine = neutral_70
@@ -197,7 +197,7 @@ chat_inReplyNameText = neutral_70
 chat_inSentClock = neutral_70
 chat_inSentClockSelected = neutral_70
 chat_inSiteNameText = neutral_70
-chat_inTextSelectionHighlight = outline_light
+chat_inTextSelectionHighlight = neutral_40
 chat_inTimeSelectedText = neutral_70
 chat_inTimeText = neutral_70
 chat_inUpCall = on_primary_light
@@ -206,11 +206,11 @@ chat_inVenueInfoText = surface_container_highest_light
 chat_inViaBotNameText = tertiary_dark
 chat_inViews = neutral_70
 chat_inViewsSelected = neutral_70
-chat_inVoiceSeekbar = neutral_70
+chat_inVoiceSeekbar = neutral_40
 chat_inVoiceSeekbarFill = surface_container_highest_light
 chat_inVoiceSeekbarSelected = surface_container_highest_light
 chat_inlineResultIcon = primary_container_light
-chat_linkSelectBackground = neutral_70
+chat_linkSelectBackground = tertiary_40
 chat_lockIcon = primary_container_light
 chat_mediaInfoText = primary_container_light
 chat_mediaLoaderPhoto = primary_container_dark
@@ -281,7 +281,7 @@ chat_outForwardedNameText = on_primary_container_light
 chat_outGreenCall = on_primary_light
 chat_outInstant = on_primary_container_light
 chat_outInstantSelected = on_primary_container_light
-chat_outLinkSelectBackground = outline_dark
+chat_outLinkSelectBackground = tertiary_40
 chat_outLoader = on_primary_container_light
 chat_outLoaderPhoto = primary_container_light
 chat_outLoaderPhotoIcon = primary_container_light
@@ -294,8 +294,8 @@ chat_outMediaIcon = primary_container_light
 chat_outMediaIconSelected = primary_container_light
 chat_outMenu = transparent
 chat_outMenuSelected = transparent
-chat_outPollCorrectAnswer = green_40
-chat_outPollWrongAnswer = red_40
+chat_outPollCorrectAnswer = green_30
+chat_outPollWrongAnswer = error_container_dark
 chat_outPreviewInstantSelectedText = on_primary_container_light
 chat_outPreviewInstantText = on_primary_container_light
 chat_outPreviewLine = primary_container_dark
@@ -316,7 +316,7 @@ chat_outSentClock = primary_container_dark
 chat_outSentClockSelected = primary_container_dark
 chat_outSiteNameText = on_surface_light
 chat_outTextSelectionCursor = primary_60
-chat_outTextSelectionHighlight = outline_dark
+chat_outTextSelectionHighlight = primary_40
 chat_outTimeSelectedText = primary_container_dark
 chat_outTimeText = primary_container_dark
 chat_outUpCall = primary_container_dark
@@ -325,15 +325,15 @@ chat_outVenueInfoText = on_surface_light
 chat_outViaBotNameText = tertiary_light
 chat_outViews = primary_container_dark
 chat_outViewsSelected = primary_container_dark
-chat_outVoiceSeekbar = neutral_40
+chat_outVoiceSeekbar = primary_60
 chat_outVoiceSeekbarFill = on_primary_container_light
-chat_outVoiceSeekbarSelected = primary_container_dark
+chat_outVoiceSeekbarSelected = primary_60
 chat_previewDurationText = surface_container_highest_light
 chat_previewGameText = surface_container_highest_light
 chat_recordTime = surface_container_highest_light
 chat_recordVoiceCancel = primary_container_light
 chat_recordedVoiceBackground = on_surface_variant_light
-chat_recordedVoiceDot = red_60
+chat_recordedVoiceDot = error_dark
 chat_recordedVoicePlayPause = primary_container_light
 chat_recordedVoiceProgress = surface_container_highest_light
 chat_recordedVoiceProgressInner = primary_container_light
@@ -365,7 +365,7 @@ chat_stickerReplyMessageText = secondary_dark
 chat_stickerReplyNameText = secondary_dark
 chat_stickerViaBotNameText = tertiary_dark
 chat_stickersHintPanel = on_surface_light
-chat_textSelectBackground = outline_variant_light
+chat_textSelectBackground = secondary_50
 chat_topPanelBackground = surface_elevation_level_3_dark
 chat_topPanelClose = surface_container_highest_light
 chat_topPanelLine = neutral_70
@@ -764,7 +764,7 @@ windowBackgroundWhiteGreenText2 = green_80
 windowBackgroundWhiteHintText = surface_container_highest_light
 windowBackgroundWhiteInputField = primary_dark
 windowBackgroundWhiteInputFieldActivated = primary_container_light
-windowBackgroundWhiteLinkSelection = neutral_40
+windowBackgroundWhiteLinkSelection = tertiary_40
 windowBackgroundWhiteLinkText = tertiary_container_light
 windowBackgroundWhiteRedText = error_dark
 windowBackgroundWhiteRedText2 = error_dark

app/src/main/assets/defaultLightFile.attheme

@@ -27,7 +27,7 @@ actionBarTabSelector = primary_light
 actionBarTabUnactiveText = on_surface_variant_light
 actionBarTipBackground = surface_elevation_level_3_light
 actionBarWhiteSelector = on_surface_variant_light
-avatar_actionBarIconBlue = primary_60
+avatar_actionBarIconBlue = on_surface_variant_light
 avatar_actionBarSelectorBlue = primary_60
 avatar_background2Blue = blue_90
 avatar_background2Cyan = cyan_95
@@ -134,7 +134,7 @@ chat_goDownButtonIcon = secondary_20
 chat_goDownButtonShadow = on_surface_light
 chat_inAdminSelectedText = neutral_40
 chat_inAdminText = neutral_40
-chat_inAudioCacheSeekbar = primary_light
+chat_inAudioCacheSeekbar = neutral_40
 chat_inAudioDurationSelectedText = neutral_20
 chat_inAudioDurationText = neutral_40
 chat_inAudioPerfomerSelectedText = neutral_20
@@ -179,11 +179,11 @@ chat_inMediaIcon = on_secondary_container_light
 chat_inMediaIconSelected = on_secondary_container_light
 chat_inMenu = transparent
 chat_inMenuSelected = transparent
-chat_inPollCorrectAnswer = tertiary_light
-chat_inPollWrongAnswer = secondary_50
+chat_inPollCorrectAnswer = green_60
+chat_inPollWrongAnswer = error_light
 chat_inPreviewInstantSelectedText = neutral_20
 chat_inPreviewInstantText = neutral_20
-chat_inPreviewLine = neutral_20
+chat_inPreviewLine = neutral_variant_50
 chat_inPsaNameText = neutral_20
 chat_inReactionButtonBackground = primary_40
 chat_inReactionButtonText = neutral_20
@@ -217,7 +217,7 @@ chat_mediaLoaderPhoto = secondary_container_light
 chat_mediaLoaderPhotoIcon = on_secondary_container_light
 chat_mediaLoaderPhotoIconSelected = on_secondary_container_light
 chat_mediaLoaderPhotoSelected = secondary_container_light
-chat_mediaMenu = transparent
+chat_mediaMenu = secondary_container_light
 chat_mediaProgress = primary_light
 chat_mediaSentCheck = on_secondary_container_light
 chat_mediaSentClock = on_secondary_container_light
@@ -236,25 +236,25 @@ chat_messagePanelShadow = transparent
 chat_messagePanelText = neutral_20
 chat_messagePanelVideoFrame = primary_60
 chat_messagePanelVoiceBackground = secondary_container_light
-chat_messagePanelVoiceDelete = red_50
+chat_messagePanelVoiceDelete = error_light
 chat_messagePanelVoiceDuration = neutral_70
 chat_messagePanelVoicePressed = on_secondary_dark
 chat_messageTextIn = neutral_20
 chat_messageTextOut = on_secondary_dark
 chat_muteIcon = neutral_40
 chat_outAdminSelectedText = on_secondary_dark
 chat_outAdminText = on_secondary_dark
-chat_outAudioCacheSeekbar = secondary_60
+chat_outAudioCacheSeekbar = neutral_variant_80
 chat_outAudioDurationSelectedText = secondary_light
 chat_outAudioDurationText = secondary_light
 chat_outAudioPerfomerSelectedText = secondary_light
 chat_outAudioPerfomerText = secondary_light
-chat_outAudioProgress = primary_dark
-chat_outAudioSeekbar = secondary_50
-chat_outAudioSeekbarFill = primary_70
-chat_outAudioSeekbarSelected = on_secondary_dark
+chat_outAudioProgress = primary_20
+chat_outAudioSeekbar = primary_70
+chat_outAudioSeekbarFill = primary_20
+chat_outAudioSeekbarSelected = primary_20
 chat_outAudioSelectedProgress = primary_dark
-chat_outAudioTitleText = on_secondary_dark
+chat_outAudioTitleText = primary_20
 chat_outBubble = primary_95
 chat_outBubbleGradient = primary_95
 chat_outBubbleGradient2 = primary_95
@@ -277,7 +277,7 @@ chat_outFileNameText = primary_20
 chat_outFileProgress = primary_20
 chat_outFileProgressSelected = primary_20
 chat_outFileSelectedIcon = primary_95
-chat_outForwardedNameText = primary_60
+chat_outForwardedNameText = primary_50
 chat_outGreenCall = on_primary_light
 chat_outInstant = primary_20
 chat_outInstantSelected = primary_20
@@ -295,10 +295,10 @@ chat_outMediaIconSelected = primary_20
 chat_outMenu = transparent
 chat_outMenuSelected = transparent
 chat_outPollCorrectAnswer = green_40
-chat_outPollWrongAnswer = red_40
+chat_outPollWrongAnswer = error_light
 chat_outPreviewInstantSelectedText = primary_20
 chat_outPreviewInstantText = primary_20
-chat_outPreviewLine = primary_20
+chat_outPreviewLine = primary_50
 chat_outPsaNameText = primary_40
 chat_outReactionButtonBackground = primary_40
 chat_outReactionButtonText = primary_20
@@ -308,26 +308,26 @@ chat_outReplyMediaMessageSelectedText = primary_40
 chat_outReplyMediaMessageText = primary_40
 chat_outReplyMessageText = primary_40
 chat_outReplyNameText = primary_40
-chat_outSentCheck = primary_60
-chat_outSentCheckRead = primary_60
-chat_outSentCheckReadSelected = primary_60
-chat_outSentCheckSelected = primary_60
-chat_outSentClock = primary_60
-chat_outSentClockSelected = primary_60
-chat_outSiteNameText = primary_60
+chat_outSentCheck = primary_50
+chat_outSentCheckRead = primary_50
+chat_outSentCheckReadSelected = primary_50
+chat_outSentCheckSelected = primary_50
+chat_outSentClock = primary_50
+chat_outSentClockSelected = primary_50
+chat_outSiteNameText = primary_50
 chat_outTextSelectionCursor = primary_light
 chat_outTextSelectionHighlight = secondary_dark
-chat_outTimeSelectedText = primary_60
-chat_outTimeText = primary_60
+chat_outTimeSelectedText = primary_50
+chat_outTimeText = primary_50
 chat_outUpCall = primary_70
 chat_outVenueInfoSelectedText = primary_20
 chat_outVenueInfoText = primary_20
 chat_outViaBotNameText = tertiary_light
-chat_outViews = primary_60
-chat_outViewsSelected = primary_60
-chat_outVoiceSeekbar = primary_60
+chat_outViews = primary_50
+chat_outViewsSelected = primary_50
+chat_outVoiceSeekbar = primary_70
 chat_outVoiceSeekbarFill = primary_20
-chat_outVoiceSeekbarSelected = primary_60
+chat_outVoiceSeekbarSelected = primary_70
 chat_previewDurationText = neutral_20
 chat_previewGameText = neutral_20
 chat_recordTime = neutral_20
@@ -568,13 +568,13 @@ picker_badge = on_primary_light
 picker_badgeText = on_surface_light
 picker_disabledButton = primary_light
 picker_enabledButton = primary_light
-player_actionBar = surface_elevation_level_3_light
+player_actionBar = surface_light
 player_actionBarItems = on_surface_light
 player_actionBarSelector = on_surface_light
 player_actionBarSubtitle = neutral_40
 player_actionBarTitle = on_surface_light
 player_actionBarTop = on_surface_light
-player_background = surface_light
+player_background = surface_container_low_light
 player_button = on_surface_light
 player_buttonActive = on_surface_light
 player_progress = primary_light
@@ -608,7 +608,7 @@ profile_tabSelectedLine = primary_container_dark
 profile_tabSelectedText = primary_container_dark
 profile_tabSelector = primary_light
 profile_tabText = outline_light
-profile_title = on_surface_variant_light
+profile_title = on_surface_light
 profile_verifiedBackground = tertiary_50
 profile_verifiedCheck = on_primary_light
 progressCircle = primary_light