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

ktlint formatting

Browse source
This commit is contained in:
Phillip Thelen 2023-02-13 17:34:54 +01:00
parent 18796e1f8a
commit 71e4c4805b
16 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
View file

@ -13,10 +13,10 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.databinding.ActivityAdventureGuideBinding
import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.AmplitudeManager
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.loadImage
import javax.inject.Inject

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
View file

@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.databinding.ActivityDeathBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.extensions.observeOnce
import com.habitrpg.android.habitica.helpers.AdHandler
import com.habitrpg.android.habitica.helpers.AdType
@ -19,6 +18,7 @@ import com.habitrpg.android.habitica.helpers.ExceptionHandler
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.ads.AdButton
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.helpers.Animations
import com.plattysoft.leonids.ParticleSystem
import kotlinx.coroutines.launch

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
View file

@ -19,11 +19,11 @@ import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.ExceptionHandler
import com.habitrpg.android.habitica.helpers.launchCatching
import com.habitrpg.android.habitica.models.inventory.QuestContent
import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.models.Notification
import com.habitrpg.common.habitica.models.notifications.GroupTaskApprovedData

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
View file

@ -8,7 +8,6 @@ import android.widget.Button
import android.widget.TextView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.shops.Shop
@ -18,6 +17,7 @@ import com.habitrpg.android.habitica.models.user.OwnedItem
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
import com.habitrpg.common.habitica.extensions.fromHtml
class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
View file

@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.databinding.FragmentQuestDetailBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.ExceptionHandler
import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
import com.habitrpg.android.habitica.helpers.launchCatching
@ -28,6 +27,7 @@ import com.habitrpg.android.habitica.modules.AppModule
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.helpers.MarkdownParser
import kotlinx.coroutines.flow.distinctUntilChanged

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
View file

@ -6,8 +6,8 @@ import android.view.View
import android.widget.TextView
import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding
import com.habitrpg.android.habitica.extensions.addCloseButton
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.views.PixelArtView

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
View file

@ -7,9 +7,9 @@ import android.view.View
import android.widget.TextView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.models.Notification

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
View file

@ -11,10 +11,10 @@ import android.widget.LinearLayout
import android.widget.TextView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.DialogCompletedQuestContentBinding
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.models.inventory.QuestContent
import com.habitrpg.android.habitica.models.inventory.QuestDropItem
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.views.PixelArtView

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
View file

@ -5,10 +5,10 @@ import android.util.AttributeSet
import android.view.Gravity
import android.widget.LinearLayout
import android.widget.TextView
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.models.inventory.QuestContent
import com.habitrpg.android.habitica.models.shops.ShopItem
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.common.habitica.extensions.fromHtml
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.views.PixelArtView

2
shared/build.gradle.kts
View file

@ -49,4 +49,4 @@ android {
}
namespace = "com.habitrpg.shared.habitica"
}
}

2
shared/src/commonTest/kotlin/com/habitrpg/shared/habitica/models/tasks/AttributeTest.kt
View file

@ -11,4 +11,4 @@ class AttributeTest {
assertEquals(Attribute.PERCEPTION, Attribute.from("per"))
assertEquals(Attribute.INTELLIGENCE, Attribute.from("int"))
}
}
}

10
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
View file

@ -116,11 +116,11 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
viewModel.user
.filterNotNull()
.collect { user ->
adapter.title = user.profile?.name ?: ""
val index = adapter.data.indexOfFirst { it.identifier == "stats" }
adapter.data[index].detailText = getString(R.string.user_level, user.stats?.lvl ?: 0)
adapter.notifyItemChanged(index + 1)
}
adapter.title = user.profile?.name ?: ""
val index = adapter.data.indexOfFirst { it.identifier == "stats" }
adapter.data[index].detailText = getString(R.string.user_level, user.stats?.lvl ?: 0)
adapter.notifyItemChanged(index + 1)
}
}
viewModel.taskCounts.observe(this) {

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
View file

@ -12,9 +12,9 @@ import androidx.preference.PreferenceManager
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ActivityTaskResultBinding
import com.habitrpg.android.habitica.databinding.TaskRewardDropBinding
import com.habitrpg.common.habitica.extensions.localizedCapitalize
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.extensions.localizedCapitalize
import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
import com.habitrpg.wearos.habitica.ui.viewmodels.TaskResultViewModel
import com.habitrpg.wearos.habitica.ui.views.TaskRewardChip

2
wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt
View file

@ -37,4 +37,4 @@ object ProjectConfig : AbstractProjectConfig() {
private fun resetLiveData() {
ArchTaskExecutor.getInstance().setDelegate(null)
}
}
}

50
wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt
View file

@ -8,29 +8,29 @@ import io.kotest.core.spec.style.WordSpec
import io.kotest.matchers.shouldBe
class TaskLocalRepositoryTest : WordSpec({
val repository = TaskLocalRepository()
val list = TaskList()
list.tasks["1"] = Task().apply {
id = "1"
type = TaskType.HABIT
}
list.tasks["2"] = Task().apply {
id = "2"
type = TaskType.DAILY
}
list.tasks["3"] = Task().apply {
id = "3"
type = TaskType.DAILY
}
list.tasks["4"] = Task().apply {
id = "4"
type = TaskType.REWARD
}
"getTask" should {
"return right task" {
repository.getTask("3").test {
awaitItem()?.id shouldBe "3"
}
}
}
val repository = TaskLocalRepository()
val list = TaskList()
list.tasks["1"] = Task().apply {
id = "1"
type = TaskType.HABIT
}
list.tasks["2"] = Task().apply {
id = "2"
type = TaskType.DAILY
}
list.tasks["3"] = Task().apply {
id = "3"
type = TaskType.DAILY
}
list.tasks["4"] = Task().apply {
id = "4"
type = TaskType.REWARD
}
"getTask" should {
"return right task" {
repository.getTask("3").test {
awaitItem()?.id shouldBe "3"
}
}
}
})

42
wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepositoryTest.kt
View file

@ -6,27 +6,27 @@ import io.kotest.core.spec.style.WordSpec
import io.kotest.matchers.shouldBe
class UserLocalRepositoryTest : WordSpec({
coroutineTestScope = true
val repository = UserLocalRepository()
coroutineTestScope = true
val repository = UserLocalRepository()
"saveUser" should {
"update user in flow" {
val existing = User()
repository.saveUser(existing)
repository.getUser().test {
awaitItem() shouldBe existing
}
}
}
"saveUser" should {
"update user in flow" {
val existing = User()
repository.saveUser(existing)
repository.getUser().test {
awaitItem() shouldBe existing
}
}
}
"clearData" should {
"clear user from flow" {
val existing = User()
repository.saveUser(existing)
repository.clearData()
repository.getUser().test {
awaitItem() shouldBe null
}
}
}
"clearData" should {
"clear user from flow" {
val existing = User()
repository.saveUser(existing)
repository.clearData()
repository.getUser().test {
awaitItem() shouldBe null
}
}
}
})