sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

final fixes

Browse source
This commit is contained in:
Phillip Thelen 2023-01-20 14:08:16 +01:00
parent f85ddcc35d
commit 23663d2a94
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Habitica/res/layout/notification_item.xml
View file

@ -11,10 +11,11 @@
<com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/notification_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="20dp"
android:background="@color/transparent"
android:layout_gravity="center_vertical"
android:visibility="gone" />
<TextView

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
View file

@ -168,7 +168,7 @@ class NavigationDrawerFragment : DialogFragment() {
updateSeasonalMenuEntries(gearEvent, pair.second)
}
val event = pair.first.events.firstOrNull { it.eventKey == "birthday10" }
val event = configManager.getBirthdayEvent()
val item = getItemWithIdentifier(SIDEBAR_BIRTHDAY)
if (event != null && item == null) {
adapter.currentEvent = event
@ -182,7 +182,7 @@ class NavigationDrawerFragment : DialogFragment() {
} else if (event == null && item != null) {
item.isVisible = false
adapter.updateItem(item)
(activity as? MainActivity)?.showBirthdayIcon = true
(activity as? MainActivity)?.showBirthdayIcon = false
}
}
}

37
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
View file

@ -53,8 +53,7 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
.fillMaxWidth()
.clickable {
MainNavigationController.navigate(R.id.birthdayActivity)
}
) {
}) {
Column(Modifier.fillMaxWidth()) {
Box(
contentAlignment = Alignment.CenterStart,
@ -63,8 +62,9 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
.fillMaxWidth()
.background(colorResource(R.color.brand_100))
) {
Row(Modifier
.align(Alignment.CenterEnd)) {
Row(
Modifier.align(Alignment.CenterEnd)
) {
Image(
painterResource(R.drawable.birthday_menu_gems),
null,
@ -82,11 +82,8 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
}
Column(
verticalArrangement = Arrangement.spacedBy(
2.dp,
Alignment.CenterVertically
),
modifier = Modifier
.padding(start = 8.dp)
2.dp, Alignment.CenterVertically
), modifier = Modifier.padding(start = 8.dp)
) {
Image(
painterResource(R.drawable.birthday_menu_text), null
@ -127,16 +124,21 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
}
}
@Composable
private fun buildString(
value: Int, endDate: Date, formatString: Int
): String {
return stringResource(
formatString, endDate.getShortRemainingString()
).uppercase()
}
@Composable
fun TimeRemainingText(
endDate: Date,
formatString: Int,
color: Color,
fontSize: TextUnit,
fontWeight: FontWeight
endDate: Date, formatString: Int, color: Color, fontSize: TextUnit, fontWeight: FontWeight
) {
var value by remember { mutableStateOf(0) }
LaunchedEffect(Unit) {
LaunchedEffect(value) {
val diff = endDate.time - Date().time
if (diff.milliseconds > 1.hours) {
delay(1.minutes)
@ -148,10 +150,7 @@ fun TimeRemainingText(
value += 1
}
Text(
stringResource(
formatString,
endDate.getShortRemainingString()
).uppercase(),
buildString(value = value, endDate = endDate, formatString = formatString),
color = color,
fontSize = fontSize,
fontWeight = fontWeight

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.1
CODE=5081
CODE=5101