From ce28bf83f39d3d6ada4fa87afa116c536573f890 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 22 Apr 2024 16:06:37 +0200 Subject: [PATCH] linting fixes --- .editorconfig | 12 + .github/workflows/android.yml | 7 +- Habitica/res/values/styles.xml | 22 +- .../android/habitica/HabiticaTestCase.kt | 13 +- .../ui/activities/IntroActivityTest.kt | 1 - .../ui/activities/MainActivityTest.kt | 1 - .../ui/activities/TaskFormActivityTest.kt | 3 +- .../habitica/ui/fragments/FragmentTestCase.kt | 4 +- .../fragments/NavigationDrawerFragmentTest.kt | 14 +- .../ui/fragments/PartyDetailFragmentTest.kt | 7 +- .../ui/fragments/StatsFragmentTest.kt | 44 +- .../items/ItemRecyclerFragmentTest.kt | 43 +- .../inventory/stable/PetDetailFragmentTest.kt | 39 +- .../stable/StableRecyclerFragmentTest.kt | 16 +- .../purchases/GemsPurchaseFragmentTest.kt | 143 - .../purchases/SubscriptionFragmentTest.kt | 84 - .../tasks/TaskRecyclerViewFragmentTest.kt | 15 +- .../habitica/HabiticaBaseApplication.kt | 670 ++--- .../habitica/api/GSonFactoryCreator.java | 13 +- .../android/habitica/data/BaseRepository.kt | 2 +- .../habitica/data/ChallengeRepository.kt | 30 +- .../habitica/data/ContentRepository.kt | 25 +- .../habitica/data/CustomizationRepository.kt | 20 +- .../android/habitica/data/FAQRepository.kt | 19 +- .../habitica/data/InventoryRepository.kt | 258 +- .../data/SetupCustomizationRepository.kt | 59 +- .../android/habitica/data/SocialRepository.kt | 311 ++- .../android/habitica/data/TagRepository.kt | 40 +- .../android/habitica/data/TaskRepository.kt | 205 +- .../habitica/data/TutorialRepository.kt | 20 +- .../android/habitica/data/UserRepository.kt | 236 +- .../data/implementation/ApiClientImpl.kt | 395 ++- .../data/implementation/BaseRepositoryImpl.kt | 3 +- .../implementation/ChallengeRepositoryImpl.kt | 43 +- .../implementation/ContentRepositoryImpl.kt | 119 +- .../CustomizationRepositoryImpl.kt | 46 +- .../data/implementation/FAQRepositoryImpl.kt | 46 +- .../implementation/InventoryRepositoryImpl.kt | 709 ++--- .../SetupCustomizationRepositoryImpl.kt | 301 ++- .../implementation/SocialRepositoryImpl.kt | 800 +++--- .../data/implementation/TagRepositoryImpl.kt | 127 +- .../data/implementation/TaskRepositoryImpl.kt | 890 ++++--- .../implementation/TutorialRepositoryImpl.kt | 42 +- .../data/local/BaseLocalRepository.kt | 11 +- .../data/local/ChallengeLocalRepository.kt | 24 +- .../data/local/ContentLocalRepository.kt | 2 + .../local/CustomizationLocalRepository.kt | 20 +- .../data/local/InventoryLocalRepository.kt | 212 +- .../data/local/SocialLocalRepository.kt | 158 +- .../data/local/TaskLocalRepository.kt | 98 +- .../data/local/TutorialLocalRepository.kt | 20 +- .../data/local/UserLocalRepository.kt | 72 +- .../RealmBaseLocalRepository.kt | 272 +- .../RealmChallengeLocalRepository.kt | 86 +- .../RealmContentLocalRepository.kt | 5 +- .../RealmCustomizationLocalRepository.kt | 43 +- .../implementation/RealmFAQLocalRepository.kt | 13 +- .../RealmInventoryLocalRepository.kt | 131 +- .../RealmSocialLocalRepository.kt | 207 +- .../RealmTaskLocalRepository.kt | 548 ++-- .../RealmTutorialLocalRepository.kt | 5 +- .../RealmUserLocalRepository.kt | 18 +- .../extensions/AlertDialogExtensions.kt | 6 +- .../habitica/extensions/AnimalExtensions.kt | 5 +- .../extensions/AttributeSetExtentions.kt | 5 +- .../habitica/extensions/DateExtensions.kt | 118 +- .../extensions/ResourcesExtensions.kt | 5 +- .../extensions/TextWatcherExtensions.kt | 58 +- .../habitica/extensions/WindowExtensions.kt | 8 +- .../extensions/ZonedDateExtensions.kt | 18 +- .../android/habitica/helpers/AdHandler.kt | 33 +- .../android/habitica/helpers/Analytics.kt | 42 +- .../habitica/helpers/AppConfigManager.kt | 14 +- .../habitica/helpers/AprilFoolsHandler.kt | 6 +- .../habitica/helpers/GroupPlanInfoProvider.kt | 8 +- .../habitica/helpers/LifecycleCollect.kt | 9 +- .../helpers/NotificationOpenHandler.kt | 59 +- .../habitica/helpers/NotificationsManager.kt | 94 +- .../habitica/helpers/PurchaseHandler.kt | 293 +- .../android/habitica/helpers/PurchaseTypes.kt | 58 +- .../android/habitica/helpers/ReviewManager.kt | 6 +- .../android/habitica/helpers/SoundFile.kt | 9 +- .../habitica/helpers/SoundFileLoader.kt | 4 +- .../android/habitica/helpers/SoundManager.kt | 106 +- .../habitica/helpers/TaskAlarmManager.kt | 609 +++-- .../helpers/TaskDescriptionBuilder.kt | 165 +- .../habitica/helpers/UserStatComputer.kt | 291 +- .../ChangeUsernameLocalNotification.kt | 3 +- .../notifications/ChatMentionNotification.kt | 11 +- .../notifications/GenericLocalNotification.kt | 3 +- .../GiftOneGetOneLocalNotification.kt | 3 +- .../GroupActivityNotification.kt | 49 +- .../GuildInviteLocalNotification.kt | 35 +- .../HabiticaFirebaseMessagingService.kt | 55 +- .../HabiticaLocalNotification.kt | 34 +- .../HabiticaLocalNotificationFactory.kt | 77 +- .../PartyInviteLocalNotification.kt | 35 +- .../notifications/PushNotificationManager.kt | 353 +-- .../QuestBegunLocalNotification.kt | 3 +- .../QuestInviteLocalNotification.kt | 46 +- .../ReceivedGemsGiftLocalNotification.kt | 3 +- ...ReceivedPrivateMessageLocalNotification.kt | 76 +- ...ceivedSubscriptionGiftLocalNotification.kt | 3 +- .../WonChallengeLocalNotification.kt | 3 +- .../postProcessors/InvertPostProcessor.kt | 1 - .../habitica/interactors/BuyRewardUseCase.kt | 61 +- .../interactors/CheckClassSelectionUseCase.kt | 98 +- .../interactors/DisplayItemDropUseCase.kt | 112 +- .../habitica/interactors/FeedPetUseCase.kt | 103 +- .../habitica/interactors/HatchPetUseCase.kt | 123 +- .../interactors/InsufficientGemsUseCase.kt | 32 +- .../habitica/interactors/LevelUpUseCase.kt | 237 +- .../habitica/interactors/NotifyUserUseCase.kt | 380 +-- .../interactors/ScoreTaskLocallyInteractor.kt | 76 +- .../interactors/ShareAvatarUseCase.kt | 39 +- .../habitica/interactors/ShareMountUseCase.kt | 24 +- .../habitica/interactors/SharePetUseCase.kt | 24 +- .../interactors/ShowNotificationInteractor.kt | 76 +- .../android/habitica/interactors/UseCase.kt | 1 + .../habitica/models/CustomizationFilter.kt | 7 +- .../android/habitica/models/FAQArticle.kt | 25 +- .../habitica/models/SetupCustomization.kt | 236 +- .../habitrpg/android/habitica/models/Skill.kt | 31 +- .../habitrpg/android/habitica/models/Tag.kt | 51 +- .../android/habitica/models/TutorialStep.kt | 95 +- .../models/inventory/Customization.kt | 217 +- .../habitica/models/inventory/Equipment.kt | 3 +- .../habitica/models/inventory/Quest.kt | 5 +- .../habitica/models/inventory/QuestBoss.kt | 49 +- .../models/inventory/QuestBossRage.kt | 1 - .../habitica/models/inventory/QuestColors.kt | 1 - .../habitica/models/inventory/QuestContent.kt | 137 +- .../models/inventory/QuestDropItem.kt | 15 +- .../models/inventory/QuestProgress.kt | 37 +- .../models/inventory/QuestRageStrike.kt | 1 - .../habitica/models/inventory/SpecialItem.kt | 63 +- .../models/invitations/GuildInvite.kt | 25 +- .../models/invitations/PartyInvite.kt | 23 +- .../android/habitica/models/members/Member.kt | 1 - .../models/members/MemberPreferences.kt | 1 - .../FallExtraGemsHabiticaPromotion.kt | 87 +- .../GiftOneGetOneHabiticaPromotion.kt | 67 +- .../models/promotions/HabiticaPromotion.kt | 32 +- .../SpookyExtraGemsHabiticaPromotion.kt | 135 +- .../models/promotions/Survey2021Promotion.kt | 17 +- .../habitica/models/shops/ShopCategory.kt | 25 +- .../models/shops/ShopItemUnlockCondition.kt | 75 +- .../habitica/models/social/Challenge.kt | 180 +- .../habitica/models/social/ChatMessage.kt | 131 +- .../models/social/FindUsernameResult.kt | 1 - .../android/habitica/models/social/Group.kt | 180 +- .../models/social/InboxConversation.kt | 1 - .../habitica/models/tasks/ChecklistItem.kt | 157 +- .../android/habitica/models/tasks/Days.kt | 5 +- .../habitica/models/tasks/RemindersItem.kt | 220 +- .../android/habitica/models/tasks/Task.kt | 1452 +++++----- .../android/habitica/models/user/Buffs.kt | 24 +- .../android/habitica/models/user/Items.kt | 148 +- .../android/habitica/models/user/OwnedItem.kt | 1 - .../habitica/models/user/OwnedMount.kt | 1 - .../android/habitica/models/user/Stats.kt | 6 +- .../habitica/models/user/SubscriptionPlan.kt | 12 +- .../android/habitica/models/user/Training.kt | 4 +- .../android/habitica/models/user/User.kt | 5 +- .../habitica/models/user/UserQuestStatus.kt | 2 +- .../android/habitica/modules/ApiModule.kt | 148 +- .../android/habitica/modules/AppModule.kt | 227 +- .../habitica/modules/RepositoryModule.kt | 4 +- .../android/habitica/modules/UserModule.kt | 4 +- .../habitica/modules/UserRepositoryModule.kt | 435 +-- .../android/habitica/prefs/TimePreference.kt | 17 +- .../receivers/DeviceCommunicationService.kt | 14 +- .../LocalNotificationActionReceiver.kt | 306 ++- .../receivers/NotificationPublisher.kt | 48 +- .../receivers/TaskAlarmBootReceiver.kt | 75 +- .../habitica/receivers/TaskReceiver.kt | 218 +- .../habitica/ui/GemPurchaseOptionsView.kt | 17 +- .../android/habitica/ui/RoundedFrameLayout.kt | 37 +- .../android/habitica/ui/SpeechBubbleView.kt | 17 +- .../android/habitica/ui/TutorialView.kt | 210 +- .../ui/activities/AddTaskWidgetActivity.kt | 169 +- .../ui/activities/AdventureGuideActivity.kt | 85 +- .../habitica/ui/activities/ArmoireActivity.kt | 51 +- .../habitica/ui/activities/BaseActivity.kt | 73 +- .../ui/activities/BirthdayActivity.kt | 224 +- .../ui/activities/ChallengeFormActivity.kt | 95 +- .../ui/activities/ClassSelectionActivity.kt | 684 ++--- .../habitica/ui/activities/DeathActivity.kt | 135 +- .../activities/FixCharacterValuesActivity.kt | 29 +- .../ui/activities/FullProfileActivity.kt | 1648 ++++++------ .../ui/activities/GemPurchaseActivity.kt | 12 +- .../ui/activities/GiftGemsActivity.kt | 59 +- .../ui/activities/GiftSubscriptionActivity.kt | 23 +- .../ui/activities/GroupFormActivity.kt | 7 +- .../ui/activities/GroupInviteActivity.kt | 215 +- .../ui/activities/GuidelinesActivity.kt | 45 +- .../activities/HabitButtonWidgetActivity.kt | 218 +- .../habitica/ui/activities/IntroActivity.kt | 319 ++- .../habitica/ui/activities/LoginActivity.kt | 1058 ++++---- .../habitica/ui/activities/MainActivity.kt | 229 +- .../ui/activities/MaintenanceActivity.kt | 168 +- .../ui/activities/NotificationsActivity.kt | 236 +- .../habitica/ui/activities/PrefsActivity.kt | 8 +- .../ui/activities/ReportMessageActivity.kt | 44 +- .../habitica/ui/activities/SetupActivity.kt | 646 ++--- .../ui/activities/SkillTasksActivity.kt | 188 +- .../ui/activities/TaskFormActivity.kt | 245 +- .../ui/activities/TaskSummaryActivity.kt | 141 +- .../ui/adapter/AchievementsAdapter.kt | 41 +- .../ui/adapter/BaseRecyclerViewAdapter.kt | 22 +- ...stomizationEquipmentRecyclerViewAdapter.kt | 57 +- .../CustomizationRecyclerViewAdapter.kt | 636 ++--- .../ui/adapter/NavigationDrawerAdapter.kt | 71 +- .../ui/adapter/SimpleSpinnerAdapter.kt | 22 +- .../adapter/SkillTasksRecyclerViewAdapter.kt | 142 +- .../ui/adapter/SkillsRecyclerViewAdapter.kt | 336 ++- .../inventory/EquipmentRecyclerViewAdapter.kt | 214 +- .../inventory/HabiticaClassArrayAdapter.kt | 35 +- .../adapter/inventory/ItemRecyclerAdapter.kt | 628 ++--- .../inventory/MountDetailRecyclerAdapter.kt | 112 +- .../inventory/PetDetailRecyclerAdapter.kt | 437 +-- .../adapter/inventory/ShopRecyclerAdapter.kt | 697 ++--- .../inventory/StableRecyclerAdapter.kt | 610 +++-- .../setup/CustomizationSetupAdapter.kt | 306 ++- .../ui/adapter/setup/TaskSetupAdapter.kt | 183 +- .../social/AchievementProfileAdapter.kt | 177 +- .../social/ChallengesListViewAdapter.kt | 38 +- .../adapter/social/ChatRecyclerViewAdapter.kt | 283 +- .../ui/adapter/social/InboxAdapter.kt | 70 +- .../social/PartyMemberRecyclerViewAdapter.kt | 57 +- .../ChallengesFilterRecyclerViewAdapter.kt | 108 +- .../tasks/BaseTasksRecyclerViewAdapter.kt | 170 +- .../RealmBaseTasksRecyclerViewAdapter.kt | 296 ++- .../adapter/tasks/TaskRecyclerViewAdapter.kt | 7 +- .../habitica/ui/fragments/AboutFragment.kt | 55 +- .../ui/fragments/AchievementsFragment.kt | 128 +- .../ui/fragments/BaseDialogFragment.kt | 14 +- .../habitica/ui/fragments/BaseFragment.kt | 168 +- .../habitica/ui/fragments/BaseMainFragment.kt | 283 +- .../ui/fragments/PromoInfoFragment.kt | 13 +- .../habitica/ui/fragments/PromoWebFragment.kt | 17 +- .../ui/fragments/ReportBottomSheetFragment.kt | 46 +- .../habitica/ui/fragments/StatsFragment.kt | 42 +- .../customization/AvatarEquipmentFragment.kt | 55 +- .../equipment/EquipmentDetailFragment.kt | 258 +- .../inventory/items/ItemDialogFragment.kt | 149 +- .../inventory/items/ItemRecyclerFragment.kt | 773 +++--- .../inventory/items/ItemsFragment.kt | 73 +- .../inventory/shops/MarketFragment.kt | 2 +- .../inventory/shops/QuestShopFragment.kt | 7 +- .../inventory/shops/SeasonalShopFragment.kt | 2 +- .../shops/TimeTravelersShopFragment.kt | 17 +- .../stable/MountDetailRecyclerFragment.kt | 367 +-- .../stable/PetDetailRecyclerFragment.kt | 556 ++-- .../inventory/stable/StableFragment.kt | 36 +- .../stable/StableRecyclerFragment.kt | 364 +-- .../preferences/AccountPreferenceFragment.kt | 91 +- .../preferences/BasePreferencesFragment.kt | 8 +- .../EmailNotificationsPreferencesFragment.kt | 118 +- .../preferences/HabiticaAccountDialog.kt | 183 +- .../preferences/PreferencesFragment.kt | 1158 ++++---- .../PushNotificationsPreferencesFragment.kt | 123 +- .../TimePreferenceDialogFragment.kt | 4 +- ...tOutcomeSubscriptionBottomSheetFragment.kt | 7 +- .../purchases/GemsPurchaseFragment.kt | 51 +- .../purchases/GiftBalanceGemsFragment.kt | 12 +- .../purchases/GiftPurchaseGemsFragment.kt | 26 +- .../SubscriptionBottomSheetFragment.kt | 34 +- .../purchases/SubscriptionFragment.kt | 616 ++--- .../ui/fragments/setup/AvatarSetupFragment.kt | 575 ++-- .../ui/fragments/setup/IntroFragment.kt | 11 +- .../ui/fragments/setup/TaskSetupFragment.kt | 437 +-- .../ui/fragments/setup/WelcomeFragment.kt | 296 ++- .../skills/SkillTasksRecyclerViewFragment.kt | 19 +- .../ui/fragments/skills/SkillsFragment.kt | 374 +-- .../ui/fragments/social/ChatFragment.kt | 456 ++-- .../social/InboxMessageListFragment.kt | 495 ++-- .../fragments/social/InboxOverviewFragment.kt | 438 +-- .../ui/fragments/social/PartyChatFragment.kt | 2 +- .../fragments/social/QuestDetailFragment.kt | 70 +- .../challenges/ChallengeDetailFragment.kt | 121 +- .../challenges/ChallengeFilterDialogHolder.kt | 187 +- .../challenges/ChallengeFilterOptions.kt | 18 +- .../challenges/ChallengeListFragment.kt | 391 +-- .../challenges/ChallengesOverviewFragment.kt | 300 ++- .../social/guilds/GuildDetailFragment.kt | 79 +- .../fragments/social/guilds/GuildFragment.kt | 473 ++-- .../social/party/NoPartyFragmentFragment.kt | 379 +-- .../social/party/PartyDetailFragment.kt | 100 +- .../fragments/social/party/PartyFragment.kt | 409 +-- .../social/party/PartyInviteFragment.kt | 146 +- .../social/party/PartyInvitePagerFragment.kt | 54 +- .../social/party/PartySeekingFragment.kt | 187 +- .../ui/fragments/support/BugFixFragment.kt | 81 +- .../ui/fragments/support/FAQDetailFragment.kt | 12 +- .../fragments/support/FAQOverviewFragment.kt | 565 ++-- .../fragments/support/SupportMainFragment.kt | 21 +- .../tasks/RewardsRecyclerviewFragment.kt | 86 +- .../tasks/TaskRecyclerViewFragment.kt | 1336 +++++----- .../ui/fragments/tasks/TasksFragment.kt | 927 ++++--- .../ui/helpers/AutocompleteAdapter.kt | 56 +- .../ui/helpers/AutocompleteTokenizer.kt | 17 +- .../habitica/ui/helpers/KeyboardUtil.kt | 3 +- .../habitica/ui/helpers/MarginDecoration.kt | 8 +- .../ui/helpers/RecyclerViewEmptySupport.kt | 140 +- .../ui/helpers/SafeDefaultItemAnimator.kt | 219 +- .../habitica/ui/helpers/ToolbarColorHelper.kt | 19 +- .../habitica/ui/menu/BottomSheetMenu.kt | 3 +- .../habitica/ui/menu/BottomSheetMenuItem.kt | 17 +- .../habitica/ui/menu/HabiticaDrawerItem.kt | 2 +- .../habitica/ui/theme/HabiticaTheme.kt | 30 +- .../ui/viewHolders/BindableViewHolder.kt | 3 +- .../ui/viewHolders/ChatRecyclerViewHolder.kt | 101 +- .../ui/viewHolders/GroupMemberViewHolder.kt | 38 +- .../ui/viewHolders/MountViewHolder.kt | 37 +- .../habitica/ui/viewHolders/PetViewHolder.kt | 29 +- .../ui/viewHolders/SectionViewHolder.kt | 50 +- .../ui/viewHolders/ShopItemViewHolder.kt | 35 +- .../ui/viewmodels/AuthenticationViewModel.kt | 258 +- .../habitica/ui/viewmodels/BaseViewModel.kt | 10 +- .../habitica/ui/viewmodels/GroupViewModel.kt | 483 ++-- .../habitica/ui/viewmodels/InboxViewModel.kt | 136 +- .../ui/viewmodels/MainActivityViewModel.kt | 308 +-- .../ui/viewmodels/MainUserViewModel.kt | 137 +- .../ui/viewmodels/NotificationsViewModel.kt | 740 +++--- .../habitica/ui/viewmodels/PartyViewModel.kt | 129 +- .../habitica/ui/viewmodels/StableViewModel.kt | 253 +- .../ui/viewmodels/TaskFormViewModel.kt | 22 +- .../habitica/ui/viewmodels/TasksViewModel.kt | 630 ++--- .../equipment/EquipmentOverviewViewModel.kt | 33 +- .../habitica/ui/views/AppHeaderView.kt | 225 +- .../habitica/ui/views/BackgroundScene.kt | 44 +- .../habitica/ui/views/BottomSheetUtils.kt | 37 +- .../android/habitica/ui/views/BuffIcon.kt | 5 +- .../android/habitica/ui/views/ClassIcon.kt | 21 +- .../android/habitica/ui/views/ClassText.kt | 34 +- .../ui/views/CollapsibleSectionView.kt | 54 +- .../android/habitica/ui/views/CompletedAt.kt | 21 +- .../android/habitica/ui/views/CurrencyText.kt | 46 +- .../android/habitica/ui/views/CurrencyView.kt | 62 +- .../habitica/ui/views/CurrencyViews.kt | 52 +- .../habitica/ui/views/DayNightTextView.kt | 16 +- .../habitica/ui/views/DragLinearLayout.kt | 1143 ++++---- .../habitica/ui/views/EllipsisTextView.kt | 14 +- .../habitica/ui/views/ExtraLabelPreference.kt | 2 +- .../android/habitica/ui/views/FlowLayout.kt | 60 +- .../habitica/ui/views/GroupPlanMemberList.kt | 70 +- .../ui/views/HabiticaAutocompleteTextView.kt | 4 +- .../habitica/ui/views/HabiticaButton.kt | 24 +- .../habitica/ui/views/HabiticaIcons.java | 2356 ++++++++--------- .../ui/views/HabiticaIconsHelper.java | 40 + .../ui/views/HabiticaListPreference.kt | 17 +- .../habitica/ui/views/HabiticaSnackbar.kt | 714 ++--- .../android/habitica/ui/views/LabeledBar.kt | 108 +- .../habitica/ui/views/LoadingButton.kt | 202 +- .../android/habitica/ui/views/PixelArtView.kt | 6 +- .../habitica/ui/views/SegmentedControl.kt | 170 +- .../android/habitica/ui/views/SparkView.kt | 204 +- .../ui/views/SupportCollapsibleSection.kt | 34 +- .../android/habitica/ui/views/Typewriter.kt | 20 +- .../android/habitica/ui/views/UserRow.kt | 20 +- .../habitica/ui/views/UsernameLabel.kt | 143 +- .../habitica/ui/views/ValidatingEditText.kt | 105 +- .../android/habitica/ui/views/ads/AdButton.kt | 214 +- .../views/dialogs/AchievementDetailDialog.kt | 15 +- .../ui/views/dialogs/AchievementDialog.kt | 127 +- .../habitica/ui/views/dialogs/DetailDialog.kt | 1 - .../ui/views/dialogs/FirstDropDialog.kt | 8 +- .../dialogs/HabiticaBottomSheetDialog.kt | 3 +- .../views/dialogs/HabiticaProgressDialog.kt | 12 +- .../views/dialogs/OpenedMysteryitemDialog.kt | 1 - .../ui/views/dialogs/PetSuggestHatchDialog.kt | 118 +- .../ui/views/dialogs/QuestCompletedDialog.kt | 7 +- .../dialogs/QuestCompletedDialogContent.kt | 28 +- .../ui/views/dialogs/WonChallengeDialog.kt | 12 +- .../views/equipment/EquipmentOverviewView.kt | 197 +- .../InsufficientCurrencyDialog.kt | 1 - .../InsufficientGemsDialog.kt | 51 +- .../InsufficientGoldDialog.kt | 1 - .../InsufficientHourglassesDialog.kt | 12 +- .../ui/views/login/LockableScrollView.kt | 1 - .../ui/views/login/LoginBackgroundView.kt | 41 +- .../habitica/ui/views/login/StarView.kt | 17 +- .../views/navigation/BottomNavigationItem.kt | 121 +- .../navigation/BottomNavigationSubmenuItem.kt | 64 +- .../HabiticaBottomNavigationView.kt | 462 ++-- .../preferences/PauseResumeDamageView.kt | 53 +- .../progress/HabiticaPullRefreshIndicator.kt | 22 +- .../ui/views/promo/BirthdayMenuView.kt | 65 +- .../habitica/ui/views/promo/PromoMenuView.kt | 106 +- .../ui/views/promo/PromoMenuViewHolder.kt | 1 - .../promo/SubscriptionBuyGemsPromoView.kt | 36 +- .../ui/views/setup/AvatarCategoryView.kt | 25 +- .../views/setup/AvatarCustomizationDrawer.kt | 3 +- .../shops/PurchaseDialogBackgroundContent.kt | 5 +- .../ui/views/shops/PurchaseDialogContent.kt | 57 +- .../PurchaseDialogCustomizationSetContent.kt | 3 +- .../views/shops/PurchaseDialogGearContent.kt | 8 +- .../views/shops/PurchaseDialogGemsContent.kt | 3 +- .../views/shops/PurchaseDialogQuestContent.kt | 22 +- .../habitica/ui/views/social/ChatBarView.kt | 27 +- .../ui/views/social/InvitationsView.kt | 97 +- .../ui/views/social/OldQuestProgressView.kt | 15 +- .../ui/views/social/PartySeekingListItem.kt | 51 +- .../ui/views/stable/MountBottomSheet.kt | 100 +- .../habitica/ui/views/stable/MountView.kt | 55 +- .../ui/views/stable/PetBottomSheet.kt | 245 +- .../ui/views/stats/BulkAllocateStatsDialog.kt | 23 +- .../ui/views/stats/StatsSliderView.kt | 51 +- .../habitica/ui/views/stats/StatsView.kt | 147 +- .../subscriptions/SubscriberBenefitView.kt | 98 +- .../subscriptions/SubscriptionDetailsView.kt | 445 ++-- .../subscriptions/SubscriptionOptionView.kt | 77 +- .../habitica/ui/views/tasks/AssignSheet.kt | 118 +- .../habitica/ui/views/tasks/AssignedView.kt | 86 +- .../ui/views/tasks/TaskFilterDialog.kt | 913 ++++--- .../ui/views/tasks/form/ChecklistContainer.kt | 154 +- .../views/tasks/form/ChecklistItemFormView.kt | 169 +- .../tasks/form/HabitScoringButtonsView.kt | 79 +- .../ui/views/tasks/form/ReminderContainer.kt | 172 +- .../views/tasks/form/ReminderItemFormView.kt | 303 ++- .../views/tasks/form/StepperValueFormView.kt | 169 +- .../views/tasks/form/TaskDifficultyButtons.kt | 79 +- .../ui/views/tasks/form/TaskFormSelector.kt | 52 +- .../tasks/form/TaskSchedulingControls.kt | 763 +++--- .../views/yesterdailies/YesterdailyDialog.kt | 112 +- .../utils/AchievementListDeserializer.kt | 9 +- .../utils/AssignedDetailsDeserializer.kt | 17 +- .../habitica/utils/BooleanAsIntAdapter.kt | 69 +- .../habitica/utils/ChallengeDeserializer.kt | 29 +- .../utils/ChallengeListDeserializer.kt | 6 +- .../habitica/utils/ChatMessageDeserializer.kt | 172 +- .../habitica/utils/ContentDeserializer.kt | 264 +- .../utils/CustomizationDeserializer.kt | 454 ++-- .../habitica/utils/DateDeserializer.kt | 173 +- .../utils/EquipmentListDeserializer.java | 2 +- .../utils/FAQArticleListDeserilializer.kt | 71 +- .../utils/FeedResponseDeserializer.kt | 38 +- .../utils/FindUsernameResultDeserializer.kt | 15 +- .../habitica/utils/GroupSerialization.kt | 324 +-- .../habitica/utils/MemberSerialization.kt | 21 +- .../utils/NotificationDeserializer.kt | 6 +- .../utils/OwnedItemListDeserializer.kt | 2 +- .../utils/OwnedMountListDeserializer.kt | 2 +- .../utils/OwnedPetListDeserializer.kt | 2 +- .../utils/QuestCollectDeserializer.kt | 6 +- .../habitica/utils/QuestDeserializer.kt | 6 +- .../utils/QuestDropItemsListSerialization.kt | 6 +- .../habitica/utils/SkillDeserializer.kt | 87 +- .../utils/SocialAuthenticationDeserializer.kt | 6 +- .../habitica/utils/TaskListDeserializer.kt | 181 +- .../android/habitica/utils/TaskSerializer.kt | 491 ++-- .../habitica/utils/TaskTagDeserializer.kt | 127 +- .../utils/TutorialStepListDeserializer.kt | 73 +- .../habitica/utils/UserDeserializer.kt | 28 +- .../habitica/utils/WorldStateSerialization.kt | 6 +- .../habitica/widget/AddTaskWidgetProvider.kt | 162 +- .../widget/AvatarStatsWidgetProvider.kt | 426 +-- .../habitica/widget/BaseWidgetProvider.kt | 236 +- .../habitica/widget/DailiesListFactory.kt | 41 +- .../habitica/widget/DailiesWidgetService.kt | 1 - .../widget/HabitButtonWidgetProvider.kt | 203 +- .../widget/HabitButtonWidgetService.kt | 275 +- .../habitica/widget/TaskListFactory.kt | 223 +- .../habitica/widget/TaskListWidgetProvider.kt | 263 +- .../habitica/widget/TodoListFactory.kt | 38 +- .../habitica/widget/TodosWidgetService.kt | 1 - .../habitica/ReleaseDeveloperModule.kt | 4 +- .../implementation/TaskRepositoryImplTest.kt | 15 +- .../helpers/MarkdownProcessingTest.kt | 3 - .../habitica/helpers/UserStatComputerTest.kt | 2 +- .../EquipmentOverviewViewModelTest.kt | 36 +- .../habitica/utils/DateDeserializerTest.kt | 115 +- build.gradle | 10 +- common/build.gradle.kts | 2 + .../common/habitica/api/HostConfig.kt | 5 +- .../extensions/ApplicationExtensions.kt | 19 +- .../habitica/extensions/BaseExtensions.kt | 6 +- .../extensions/BaseViewModelExtensions.kt | 7 +- .../habitica/extensions/ContextExtensions.kt | 1 + .../habitica/extensions/DataBindingUtils.kt | 106 +- .../extensions/DrawableExtendsions.kt | 7 +- .../habitica/extensions/HabitResetOption.kt | 11 +- .../extensions/TaskDifficultyExtensions.kt | 26 +- .../habitica/extensions/TextViewExtensions.kt | 33 +- .../common/habitica/extensions/ViewExt.kt | 43 +- .../extensions/ViewGroupExtensions.kt | 5 +- .../common/habitica/helpers/Animations.kt | 15 +- .../habitica/helpers/AppConfigManager.kt | 1 - .../habitica/helpers/AppTestingLevel.kt | 2 +- .../habitica/helpers/ExceptionHandler.kt | 11 +- .../habitica/helpers/HealthFormatter.kt | 21 +- .../common/habitica/helpers/KeyHelper.kt | 424 +-- .../common/habitica/helpers/LanguageHelper.kt | 14 +- .../helpers/MainNavigationController.kt | 17 +- .../common/habitica/helpers/MarkdownParser.kt | 93 +- .../habitica/helpers/NumberAbbreviator.kt | 34 +- .../helpers/RecyclerViewEmptySupport.kt | 30 +- .../common/habitica/models/Notification.kt | 2 +- .../common/habitica/models/PlayerTier.kt | 8 +- .../common/habitica/models/auth/UserAuth.kt | 2 +- .../models/auth/UserAuthSocialTokens.kt | 1 + .../models/notifications/AchievementData.kt | 1 - .../models/notifications/FirstDropData.kt | 1 - .../notifications/GuildInvitationData.kt | 1 - .../notifications/LoginIncentiveData.kt | 1 - .../common/habitica/theme/HabiticaTheme.kt | 176 +- .../common/habitica/views/AvatarView.kt | 224 +- .../habitica/views/ComposableAvatarView.kt | 4 +- .../views/HabiticaCircularProgressView.kt | 59 +- .../habitica/views/HabiticaProgressBar.kt | 197 +- .../common/habitica/views/PixelArtView.kt | 119 +- .../common/habitica/views/ValueBar.kt | 32 +- .../habitica/helpers/NumberAbbreviatorTest.kt | 29 +- detekt_baseline.xml | 88 +- .../shared/habitica/PlatformLogger.kt | 26 +- .../com/habitrpg/shared/habitica/Logger.kt | 48 +- .../habitrpg/shared/habitica/models/Avatar.kt | 10 +- .../shared/habitica/models/AvatarBuffs.kt | 2 +- .../shared/habitica/models/AvatarGear.kt | 1 - .../shared/habitica/models/AvatarItems.kt | 1 - .../shared/habitica/models/AvatarStats.kt | 2 +- .../models/responses/TaskDirection.kt | 12 +- .../models/responses/TaskDirectionData.kt | 1 + .../models/responses/TaskDirectionDataTemp.kt | 47 +- .../models/responses/TaskScoringResult.kt | 5 +- .../responses/VerifyUsernameResponse.kt | 1 - .../shared/habitica/models/tasks/Attribute.kt | 3 +- .../shared/habitica/models/tasks/Frequency.kt | 3 +- .../habitica/models/tasks/HabitResetOption.kt | 3 +- .../habitica/models/tasks/TaskDifficulty.kt | 3 +- .../shared/habitica/models/tasks/TaskType.kt | 3 +- .../habitica/models/tasks/TasksOrder.kt | 5 +- .../shared/habitica/PlatformLogger.kt | 26 +- .../wearos/habitica/MainApplication.kt | 1 - .../wearos/habitica/data/ApiClient.kt | 371 +-- .../wearos/habitica/data/ApiService.kt | 85 +- .../data/repositories/TaskLocalRepository.kt | 193 +- .../data/repositories/TaskRepository.kt | 134 +- .../data/repositories/UserLocalRepository.kt | 21 +- .../data/repositories/UserRepository.kt | 66 +- .../wearos/habitica/extensions/ViewExt.kt | 19 +- .../habitica/managers/AppStateManager.kt | 24 +- .../wearos/habitica/models/NetworkResult.kt | 10 +- .../habitica/models/tasks/ChecklistItem.kt | 106 +- .../wearos/habitica/models/tasks/Days.kt | 5 +- .../habitica/models/tasks/RemindersItem.kt | 101 +- .../wearos/habitica/models/tasks/Task.kt | 667 ++--- .../wearos/habitica/models/user/Buffs.kt | 2 +- .../wearos/habitica/models/user/MenuItem.kt | 2 +- .../wearos/habitica/modules/AppModule.kt | 14 +- .../habitica/ui/activities/AvatarActivity.kt | 19 +- .../habitica/ui/activities/BaseActivity.kt | 35 +- .../habitica/ui/activities/FaintActivity.kt | 2 +- .../habitica/ui/activities/LevelupActivity.kt | 11 +- .../habitica/ui/activities/LoginActivity.kt | 27 +- .../habitica/ui/activities/MainActivity.kt | 162 +- .../habitica/ui/activities/RYAActivity.kt | 4 +- .../ui/activities/SettingsActivity.kt | 15 +- .../ui/activities/TaskDetailActivity.kt | 22 +- .../ui/activities/TaskFormActivity.kt | 54 +- .../ui/activities/TaskListActivity.kt | 38 +- .../ui/activities/TaskResultActivity.kt | 43 +- .../habitica/ui/adapters/BaseAdapter.kt | 12 +- .../habitica/ui/adapters/DailyListAdapter.kt | 5 +- .../habitica/ui/adapters/HabitListAdapter.kt | 5 +- .../wearos/habitica/ui/adapters/HubAdapter.kt | 10 +- .../habitica/ui/adapters/RewardListAdapter.kt | 5 +- .../habitica/ui/adapters/SettingsAdapter.kt | 14 +- .../habitica/ui/adapters/TaskListAdapter.kt | 10 +- .../habitica/ui/adapters/ToDoListAdapter.kt | 5 +- .../ui/viewHolders/HeaderTaskViewHolder.kt | 6 +- .../tasks/CheckedTaskViewHolder.kt | 22 +- .../ui/viewHolders/tasks/TaskViewHolder.kt | 1 + .../habitica/ui/viewmodels/AvatarViewModel.kt | 28 +- .../habitica/ui/viewmodels/BaseViewModel.kt | 2 +- .../ConfirmactionActivityViewModel.kt | 22 +- .../ui/viewmodels/ContinuePhoneViewModel.kt | 28 +- .../habitica/ui/viewmodels/FaintViewModel.kt | 22 +- .../ui/viewmodels/HabitDirectionViewModel.kt | 24 +- .../habitica/ui/viewmodels/InputViewModel.kt | 22 +- .../ui/viewmodels/LevelupViewModel.kt | 23 +- .../habitica/ui/viewmodels/LoginViewModel.kt | 218 +- .../habitica/ui/viewmodels/MainViewModel.kt | 37 +- .../habitica/ui/viewmodels/RYAViewModel.kt | 95 +- .../ui/viewmodels/SettingsViewModel.kt | 67 +- .../habitica/ui/viewmodels/SplashViewModel.kt | 109 +- .../habitica/ui/viewmodels/StatsViewModel.kt | 43 +- .../ui/viewmodels/TaskDetailViewModel.kt | 22 +- .../ui/viewmodels/TaskFormViewModel.kt | 41 +- .../ui/viewmodels/TaskListViewModel.kt | 188 +- .../ui/viewmodels/TaskResultViewModel.kt | 38 +- .../wearos/habitica/ui/views/AddTaskButton.kt | 107 +- .../habitica/ui/views/CircularProgressView.kt | 100 +- .../ui/views/ConnectedActionChipView.kt | 2 +- .../ui/views/HabitDirectionPickerButton.kt | 139 +- .../habitica/ui/views/HabiticaRecyclerView.kt | 175 +- .../habitica/ui/views/HabiticaScrollView.kt | 68 +- .../ui/views/IndeterminateProgressView.kt | 140 +- .../wearos/habitica/ui/views/StatValueView.kt | 73 +- .../habitica/ui/views/TaskRewardChip.kt | 103 +- .../wearos/habitica/ui/views/TaskTextView.kt | 103 +- .../habitica/ui/views/TextActionChipView.kt | 61 +- .../habitica/ui/views/TextViewWrapper.kt | 4 +- .../wearos/habitica/ui/views/TimeText.kt | 402 +-- .../wearos/habitica/util/DateJSONAdapter.kt | 71 +- .../habitica/util/ExceptionHandlerBuilder.kt | 50 +- .../util/HabiticaScrollingLayoutCallback.kt | 6 +- .../habitica/util/ScrollAwayBehavior.kt | 7 +- .../habitica/util/TopScrollAwayBehavior.kt | 7 +- .../habitrpg/wearos/habitica/ProjectConfig.kt | 24 +- .../repositories/TaskLocalRepositoryTest.kt | 95 +- 612 files changed, 40442 insertions(+), 33570 deletions(-) delete mode 100644 Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragmentTest.kt delete mode 100644 Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragmentTest.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/postProcessors/InvertPostProcessor.kt diff --git a/.editorconfig b/.editorconfig index 7ee2f96c9..8234eac1e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,2 +1,14 @@ [*.{kt,kts}] max_line_length=off +ktlint_function_naming_ignore_when_annotated_with=Composable + +[*.gradle.kts] +property_naming=off + + +[shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt] +ktlint_standard_backing-property-naming=disabled + +[**/generated/**/*.kt] +ktlint_standard_property-naming=disabled +ktlint_standard_backing-property-naming=disabled diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b3d0139b6..20034a6d3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,6 +25,11 @@ jobs: unit-test: runs-on: ubuntu-latest + strategy: + matrix: + module: + - "common" + - "Habitica" steps: - uses: actions/checkout@v3 - name: set up JDK 17 @@ -38,7 +43,7 @@ jobs: - name: Run with Gradle uses: gradle/gradle-build-action@v2 with: - arguments: testProdDebugUnitTest + arguments: ${{ matrix.module }}:testProdDebugUnitTest # ui-test: # runs-on: ubuntu-latest diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 1530d97c4..24c94a157 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -1,8 +1,9 @@ - + - + @@ -581,6 +581,7 @@ + + + + @@ -919,7 +923,6 @@ - +