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

fix showing set item

Browse source
This commit is contained in:
Phillip Thelen 2024-11-04 17:56:57 +01:00
parent 19b5166dd2
commit 0759a071cb
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/build.gradle
View file

@ -187,10 +187,11 @@ android {
// Disable fabric build ID generation for debug builds // Disable fabric build ID generation for debug builds
ext.enableCrashlytics = false ext.enableCrashlytics = false
ext.alwaysUpdateBuildId = false ext.alwaysUpdateBuildId = false
testCoverageEnabled = false
//resValue "string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider" //resValue "string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider"
resValue "string", "content_provider", "com.habitrpg.android.habitica.fileprovider" resValue "string", "content_provider", "com.habitrpg.android.habitica.fileprovider"
resValue "string", "app_name", "Habitica Debug" resValue "string", "app_name", "Habitica Debug"
enableUnitTestCoverage false
enableAndroidTestCoverage false
} }
debugIAP { debugIAP {
signingConfig signingConfigs.release signingConfig signingConfigs.release

6
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
View file

@ -469,9 +469,9 @@ class RealmInventoryLocalRepository(realm: Realm) :
.toFlow() .toFlow()
.filter { it.isLoaded } .filter { it.isLoaded }
.map { .map {
val format = SimpleDateFormat("yyyyMM", Locale.US) val dateString = SimpleDateFormat("yyyyMM", Locale.US).format(Date())
it.firstOrNull() { set -> it.firstOrNull { set ->
set.key.contains(format.format(Date())) set.key.contains(dateString)
} }
} }
} }

27
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriberBenefitView.kt
View file

@ -16,7 +16,7 @@ import dagger.hilt.InstallIn
import dagger.hilt.android.EntryPointAccessors import dagger.hilt.android.EntryPointAccessors
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.MainScope import kotlinx.coroutines.MainScope
import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.collectLatest
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
@ -54,18 +54,19 @@ class SubscriberBenefitView
inventoryRepository = hiltEntryPoint.inventoryRepository() inventoryRepository = hiltEntryPoint.inventoryRepository()
MainScope().launchCatching { MainScope().launchCatching {
val pair = inventoryRepository.getLatestMysteryItemAndSet().firstOrNull() inventoryRepository.getLatestMysteryItemAndSet().collectLatest { pair ->
val item = pair?.first val item = pair.first
val set = pair?.second val set = pair.second
binding.subBenefitsMysteryItemIcon.loadImage( binding.subBenefitsMysteryItemIcon.loadImage(
"shop_set_mystery_${ "shop_set_mystery_${
item?.key?.split( item.key?.split(
"_", "_",
)?.last() )?.last()
}", }",
) )
binding.subBenefitsMysteryItemText.text = binding.subBenefitsMysteryItemText.text =
context.getString(R.string.subscribe_listitem3_description_alt, monthFormatter.format(Date()), set?.text ?: context.getString(R.string.set)) context.getString(R.string.subscribe_listitem3_description_alt, monthFormatter.format(Date()), set?.text ?: context.getString(R.string.set))
}
} }
binding.subBenefitsMysteryItemText.text = binding.subBenefitsMysteryItemText.text =
context.getString(R.string.subscribe_listitem3_description_alt, monthFormatter.format(Date()), context.getString(R.string.set)) context.getString(R.string.subscribe_listitem3_description_alt, monthFormatter.format(Date()), context.getString(R.string.set))

2
build.gradle
View file

@ -44,7 +44,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.5.2' classpath 'com.android.tools.build:gradle:8.7.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:4.4.2' classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Jun 10 15:25:21 CEST 2024 #Mon Jun 10 15:25:21 CEST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists