admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复小细节，home图标和消息通知

Browse Source
This commit is contained in:
Kevinlinpr
2024-10-26 02:51:23 +08:00
parent d3518b1a82
commit ed66f15be7
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt
View File

@@ -128,7 +128,7 @@ fun NotificationsScreen() {
} }
} }
HorizontalDivider(color = AppColors.divider, modifier = Modifier.padding(16.dp)) HorizontalDivider(color = AppColors.divider, modifier = Modifier.padding(16.dp))
NotificationCounterItem(MessageListViewModel.unReadConversationCount.toInt()) // NotificationCounterItem(MessageListViewModel.unReadConversationCount.toInt())
Box( Box(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
@@ -221,26 +221,20 @@ fun NotificationCounterItem(count: Int) {
modifier = Modifier.padding(vertical = 16.dp, horizontal = 32.dp), modifier = Modifier.padding(vertical = 16.dp, horizontal = 32.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Box( Image(
painter = painterResource(id = R.drawable.rider_pro_notification),
) { contentDescription = "",
Image( modifier = Modifier
painter = painterResource(id = R.drawable.rider_pro_notification), .size(24.dp).noRippleClickable {
contentDescription = "", clickCount++
modifier = Modifier if (clickCount > 5) {
.size(24.dp).noRippleClickable { clickCount = 0
clickCount++ AppStore.saveDarkMode(!AppState.darkMode)
if (clickCount > 5) { Toast.makeText(context, "Dark mode: ${AppState.darkMode},please restart app", Toast.LENGTH_SHORT).show()
clickCount = 0 }
AppStore.saveDarkMode(!AppState.darkMode) },
Toast.makeText(context, "Dark mode: ${AppState.darkMode},please restart app", Toast.LENGTH_SHORT).show() colorFilter = ColorFilter.tint(AppColors.text)
} )
},
colorFilter = ColorFilter.tint(AppColors.text)
)
}
Spacer(modifier = Modifier.width(24.dp)) Spacer(modifier = Modifier.width(24.dp))
Text(stringResource(R.string.notifications_upper), fontSize = 18.sp, color = AppColors.text) Text(stringResource(R.string.notifications_upper), fontSize = 18.sp, color = AppColors.text)
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))

10
app/src/main/res/drawable/rider_pro_nav_home_hl.xml
View File

@@ -4,9 +4,15 @@
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:pathData="M12.614,1.211L21.614,8.211C21.858,8.4 22,8.691 22,9L22,20C22,21.657 20.657,23 19,23L15,23L15,12L9,12L9,23L5,23C3.343,23 2,21.657 2,20L2,9C2,8.691 2.142,8.4 2.386,8.211L11.386,1.211C11.747,0.93 12.253,0.93 12.614,1.211Z" android:pathData="M10.819,2.722C11.487,2.11 12.513,2.11 13.179,2.719L20.693,9.548C21.041,9.877 21.242,10.333 21.25,10.828L21.25,19.5C21.25,20.466 20.466,21.25 19.5,21.25L15,21.25C14.034,21.25 13.25,20.466 13.25,19.5L13.25,15.25L10.75,15.25L10.75,19.5C10.75,20.418 10.043,21.171 9.144,21.244L9,21.25L4.5,21.25C3.534,21.25 2.75,20.466 2.75,19.5L2.75,10.812C2.758,10.333 2.959,9.877 3.321,9.535L10.819,2.722Z"
android:strokeWidth="1" android:strokeWidth="1"
android:fillColor="#FFFFFF" android:fillColor="#FFFFFF"
android:fillType="evenOdd" android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M12,4.35L4.75,10.938L4.75,19.25L8.75,19.25L8.75,15C8.75,14.082 9.457,13.329 10.356,13.256L10.5,13.25L13.5,13.25C14.466,13.25 15.25,14.034 15.25,15L15.25,19.25L19.25,19.25L19.25,10.94L12,4.35Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/> android:strokeColor="#00000000"/>
</vector> </vector>