From aa7221ec966bc67623b7334a784c52554dc628df Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 16 Feb 2023 09:44:13 +0100 Subject: [PATCH] restructure a bit --- Habitica/AndroidManifest.xml | 2 +- Habitica/build.gradle | 3 +- Habitica/proguard-rules.pro | 2 +- .../res/drawable/ic_launcher_foreground.xml | 8 +-- .../res/drawable/ic_launcher_monochrome.xml | 12 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 1 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 -- .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 3014 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1958 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 4272 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 6630 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 9132 -> 0 bytes Habitica/res/values/colors.xml | 3 +- .../android/habitica/HabiticaTestCase.kt | 4 +- .../habitica/HabiticaBaseApplication.kt | 6 +- .../data/implementation/ApiClientImpl.kt | 2 +- .../data/implementation/TaskRepositoryImpl.kt | 4 +- .../data/implementation/UserRepositoryImpl.kt | 2 +- .../android/habitica/helpers/AdHandler.kt | 2 +- .../habitica/helpers/AppConfigManager.kt | 1 + .../habitica/helpers/NotificationsManager.kt | 1 + .../habitica/helpers/PurchaseHandler.kt | 4 +- .../android/habitica/helpers/SoundFile.kt | 1 + .../android/habitica/helpers/SoundManager.kt | 1 + .../habitica/helpers/TaskAlarmManager.kt | 2 +- .../notifications/PushNotificationManager.kt | 2 +- .../habitica/interactors/HatchPetUseCase.kt | 2 +- .../habitica/interactors/LevelUpUseCase.kt | 2 +- .../interactors/ShowNotificationInteractor.kt | 2 +- .../android/habitica/models/tasks/Task.kt | 2 +- .../android/habitica/modules/ApiModule.kt | 2 +- .../habitica/modules/DeveloperModule.kt | 2 +- .../habitica/modules/UserRepositoryModule.kt | 2 +- .../implementation/EmptyAnalyticsManager.kt | 2 +- .../LocalNotificationActionReceiver.kt | 4 +- .../receivers/NotificationPublisher.kt | 2 +- .../receivers/TaskAlarmBootReceiver.kt | 2 +- .../habitica/receivers/TaskReceiver.kt | 2 +- .../habitica/ui/activities/ArmoireActivity.kt | 4 +- .../habitica/ui/activities/BaseActivity.kt | 6 +- .../ui/activities/BirthdayActivity.kt | 2 +- .../ui/activities/ChallengeFormActivity.kt | 4 +- .../ui/activities/ClassSelectionActivity.kt | 2 +- .../habitica/ui/activities/DeathActivity.kt | 2 +- .../ui/activities/FullProfileActivity.kt | 4 +- .../ui/activities/GiftGemsActivity.kt | 2 +- .../ui/activities/GiftSubscriptionActivity.kt | 2 +- .../ui/activities/GuidelinesActivity.kt | 2 +- .../activities/HabitButtonWidgetActivity.kt | 2 +- .../habitica/ui/activities/IntroActivity.kt | 2 +- .../habitica/ui/activities/LoginActivity.kt | 4 +- .../habitica/ui/activities/MainActivity.kt | 4 +- .../ui/activities/MaintenanceActivity.kt | 2 +- .../ui/activities/NotificationsActivity.kt | 4 +- .../ui/activities/ReportMessageActivity.kt | 2 +- .../habitica/ui/activities/SetupActivity.kt | 4 +- .../ui/activities/SkillMemberActivity.kt | 4 +- .../tasks/BaseTasksRecyclerViewAdapter.kt | 2 +- .../ui/fragments/AchievementsFragment.kt | 4 +- .../ui/fragments/BaseDialogFragment.kt | 2 +- .../habitica/ui/fragments/BaseFragment.kt | 4 +- .../ui/fragments/NavigationDrawerFragment.kt | 2 +- .../habitica/ui/fragments/NewsFragment.kt | 2 +- .../habitica/ui/fragments/StatsFragment.kt | 2 +- .../AvatarCustomizationFragment.kt | 4 +- .../customization/AvatarEquipmentFragment.kt | 4 +- .../customization/AvatarOverviewFragment.kt | 2 +- .../equipment/EquipmentDetailFragment.kt | 4 +- .../inventory/items/ItemDialogFragment.kt | 4 +- .../inventory/items/ItemRecyclerFragment.kt | 4 +- .../fragments/inventory/shops/ShopFragment.kt | 4 +- .../stable/MountDetailRecyclerFragment.kt | 4 +- .../stable/PetDetailRecyclerFragment.kt | 4 +- .../stable/StableRecyclerFragment.kt | 4 +- .../preferences/AccountPreferenceFragment.kt | 4 +- .../EmailNotificationsPreferencesFragment.kt | 2 +- .../preferences/PreferencesFragment.kt | 4 +- .../PushNotificationsPreferencesFragment.kt | 2 +- .../purchases/GemsPurchaseFragment.kt | 4 +- .../purchases/GiftBalanceGemsFragment.kt | 2 +- .../purchases/GiftPurchaseGemsFragment.kt | 2 +- .../purchases/SubscriptionFragment.kt | 4 +- .../ui/fragments/setup/AvatarSetupFragment.kt | 2 +- .../ui/fragments/setup/WelcomeFragment.kt | 4 +- .../ui/fragments/skills/SkillsFragment.kt | 4 +- .../social/InboxMessageListFragment.kt | 4 +- .../fragments/social/InboxOverviewFragment.kt | 4 +- .../fragments/social/QuestDetailFragment.kt | 4 +- .../fragments/social/TavernDetailFragment.kt | 2 +- .../challenges/ChallengeDetailFragment.kt | 4 +- .../challenges/ChallengeListFragment.kt | 4 +- .../social/guilds/GuildDetailFragment.kt | 2 +- .../social/guilds/GuildListFragment.kt | 4 +- .../social/party/NoPartyFragmentFragment.kt | 4 +- .../social/party/PartyDetailFragment.kt | 4 +- .../ui/fragments/support/BugFixFragment.kt | 2 +- .../ui/fragments/support/FAQDetailFragment.kt | 2 +- .../fragments/support/FAQOverviewFragment.kt | 2 +- .../fragments/support/SupportMainFragment.kt | 2 +- .../tasks/RewardsRecyclerviewFragment.kt | 4 +- .../tasks/TaskRecyclerViewFragment.kt | 4 +- .../ui/fragments/tasks/TasksFragment.kt | 2 +- .../ui/viewmodels/AuthenticationViewModel.kt | 4 +- .../habitica/ui/viewmodels/BaseViewModel.kt | 2 +- .../habitica/ui/viewmodels/GroupViewModel.kt | 4 +- .../habitica/ui/viewmodels/InboxViewModel.kt | 2 +- .../ui/viewmodels/MainActivityViewModel.kt | 6 +- .../ui/viewmodels/MainUserViewModel.kt | 2 +- .../ui/viewmodels/NotificationsViewModel.kt | 4 +- .../habitica/ui/viewmodels/PartyViewModel.kt | 4 +- .../habitica/ui/viewmodels/StableViewModel.kt | 4 +- .../habitica/ui/viewmodels/TasksViewModel.kt | 2 +- .../equipment/EquipmentOverviewViewModel.kt | 2 +- .../ui/views/dialogs/PetSuggestHatchDialog.kt | 2 +- .../InsufficientGemsDialog.kt | 2 +- .../habitica/ui/views/shops/PurchaseDialog.kt | 4 +- .../ui/views/social/QuestProgressView.kt | 2 +- .../ui/views/stats/BulkAllocateStatsDialog.kt | 4 +- .../ui/views/tasks/TaskFilterDialog.kt | 2 +- .../views/yesterdailies/YesterdailyDialog.kt | 4 +- .../utils/CustomizationDeserializer.kt | 2 +- .../habitica/utils/SkillDeserializer.kt | 3 - .../widget/AvatarStatsWidgetProvider.kt | 2 +- .../widget/HabitButtonWidgetProvider.kt | 2 +- .../widget/HabitButtonWidgetService.kt | 2 +- .../habitica/widget/TaskListFactory.kt | 2 +- .../habitica/widget/TaskListWidgetProvider.kt | 2 +- .../habitica/ReleaseDeveloperModule.kt | 2 +- .../habitica/proxy/AnalyticsManagerImpl.kt | 1 + .../habitica/helpers/NumberAbbreviatorTest.kt | 64 ++++++++---------- .../habitica/utils/DateDeserializerTest.kt | 18 +---- build.gradle | 2 +- .../habitica/extensions/Base-Extensions.kt | 2 +- .../habitica/helpers}/AnalyticsManager.kt | 2 +- .../habitica/helpers/ExceptionHandler.kt | 9 ++- .../habitica/helpers/NumberAbbreviator.kt | 9 ++- version.properties | 2 +- 137 files changed, 237 insertions(+), 241 deletions(-) create mode 100644 Habitica/res/drawable/ic_launcher_monochrome.xml delete mode 100644 Habitica/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 Habitica/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 Habitica/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 Habitica/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/extensions/Base-Extensions.kt (87%) rename {Habitica/src/main/java/com/habitrpg/android/habitica/proxy => common/src/main/java/com/habitrpg/common/habitica/helpers}/AnalyticsManager.kt (86%) rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/helpers/ExceptionHandler.kt (86%) diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 3427583b4..a7962ee36 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -17,7 +17,7 @@ android:name=".HabiticaApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/MainAppTheme" android:fullBackupContent="@xml/backup_descriptor" diff --git a/Habitica/build.gradle b/Habitica/build.gradle index a2af3749d..d59eefc20 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -7,6 +7,8 @@ plugins { id 'com.google.firebase.crashlytics' id 'androidx.navigation.safeargs' id 'com.google.firebase.firebase-perf' + + id 'jacoco-report-aggregation' } apply plugin: 'kotlin-android' @@ -16,7 +18,6 @@ repositories { mavenLocal() mavenCentral() google() - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://jitpack.io" } } diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro index ff92c0284..b14baf632 100644 --- a/Habitica/proguard-rules.pro +++ b/Habitica/proguard-rules.pro @@ -65,7 +65,7 @@ -keep class io.realm.internal.Keep -keep @io.realm.internal.Keep class * -dontwarn javax.** --keep io.realm.** +-dontwarn io.realm.** #crashlytic -keepattributes SourceFile,LineNumberTable diff --git a/Habitica/res/drawable/ic_launcher_foreground.xml b/Habitica/res/drawable/ic_launcher_foreground.xml index 4fc0d90b9..a481c0d49 100644 --- a/Habitica/res/drawable/ic_launcher_foreground.xml +++ b/Habitica/res/drawable/ic_launcher_foreground.xml @@ -5,14 +5,14 @@ android:viewportHeight="430"> diff --git a/Habitica/res/drawable/ic_launcher_monochrome.xml b/Habitica/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 000000000..a9ff16a44 --- /dev/null +++ b/Habitica/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,12 @@ + + + + diff --git a/Habitica/res/mipmap-anydpi-v26/ic_launcher.xml b/Habitica/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd1f..1413a3145 100644 --- a/Habitica/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/Habitica/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/Habitica/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Habitica/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7353dbd1f..000000000 --- a/Habitica/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/mipmap-hdpi/ic_launcher_round.webp b/Habitica/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index 066112991c1b5761fc8c0c8fa78ba95b33f1a6fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3014 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 ItEfB)0L=HzzW@LL diff --git a/Habitica/res/mipmap-mdpi/ic_launcher_round.webp b/Habitica/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index ea8d0062bb608b800bae0567fbf4f7d800d5b99b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1958 zcmV;X2U+-1Nk&GV2LJ$9MM6+kP&iDH2LJ#sFTe{B6^DYf4Vcxx?L7$*F#+-bA4^Bt zHbrvudt$1ds?1-y|4FB-y5|O;n89O~O3diV!xVYCLW!9@9Y9`55%QQyIN+uj7Jj2| zuwZSZmCKv~JCbeHs;I$Tj_$SA69V9q1a1<*kt9ix6yokmt1%oiGhb6?9jWt$d&fK- zjsSp#q_u6^Tb+H^*|u$UHXmU7zF=GZsy^FFCP1qH|L5=A#BAHPZQHhO+qP}nwr$&H z`hLH^|NmUVtZHx7_98!zB_}4eHC9${>0H47Ag`Spc-PYwjkF*!wk?M1A(ZNKIqNB&4eY`tL z+s~I!{aE?#LJ!)9vLng>VA!eZhAMK{F~o{3eX@ z951u=$_dCZ%(`;kU#d(7^5$3%%ZXx+EKY=N!18~_LPTz#vIw>b9#H2W4^A98Vf$a7 z{98%p%2Xl;uK~Ux53r+}<3Fi5`jaMJs^rE?z&GFljt88WLYi6_5w?Z^pQ!|N>py=K z3nBM~3g}ie7CwUoI3E17Pyr=WECjm_TiCP!j;fqO0VP%FmVeoTtW=ATl0%>EenS=l zFsP6lKG83T+_2E;_%BKEMqZ}`bbKTR0G#s0P{ZeDk8Vyt1)`Lmm>fuG1Pw~jxBOY*bPGri^dWy>L?hO4}l*2G5y|xuU7uz zNYf(GW+_Yc#U44Mzb~F#;sjKw)~G+yPyzw0mfmv^V7GP^xOo}T$8D>~S^8hoRDEW)S%QrJD5VlMt z(rf^TA8D3EMwIf}RalSsBrQv?Ql)&&SOaf}XdVJ%iBcu0+?F7X5WjM_W~GFDA4Zh?d-OC*tJze(~uB&_kPVmfQU%*kYV|fFoJCu>tl)l z>0x!Wn^q)Sa#Rlhg92?y+7s6Y84eMRAzG!Rnu`EKlZmuLk0KI8RX!lV0P#Mh=*X59 zd*m)97#U0V3CkLJ!F<5T+S{(!xOWnqQgICWS~G##coyqZT%{qv?$J*R_h~_h)tZ7N zS(JZDQEAtMzpoTPvR~A!_K-;In15g%vK$<5{W<=HE++Yq+7f`p@)u?5_Ji-5b=*6&GS3vdEx3r6j_?zaGx=)+K|T&=>|Tda}$S1xHD zFk7-!PwwKn2p?zC)2_@yT;Afibb~RHthWmS35X8e4q?^ckArBg^6egR^a^5w?-KP? zjVSBlw)$D#K+73qIsBIX;8_0R=xcf3zJ1G5eE@X*f6oc1D}N7q*-luMqkbS@)Y?s# zj^G{z!#+3pd$V+(tlkIyE-Wzp-qh9AKLd(A+6@lrSADI3R7-#+5Y^`M{72pTuRYIhJ2sZ$MbnxDL=Kwh^s4OT1C8Gwh!JR5Uk44Y?~7h3HSv1 zzE9JzsGT;ojfbUVy&NSw*_867R=NA~KB;8;ZsLv~2@L-}$giRU%g{+c`}a11ksd}a sz3;~Xz24@5$Gc|lxc%>;&QPL*?diLBJ0B2`38=T`Kj^%hpSEZi0IsySb^rhX diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 618438ce0427194bf358a117e87f1db43181146f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4272 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 SBqXD#TyEr5E=Q5{FNOfK`ba?l diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index c56f1c90fdfb4a6d846406e0f187b1c7e397f7c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6630 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 diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 0f31f5c5016eae64188e7a2ae9809cf354399421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9132 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 #4cfedead #D9784A00 - #331960 + #5A2CC8 + #E0D3FF @color/content_background_offset @color/window_background @color/offset_background_30 diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt index 9e8e1d5d7..a18aac87d 100644 --- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt +++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt @@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.TutorialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.NotificationsManager import com.habitrpg.android.habitica.helpers.SoundManager @@ -26,7 +26,7 @@ import com.habitrpg.android.habitica.models.inventory.Food import com.habitrpg.android.habitica.models.inventory.HatchingPotion import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.common.habitica.api.HostConfig import com.kaspersky.kaspresso.testcases.api.testcase.TestCase diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt index e74b86c68..7cf1e5e41 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt @@ -28,12 +28,12 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.helpers.AdHandler import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager import com.habitrpg.android.habitica.modules.UserModule import com.habitrpg.android.habitica.modules.UserRepositoryModule -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.activities.BaseActivity import com.habitrpg.android.habitica.ui.activities.LoginActivity import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt index f3cdc6de4..9e47c31bb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt @@ -35,7 +35,7 @@ import com.habitrpg.android.habitica.models.tasks.TaskList import com.habitrpg.android.habitica.models.user.Items import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.common.habitica.api.HostConfig import com.habitrpg.common.habitica.api.Server import com.habitrpg.common.habitica.models.HabitResponse diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt index d8f8b7ace..7ce52a29d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt @@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.local.TaskLocalRepository import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor import com.habitrpg.android.habitica.models.BaseMainObject import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData @@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.models.tasks.TaskList import com.habitrpg.android.habitica.models.user.OwnedItem import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.shared.habitica.models.responses.TaskDirection import com.habitrpg.shared.habitica.models.responses.TaskDirectionData import com.habitrpg.shared.habitica.models.responses.TaskScoringResult diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt index e8dcbb83b..6898f3796 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt @@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.models.user.UserQuestStatus -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.shared.habitica.models.responses.TaskDirection import com.habitrpg.shared.habitica.models.tasks.Attribute import kotlinx.coroutines.Dispatchers diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt index e2d93b8f8..c5750c7a1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt @@ -18,7 +18,7 @@ import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.crashlytics.FirebaseCrashlytics import com.habitrpg.android.habitica.BuildConfig -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import java.io.UnsupportedEncodingException import java.security.MessageDigest import java.util.Date diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt index 281284427..f4100dcbd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt @@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion import com.habitrpg.android.habitica.models.promotions.HabiticaWebPromotion import com.habitrpg.android.habitica.models.promotions.getHabiticaPromotionFromKey import com.habitrpg.common.habitica.helpers.AppTestingLevel +import com.habitrpg.common.habitica.helpers.launchCatching import kotlinx.coroutines.MainScope import java.util.Date diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt index 2cd1f0186..0ff9f64a0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt @@ -4,6 +4,7 @@ import android.content.Context import androidx.core.app.NotificationManagerCompat import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.models.tasks.Task +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.models.Notification import kotlinx.coroutines.MainScope import kotlinx.coroutines.channels.Channel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt index 4b9428fe7..bc7918826 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt @@ -28,10 +28,12 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.extensions.addOkButton import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.android.habitica.proxy.AnalyticsManager import com.habitrpg.android.habitica.ui.activities.PurchaseActivity import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog +import com.habitrpg.common.habitica.helpers.AnalyticsManager +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.models.IAPGift import com.habitrpg.common.habitica.models.PurchaseValidationRequest import com.habitrpg.common.habitica.models.Transaction diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt index c715886b1..4402b52a1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt @@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.helpers import android.media.AudioAttributes import android.media.AudioManager import android.media.MediaPlayer +import com.habitrpg.common.habitica.helpers.ExceptionHandler import java.io.File class SoundFile(val theme: String, private val fileName: String) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt index 4eba474b2..0822bb3b9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.helpers import com.habitrpg.android.habitica.HabiticaBaseApplication +import com.habitrpg.common.habitica.helpers.launchCatching import kotlinx.coroutines.MainScope import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt index 87d6f97b6..0cc212d17 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt @@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.models.tasks.RemindersItem import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.receivers.NotificationPublisher import com.habitrpg.android.habitica.receivers.TaskReceiver +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.shared.habitica.HLogger import com.habitrpg.shared.habitica.LogLevel import com.habitrpg.shared.habitica.models.tasks.TaskType @@ -21,7 +22,6 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.launch -import java.lang.IllegalStateException import java.time.ZoneId import java.time.ZonedDateTime import java.time.format.DateTimeFormatter diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt index b3997c0d5..1778bd16d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt @@ -8,7 +8,7 @@ import com.google.firebase.messaging.FirebaseMessaging import com.google.firebase.messaging.RemoteMessage import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import kotlinx.coroutines.MainScope import java.io.IOException diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt index 6739c4ab2..ad91b2982 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt @@ -7,7 +7,7 @@ import android.view.View import android.widget.FrameLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.InventoryRepository -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Egg import com.habitrpg.android.habitica.models.inventory.HatchingPotion import com.habitrpg.android.habitica.models.user.Items diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt index 00910fddb..a9c49ddac 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt @@ -5,7 +5,7 @@ import android.view.ViewGroup import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding import com.habitrpg.android.habitica.helpers.SoundManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.BaseActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt index 003835bc4..5f1b2e51a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt @@ -7,7 +7,7 @@ import android.widget.TextView import androidx.lifecycle.LifecycleCoroutineScope import com.google.firebase.analytics.FirebaseAnalytics import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.SnackbarActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt index eb205c3e7..996d19b54 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt @@ -5,7 +5,7 @@ import android.os.Parcelable import android.text.Spanned import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.BaseMainObject import com.habitrpg.android.habitica.models.Tag import com.habitrpg.common.habitica.helpers.MarkdownParser diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt index 56d23b7f7..3230215d7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt @@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.data.implementation.ApiClientImpl import com.habitrpg.android.habitica.data.implementation.ApiClientImpl.Companion.createGsonFactory import com.habitrpg.android.habitica.helpers.MainNotificationsManager import com.habitrpg.android.habitica.helpers.NotificationsManager -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.common.habitica.api.HostConfig import com.habitrpg.common.habitica.helpers.KeyHelper import dagger.Module diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt index a03f27757..ffe6eafe2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt @@ -1,7 +1,7 @@ package com.habitrpg.android.habitica.modules import android.content.Context -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.proxy.implementation.EmptyAnalyticsManager import dagger.Module import dagger.Provides diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt index 192f8ddbb..0af820513 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt @@ -43,7 +43,7 @@ import com.habitrpg.android.habitica.data.local.implementation.RealmUserLocalRep import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.UserScope -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import dagger.Module import dagger.Provides diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyAnalyticsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyAnalyticsManager.kt index 3fb0f220f..16a7b1942 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyAnalyticsManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyAnalyticsManager.kt @@ -1,7 +1,7 @@ package com.habitrpg.android.habitica.proxy.implementation import android.os.Bundle -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager class EmptyAnalyticsManager : AnalyticsManager { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt index 4e8662a2d..0b9928277 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt @@ -14,8 +14,8 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.NotifyUserUseCase import com.habitrpg.android.habitica.models.user.User import kotlinx.coroutines.MainScope diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt index 979a5323e..2a17d21f0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt @@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.extensions.withImmutableFlag import com.habitrpg.android.habitica.helpers.TaskAlarmManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.shared.habitica.models.tasks.TaskType import kotlinx.coroutines.MainScope diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt index cb66c792e..4ad3d93f9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.SharedPreferences import com.habitrpg.android.habitica.HabiticaBaseApplication -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.TaskAlarmManager import com.habitrpg.shared.habitica.HLogger import com.habitrpg.shared.habitica.LogLevel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt index b5dfbebb6..4b75dc7ec 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt @@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.extensions.withImmutableFlag -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.TaskAlarmManager import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.activities.MainActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt index 3b336f695..667c72136 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt @@ -17,8 +17,8 @@ import com.habitrpg.android.habitica.databinding.ActivityArmoireBinding import com.habitrpg.android.habitica.helpers.AdHandler import com.habitrpg.android.habitica.helpers.AdType import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.ads.AdButton import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt index 0bae9ffa2..8541b04e0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt @@ -26,11 +26,11 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.extensions.forceLocale import com.habitrpg.android.habitica.extensions.updateStatusBarColor -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.NotificationsManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.ShowNotificationInteractor -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.common.habitica.extensions.getThemeColor diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt index 3e8107b13..861663e22 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt @@ -66,7 +66,7 @@ import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.PurchaseHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.theme.HabiticaTheme import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.CurrencyText diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt index d592ccc02..7b2220ba8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt @@ -23,9 +23,9 @@ import com.habitrpg.android.habitica.data.ChallengeRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivityCreateChallengeBinding import com.habitrpg.android.habitica.extensions.addCloseButton -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt index 5011641e4..7e95accce 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt @@ -13,7 +13,7 @@ import androidx.navigation.navArgs import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.user.Gear import com.habitrpg.android.habitica.models.user.Items import com.habitrpg.android.habitica.models.user.Outfit 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 01d54b90c..c140225d5 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 @@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.extensions.observeOnce import com.habitrpg.android.habitica.helpers.AdHandler import com.habitrpg.android.habitica.helpers.AdType import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index 35ef062fe..23abafe67 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -28,10 +28,10 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding import com.habitrpg.android.habitica.extensions.addCancelButton -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.UserStatComputer -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.Achievement import com.habitrpg.android.habitica.models.inventory.Equipment import com.habitrpg.android.habitica.models.members.Member diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt index a894a2d8c..eb0e008e2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt @@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivityGiftGemsBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt index aec5804be..d33539189 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivityGiftSubscriptionBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt index 99e4c2e17..c0cb54434 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt @@ -5,7 +5,7 @@ import android.view.MenuItem import android.widget.TextView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.common.habitica.helpers.setMarkdown import okhttp3.Call import okhttp3.Callback diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt index 10f111e5f..d716a6317 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt @@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.databinding.WidgetConfigureHabitButtonBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt index 1d1786216..982726e5c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt @@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.databinding.ActivityIntroBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment import com.viewpagerindicator.IconPagerAdapter import kotlinx.coroutines.launch diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt index cc50a6a77..ae2df685d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt @@ -40,8 +40,8 @@ import com.habitrpg.android.habitica.extensions.addOkButton import com.habitrpg.android.habitica.extensions.updateStatusBarColor import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.viewmodels.AuthenticationViewModel import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 9b5e4291e..49fd9f5d4 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -40,11 +40,11 @@ import com.habitrpg.android.habitica.extensions.observeOnce import com.habitrpg.android.habitica.extensions.updateStatusBarColor import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.NotificationOpenHandler import com.habitrpg.android.habitica.helpers.SoundManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase import com.habitrpg.android.habitica.interactors.NotifyUserUseCase diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt index 4dea75377..d5fd83378 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.api.MaintenanceApiService import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.helpers.setMarkdown import javax.inject.Inject 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 932596d87..de0cff1f7 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,8 +19,8 @@ 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.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt index a8bf5a798..2656e4087 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivityReportMessageBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.common.habitica.extensions.getThemeColor import com.habitrpg.common.habitica.helpers.setMarkdown diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt index e2f5d7335..28f1d1b78 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt @@ -24,8 +24,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.databinding.ActivitySetupBinding import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt index 1fe0effb4..9e61b052d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt @@ -10,8 +10,8 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.ActivitySkillMembersBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import kotlinx.coroutines.flow.filterNotNull diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt index c0f7d2b4b..3a7412d7b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt @@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.models.tasks.Task -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt index 877a63b23..574786e49 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt @@ -16,8 +16,8 @@ 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.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import kotlinx.coroutines.flow.combine diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt index 8b895d801..93d4dbd85 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TutorialRepository import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.activities.MainActivity import kotlinx.coroutines.delay import kotlinx.coroutines.flow.firstOrNull diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt index df1c81f81..9203476cf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt @@ -10,8 +10,8 @@ import androidx.viewbinding.ViewBinding import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TutorialRepository -import com.habitrpg.android.habitica.helpers.launchCatching -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.activities.MainActivity import kotlinx.coroutines.delay import kotlinx.coroutines.flow.firstOrNull diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index a0adace45..fe871c85c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -31,7 +31,7 @@ import com.habitrpg.android.habitica.extensions.getRemainingString import com.habitrpg.android.habitica.extensions.getShortRemainingString import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.WorldStateEvent import com.habitrpg.android.habitica.models.inventory.Item import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt index 1d8fca78d..482619dfb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentNewsBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import kotlinx.coroutines.launch diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index 6476bd335..5ba41f2b8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.databinding.FragmentStatsBinding import com.habitrpg.android.habitica.extensions.addOkButton import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.helpers.UserStatComputer -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt index 535b94d0b..f80c0b4f5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt @@ -26,8 +26,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.BottomSheetBackgroundsFilterBinding import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.setTintWith -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.CustomizationFilter import com.habitrpg.android.habitica.models.inventory.Customization import com.habitrpg.android.habitica.models.user.OwnedCustomization diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt index 0cf20bc45..657aefb24 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt @@ -11,8 +11,8 @@ 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.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerViewAdapter import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt index 11442bb39..d1ca2bfef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt @@ -28,7 +28,7 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Equipment import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.theme.HabiticaTheme diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt index 0f6e84cfc..7dac4668b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt @@ -12,9 +12,9 @@ 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.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt index 9c627970d..19ef469e5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt @@ -14,9 +14,9 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentItemsDialogBinding import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.extensions.observeOnce -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.FeedPetUseCase import com.habitrpg.android.habitica.interactors.HatchPetUseCase import com.habitrpg.android.habitica.models.inventory.Egg diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index d65d31f19..e0da6a569 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -18,9 +18,9 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentItemsBinding import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.extensions.observeOnce -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.HatchPetUseCase import com.habitrpg.android.habitica.models.inventory.Egg import com.habitrpg.android.habitica.models.inventory.Food diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt index 035967b01..59a5bcf7b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt @@ -18,8 +18,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.shops.Shop import com.habitrpg.android.habitica.models.shops.ShopCategory import com.habitrpg.android.habitica.models.shops.ShopItem diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt index 86e3f7116..0a9ef641a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt @@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.getTranslatedType -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Mount import com.habitrpg.android.habitica.models.inventory.StableSection import com.habitrpg.android.habitica.models.user.OwnedMount diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt index 426a45d22..cadb2dd35 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt @@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.getTranslatedType -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.FeedPetUseCase import com.habitrpg.android.habitica.models.inventory.Egg import com.habitrpg.android.habitica.models.inventory.Food diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt index 2b882f2a1..7ed27a5ec 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt @@ -14,8 +14,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Egg import com.habitrpg.android.habitica.models.inventory.HatchingPotion import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt index b4e1149dc..7606b114b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt @@ -24,9 +24,9 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.extensions.addCloseButton -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity import com.habitrpg.android.habitica.ui.fragments.preferences.HabiticaAccountDialog.AccountUpdateConfirmed diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt index a1e6f0603..77c1eb74b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle import androidx.lifecycle.lifecycleScope import androidx.preference.CheckBoxPreference import com.habitrpg.android.habitica.HabiticaBaseApplication -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt index d0e6d0f3e..39168cd56 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt @@ -22,10 +22,10 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.SoundManager import com.habitrpg.android.habitica.helpers.TaskAlarmManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.prefs.TimePreference diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt index 702fc6270..d0014e4b5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle import androidx.lifecycle.lifecycleScope import androidx.preference.CheckBoxPreference import com.habitrpg.android.habitica.HabiticaBaseApplication -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt index 3e865b2ee..4da297433 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt @@ -21,10 +21,10 @@ import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.promotions.PromoType import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt index ac78413e9..7c75d5fe1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt @@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentGiftGemBalanceBinding import com.habitrpg.android.habitica.extensions.addCloseButton -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt index 0da43f1bd..649c738bc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt @@ -9,7 +9,7 @@ import com.android.billingclient.api.ProductDetails import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentGiftGemPurchaseBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes import com.habitrpg.android.habitica.models.members.Member diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt index 73ce9413b..b1aec4472 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt @@ -23,10 +23,10 @@ import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity import com.habitrpg.android.habitica.ui.fragments.BaseFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt index a9f3df468..24a484814 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.SetupCustomizationRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.SetupCustomization import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.SetupActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt index a196ddb15..b061b501f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt @@ -14,8 +14,8 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import kotlinx.coroutines.flow.MutableStateFlow diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt index 6b7652bb6..08862f520 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.Skill import com.habitrpg.android.habitica.models.responses.SkillResponse import com.habitrpg.android.habitica.models.user.User diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt index 481b8db69..9b6c13593 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt @@ -21,9 +21,9 @@ import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding import com.habitrpg.android.habitica.extensions.addOkButton import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.ui.activities.FullProfileActivity import com.habitrpg.android.habitica.ui.activities.MainActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt index e9e26ebe3..a2f426e27 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt @@ -18,9 +18,9 @@ import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBin import com.habitrpg.android.habitica.databinding.FragmentInboxBinding import com.habitrpg.android.habitica.extensions.getAgoString import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.social.InboxConversation import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard 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 7f77f975a..fb082766e 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,9 +16,9 @@ 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.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.HapticFeedbackManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.members.Member diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt index d7ce2dbd1..3b83bbd9f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt @@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentTavernDetailBinding import com.habitrpg.android.habitica.extensions.setTintWith import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.social.Group diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt index d18ba1094..2e3489961 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt @@ -20,9 +20,9 @@ import com.habitrpg.android.habitica.databinding.DialogChallengeDetailTaskGroupB import com.habitrpg.android.habitica.databinding.FragmentChallengeDetailBinding import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.extensions.inflate -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt index 20c054f57..1ae009d3e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt @@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.data.ChallengeRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.modules.AppModule diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt index 4559e8305..0bf5374af 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt @@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentGuildDetailBinding import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.social.Group diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt index 14434335d..46eabaebe 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt @@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.adapter.social.GuildListAdapter import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt index b3bfb27cb..62ec78a28 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt @@ -24,9 +24,9 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.activities.GroupFormActivity import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt index 2906003d5..5ff71a749 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt @@ -18,10 +18,10 @@ import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentPartyDetailBinding import com.habitrpg.android.habitica.extensions.inflate -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.HapticFeedbackManager import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.Challenge diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt index bddbfc9a6..a2bb57faf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding import com.habitrpg.android.habitica.databinding.KnownIssueBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt index 50140e9c0..d30695d38 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt @@ -9,7 +9,7 @@ import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.FAQRepository import com.habitrpg.android.habitica.databinding.FragmentFaqDetailBinding -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.common.habitica.helpers.MarkdownParser import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt index d8340930e..69153d553 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt @@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.data.FAQRepository import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.common.habitica.extensions.layoutInflater diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt index 20fdf5bef..8f2e00a6b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt @@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.FAQRepository import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt index 1070b6798..d8e09017d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.shops.ShopItem import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt index 16d936e89..d1eb17909 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt @@ -23,12 +23,12 @@ import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBind import com.habitrpg.android.habitica.extensions.observeOnce import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.HapticFeedbackManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.NotificationsManager import com.habitrpg.android.habitica.helpers.SoundManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.tasks.ChecklistItem import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.activities.MainActivity diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt index cfa976006..0d22c842b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt @@ -27,7 +27,7 @@ import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.extensions.setTintWith import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.ui.activities.TaskFormActivity import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt index 8f0cdbadd..ce15b0494 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt @@ -26,8 +26,8 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.helpers.SignInWithAppleResult import com.habitrpg.android.habitica.helpers.SignInWithAppleService -import com.habitrpg.android.habitica.helpers.launchCatching -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.common.habitica.api.HostConfig import com.habitrpg.common.habitica.helpers.KeyHelper diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt index f54e5b2dc..3f2bc9c0a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.user.User import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt index ebe36681f..d82a88de4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt @@ -8,10 +8,10 @@ import androidx.lifecycle.viewModelScope import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ChallengeRepository import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.NotificationsManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.social.ChatMessage diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt index a0b06d3f0..a4e24c931 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt @@ -12,7 +12,7 @@ import androidx.paging.PositionalDataSource import androidx.paging.toLiveData import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.ChatMessage import io.realm.kotlin.toFlow diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt index cf91f1858..e20e0ac3f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt @@ -11,13 +11,13 @@ import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.TaskAlarmManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager import com.habitrpg.android.habitica.models.TutorialStep import com.habitrpg.android.habitica.models.inventory.Egg -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.ui.TutorialView import com.habitrpg.common.habitica.api.HostConfig import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt index 841245b55..cda059237 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.asLiveData import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.TeamPlan import com.habitrpg.android.habitica.models.invitations.PartyInvite import com.habitrpg.android.habitica.models.members.Member diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt index 1d313468c..87415d022 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt @@ -6,10 +6,10 @@ import androidx.lifecycle.viewModelScope import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.NotificationsManager -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.social.UserParty import com.habitrpg.android.habitica.models.user.User import com.habitrpg.common.habitica.models.Notification diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt index e00498adc..f2d97de66 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt @@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.ui.viewmodels import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import com.habitrpg.android.habitica.components.UserComponent -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.flatMapLatest diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt index c6ff664f7..3261e8723 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt @@ -11,8 +11,8 @@ 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.extensions.getTranslatedType -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Animal import com.habitrpg.android.habitica.models.inventory.Egg import com.habitrpg.android.habitica.models.inventory.Mount diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt index 89dbc90df..b5f734fc9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt @@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.data.TagRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider import com.habitrpg.android.habitica.models.TeamPlan import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt index 31133d63f..19385f257 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt @@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment import androidx.lifecycle.viewModelScope import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Equipment import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt index 468bed602..5fdc03fbc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogHatchPetButtonBinding import com.habitrpg.android.habitica.databinding.DialogPetSuggestHatchBinding -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.interactors.HatchPetUseCase import com.habitrpg.android.habitica.models.inventory.Animal import com.habitrpg.android.habitica.models.inventory.Egg diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt index 9d6ba381e..b8b09e86c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt index 33a3ea120..66c76f9bd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt @@ -21,10 +21,10 @@ import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.extensions.getShortRemainingString import com.habitrpg.android.habitica.helpers.AppConfigManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.HapticFeedbackManager import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.shops.Shop import com.habitrpg.android.habitica.models.shops.ShopItem import com.habitrpg.android.habitica.models.user.OwnedItem diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt index 3c99a4369..c3304b5df 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt @@ -19,7 +19,7 @@ import androidx.core.graphics.drawable.toBitmap import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.QuestCollectBinding import com.habitrpg.android.habitica.databinding.QuestProgressBinding -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt index 056e47016..4bd065d70 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt @@ -10,8 +10,8 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.DialogBulkAllocateBinding -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.extensions.getThemeColor import com.habitrpg.common.habitica.extensions.layoutInflater import kotlinx.coroutines.MainScope diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt index 36690646c..9162a1518 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt @@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.data.TagRepository import com.habitrpg.android.habitica.databinding.DialogTaskFilterBinding import com.habitrpg.android.habitica.databinding.EditTagItemBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.Tag import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt index dee96c21c..9c20ea331 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt @@ -14,8 +14,8 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.helpers.AmplitudeManager -import com.habitrpg.android.habitica.helpers.ExceptionHandler -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.tasks.ChecklistItem import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt index 0dcea3e7d..949459a10 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt @@ -5,7 +5,7 @@ import com.google.gson.JsonDeserializer import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonParseException -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.inventory.Customization import io.realm.Realm import io.realm.RealmList diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt index 3a669730d..923e83ed9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt @@ -7,9 +7,6 @@ import com.google.gson.JsonParseException import com.habitrpg.android.habitica.models.Skill import java.lang.reflect.Type -/** - * Created by viirus on 25/11/15. - */ class SkillDeserializer : JsonDeserializer> { @Throws(JsonParseException::class) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt index 05212ec49..d660bc611 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt @@ -11,7 +11,7 @@ import android.widget.RemoteViews import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.withImmutableFlag -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt index 2684fd174..f03306d11 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt @@ -8,7 +8,7 @@ import android.widget.RemoteViews import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.shared.habitica.models.responses.TaskDirection import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.firstOrNull diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt index c4ee5e4c2..6f2a8e705 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt @@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.extensions.withImmutableFlag -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.common.habitica.helpers.MarkdownParser import com.habitrpg.shared.habitica.models.responses.TaskDirection diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt index b3269f2f8..b088f1a08 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt @@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.common.habitica.helpers.MarkdownParser import com.habitrpg.shared.habitica.models.tasks.TaskType diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt index 72bda08f9..d920c48ab 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt @@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.extensions.withImmutableFlag import com.habitrpg.android.habitica.extensions.withMutableFlag -import com.habitrpg.android.habitica.helpers.ExceptionHandler +import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.ui.activities.MainActivity import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.firstOrNull diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt index 4805b5f74..aa1742cc3 100644 --- a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt +++ b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt @@ -2,7 +2,7 @@ package com.habitrpg.android.habitica import android.content.Context import com.habitrpg.android.habitica.modules.DeveloperModule -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager import com.habitrpg.android.habitica.proxy.AnalyticsManagerImpl class ReleaseDeveloperModule : DeveloperModule() { diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt index 9faf96f41..6f957f2e3 100644 --- a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt +++ b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt @@ -5,6 +5,7 @@ import android.os.Bundle import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.crashlytics.FirebaseCrashlytics import com.habitrpg.android.habitica.helpers.AmplitudeManager +import com.habitrpg.common.habitica.helpers.AnalyticsManager class AnalyticsManagerImpl(context: Context) : AnalyticsManager { diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt index 136c8a23a..a932b70ef 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.kt @@ -4,6 +4,7 @@ import android.content.Context import com.habitrpg.android.habitica.R import com.habitrpg.common.habitica.helpers.NumberAbbreviator.abbreviate import io.kotest.core.spec.style.StringSpec +import io.kotest.datatest.withData import io.kotest.matchers.shouldBe import io.mockk.clearMocks import io.mockk.every @@ -12,50 +13,39 @@ import java.util.Locale class NumberAbbreviatorTest : StringSpec({ val mockContext = mockk() - beforeEach { + beforeSpec { Locale.setDefault(Locale.US) every { mockContext.getString(R.string.thousand_abbrev) } returns "k" every { mockContext.getString(R.string.million_abbrev) } returns "m" every { mockContext.getString(R.string.billion_abbrev) } returns "b" every { mockContext.getString(R.string.trillion_abbrev) } returns "t" + every { mockContext.getString(R.string.quadrillion_abbrev) } returns "q" } - "should not abbreviate small numbers" { - abbreviate(mockContext, 215.0, 2) shouldBe "215" - abbreviate(mockContext, 2.05, 2) shouldBe "2.05" + withData( + Triple(215.0, "215", 2), + Triple(2.05, "2.05", 2), + Triple(5.406, "5.4", 2), + Triple(-20.42, "-20.42", 2), + Triple(2550.0, "2.55k", 2), + Triple(-1020.42, "-1.02k", 2), + Triple(9990000.0, "9.99m", 2), + Triple(1990000000.0, "1.99b", 2), + Triple(1990000000000.0, "1.99t", 2), + Triple(-1990000000.42, "-1.99b", 2), + Triple(1000.0, "1k", 2), + Triple(1500.0, "1.5k", 2), + Triple(1500.0, "1k", 0), + Triple(-1302.42, "-1.3k", 2), + Triple(9999.0, "9.99k", 2), + Triple(-20.42, "-20", 0), + Triple(40.2412, "40", 0), + Triple(0.5, "0.5", 0), + Triple(0.328, "0.32", 0), + Triple(-0.99, "-0.99", 0) + ) { (input, output, decimals) -> + abbreviate(mockContext, input, decimals) shouldBe output } - "should abbreviate thousands" { - abbreviate(mockContext, 1550.0, 2) shouldBe "1.55k" - } - - "should abbreviate millions" { - abbreviate(mockContext, 9990000.0, 2) shouldBe "9.99m" - } - - "should abbreviate billions" { - abbreviate(mockContext, 1990000000.0, 2) shouldBe "1.99b" - } - - "should abbreviate trillions" { - abbreviate(mockContext, 1990000000000.0, 2) shouldBe "1.99t" - } - - "should abbreviate thousands without additional decimals" { - abbreviate(mockContext, 1000.0, 2) shouldBe "1k" - abbreviate(mockContext, 1500.0, 2) shouldBe "1.5k" - abbreviate(mockContext, 1500.0, 0) shouldBe "1k" - } - - "should round correctly" { - abbreviate(mockContext, 9999.0, 2) shouldBe "9.99k" - } - - "should force decimals for numbers between -1 and 1" { - abbreviate(mockContext, 0.5, 0) shouldBe "0.5" - abbreviate(mockContext, 0.3248, 0) shouldBe "0.32" - abbreviate(mockContext, -0.99, 0) shouldBe "-0.99" - } - - afterEach { clearMocks(mockContext) } + afterSpec { clearMocks(mockContext) } }) diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt index a730571ee..73eae5a80 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt @@ -6,25 +6,13 @@ import com.google.gson.JsonPrimitive import com.google.gson.JsonSerializationContext import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.shouldBe -import java.lang.reflect.Type +import io.mockk.mockk import java.util.Date class DateDeserializerTest : WordSpec({ val deserializer = DateDeserializer() - val deserializationContext = object : JsonDeserializationContext { - override fun deserialize(json: JsonElement, typeOfT: Type): T? { - return null - } - } - val serializationContext = object : JsonSerializationContext { - override fun serialize(src: Any): JsonElement? { - return null - } - - override fun serialize(src: Any, typeOfSrc: Type): JsonElement? { - return null - } - } + val deserializationContext: JsonDeserializationContext = mockk(relaxed = true) + val serializationContext: JsonSerializationContext = mockk(relaxed = true) val referenceTimestamp: Long = 1443445200000 "deserialize" should { diff --git a/build.gradle b/build.gradle index a72bb46a5..0c5408e6a 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.4.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.google.gms:google-services:4.3.15' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4' classpath "io.realm:realm-gradle-plugin:10.11.0" classpath("io.realm.kotlin:gradle-plugin:$realm_version") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/Base-Extensions.kt similarity index 87% rename from Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt rename to common/src/main/java/com/habitrpg/common/habitica/extensions/Base-Extensions.kt index d2514ac9c..651c60e54 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Base-Extensions.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/Base-Extensions.kt @@ -1,6 +1,6 @@ package com.habitrpg.android.habitica.extensions -import com.habitrpg.android.habitica.helpers.launchCatching +import com.habitrpg.common.habitica.helpers.launchCatching import kotlinx.coroutines.MainScope import kotlinx.coroutines.delay import kotlin.time.DurationUnit diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/AnalyticsManager.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/AnalyticsManager.kt similarity index 86% rename from Habitica/src/main/java/com/habitrpg/android/habitica/proxy/AnalyticsManager.kt rename to common/src/main/java/com/habitrpg/common/habitica/helpers/AnalyticsManager.kt index 8bd54c8f9..f303bb1ae 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/AnalyticsManager.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/AnalyticsManager.kt @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.proxy +package com.habitrpg.common.habitica.helpers import android.os.Bundle diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt similarity index 86% rename from Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt rename to common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt index 2a3b0c0a2..6782352b7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt @@ -1,13 +1,12 @@ -package com.habitrpg.android.habitica.helpers +package com.habitrpg.common.habitica.helpers import android.util.Log -import com.habitrpg.android.habitica.BuildConfig -import com.habitrpg.android.habitica.proxy.AnalyticsManager +import coil.network.HttpException +import com.habitrpg.common.habitica.BuildConfig import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import retrofit2.HttpException import java.io.IOException class ExceptionHandler { @@ -17,7 +16,7 @@ class ExceptionHandler { private var instance = ExceptionHandler() - fun init(analyticsManager: AnalyticsManager) { + fun init(analyticsManager: AnalyticsManager? = null) { instance.analyticsManager = analyticsManager } diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt index 42e9b25dc..889034a90 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt @@ -4,6 +4,7 @@ import android.content.Context import com.habitrpg.common.habitica.R import java.math.RoundingMode import java.text.DecimalFormat +import kotlin.math.abs object NumberAbbreviator { @@ -13,9 +14,10 @@ object NumberAbbreviator { fun abbreviate(context: Context?, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String { val decimalCount = if (number != 0.0 && number > -1 && number < 1 && numberOfDecimals == 0) 2 else numberOfDecimals - var usedNumber = number + val absNumber = abs(number) + var usedNumber = absNumber var counter = 0 - while (usedNumber >= 1000 && number >= minForAbbrevation) { + while (usedNumber >= 1000 && absNumber >= minForAbbrevation) { counter++ usedNumber /= 1000 } @@ -23,6 +25,9 @@ object NumberAbbreviator { if (decimalCount > 0) { pattern = ("$pattern.").padEnd(4 + decimalCount, '#') } + if (number < 0) { + pattern = "-$pattern" + } val formatter = DecimalFormat( pattern + abbreviationForCounter(context, counter) .replace(".", "") diff --git a/version.properties b/version.properties index 4fbbbb4de..2cb0273e5 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.1.5 -CODE=5291 \ No newline at end of file +CODE=5361 \ No newline at end of file