From 71e4c4805b654b575707b056529f21c242e5f2bf Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 13 Feb 2023 17:34:54 +0100 Subject: [PATCH] ktlint formatting --- .../ui/activities/AdventureGuideActivity.kt | 2 +- .../habitica/ui/activities/DeathActivity.kt | 2 +- .../ui/activities/NotificationsActivity.kt | 2 +- .../adapter/inventory/ShopRecyclerAdapter.kt | 2 +- .../fragments/social/QuestDetailFragment.kt | 2 +- .../views/dialogs/AchievementDetailDialog.kt | 2 +- .../ui/views/dialogs/AchievementDialog.kt | 2 +- .../dialogs/QuestCompletedDialogContent.kt | 2 +- .../ui/views/shops/PurchaseDialogContent.kt | 2 +- shared/build.gradle.kts | 2 +- .../habitica/models/tasks/AttributeTest.kt | 2 +- .../habitica/ui/activities/MainActivity.kt | 10 ++-- .../ui/activities/TaskResultActivity.kt | 2 +- .../habitrpg/wearos/habitica/ProjectConfig.kt | 2 +- .../repositories/TaskLocalRepositoryTest.kt | 50 +++++++++---------- .../repositories/UserLocalRepositoryTest.kt | 42 ++++++++-------- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt index 5190f1f1f..a0d18fd27 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt index e9d46c356..01d54b90c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt index 76e33b747..932596d87 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt index 6405d49b3..1cba9f788 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt @@ -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() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt index c1a0b6a7b..7f77f975a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt index b444c6eb1..b85607738 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt index 57fab078f..309563737 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt index 7e4652e9f..a0f1f05ef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt index b92814aa3..2f767f1eb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt @@ -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 diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 6c1801e5e..1ed4f9b3c 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -49,4 +49,4 @@ android { } namespace = "com.habitrpg.shared.habitica" -} \ No newline at end of file +} diff --git a/shared/src/commonTest/kotlin/com/habitrpg/shared/habitica/models/tasks/AttributeTest.kt b/shared/src/commonTest/kotlin/com/habitrpg/shared/habitica/models/tasks/AttributeTest.kt index d7d186a54..5684efcaa 100644 --- a/shared/src/commonTest/kotlin/com/habitrpg/shared/habitica/models/tasks/AttributeTest.kt +++ b/shared/src/commonTest/kotlin/com/habitrpg/shared/habitica/models/tasks/AttributeTest.kt @@ -11,4 +11,4 @@ class AttributeTest { assertEquals(Attribute.PERCEPTION, Attribute.from("per")) assertEquals(Attribute.INTELLIGENCE, Attribute.from("int")) } -} \ No newline at end of file +} diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt index 8f09ac074..2fdb480e8 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt @@ -116,11 +116,11 @@ class MainActivity : BaseActivity() { 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) { diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt index efbf7268c..94381ba8f 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt @@ -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 diff --git a/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt b/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt index e241e1b65..a17933615 100644 --- a/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt +++ b/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt @@ -37,4 +37,4 @@ object ProjectConfig : AbstractProjectConfig() { private fun resetLiveData() { ArchTaskExecutor.getInstance().setDelegate(null) } -} \ No newline at end of file +} diff --git a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt index 7c802c754..54c7b6398 100644 --- a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt +++ b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt @@ -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" + } + } + } }) diff --git a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepositoryTest.kt b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepositoryTest.kt index a939d4e38..e7836563d 100644 --- a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepositoryTest.kt +++ b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepositoryTest.kt @@ -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 + } + } + } })