From d64e07ae514c382866c617d8986403015e713681 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 26 Apr 2019 11:36:10 +0200 Subject: [PATCH] Fix various code style warnings --- .../habitica/HabiticaPurchaseVerifier.java | 4 +-- .../android/habitica/data/UserRepository.kt | 1 - .../implementation/SocialRepositoryImpl.kt | 2 +- .../data/local/SocialLocalRepository.kt | 2 -- .../implementation/RealmFAQLocalRepository.kt | 1 - .../RealmUserLocalRepository.kt | 1 - .../extensions/AlertDialog-Extensions.kt | 27 +++++++-------- .../habitica/extensions/Int-Extensions.kt | 2 +- .../android/habitica/extensions/ViewExt.kt | 3 -- .../habitica/helpers/NavigationManager.kt | 2 -- .../habitica/helpers/QrCodeManager.java | 12 +++---- .../habitica/helpers/RemindersManager.java | 6 ++-- .../habitica/helpers/SoundFileLoader.kt | 2 -- .../android/habitica/helpers/SoundManager.kt | 2 -- .../ChangeUsernameLocalNotification.kt | 3 +- .../GiftOneGetOneLocalNotification.kt | 3 +- .../HabiticaLocalNotification.kt | 2 +- .../QuestBegunLocalNotification.kt | 5 --- .../QuestInviteLocalNotification.kt | 2 -- .../ReceivedGemsGiftLocalNotification.kt | 5 --- ...ReceivedPrivateMessageLocalNotification.kt | 5 --- ...ceivedSubscriptionGiftLocalNotification.kt | 5 --- .../WonChallengeLocalNotification.kt | 4 --- .../habitica/interactors/BuyRewardUseCase.kt | 2 +- .../habitica/interactors/LevelUpUseCase.kt | 13 ++----- .../habitica/interactors/NotifyUserUseCase.kt | 2 +- .../habitica/interactors/TodoCheckUseCase.kt | 2 +- .../habitica/models/inventory/Animal.java | 28 +++++++-------- .../habitica/models/inventory/QuestContent.kt | 2 -- .../android/habitica/models/tasks/Task.kt | 2 +- .../android/habitica/models/user/Items.kt | 10 +----- .../habitica/receivers/TaskReceiver.kt | 8 +---- .../android/habitica/ui/ItemDetailDialog.kt | 2 +- .../habitica/ui/MaxHeightLinearLayout.kt | 3 +- .../habitica/ui/activities/AboutActivity.kt | 6 ++-- .../ui/activities/ClassSelectionActivity.kt | 5 +-- .../ui/activities/GemPurchaseActivity.kt | 2 +- .../habitica/ui/activities/GiftIAPActivity.kt | 2 +- .../activities/HabitButtonWidgetActivity.kt | 6 ++-- .../habitica/ui/activities/IntroActivity.kt | 22 ++++++------ .../habitica/ui/activities/LoginActivity.kt | 16 +++++---- .../ui/activities/PartyInviteActivity.kt | 9 +++-- .../habitica/ui/activities/SetupActivity.kt | 2 +- .../ui/activities/SkillMemberActivity.kt | 4 +-- .../ui/activities/SkillTasksActivity.kt | 4 +-- .../ui/adapter/NavigationDrawerAdapter.kt | 15 ++++---- .../adapter/SkillTasksRecyclerViewAdapter.kt | 2 +- .../ui/adapter/SkillsRecyclerViewAdapter.kt | 4 +-- .../adapter/inventory/ItemRecyclerAdapter.kt | 2 +- .../setup/CustomizationSetupAdapter.kt | 4 +-- .../ui/adapter/setup/TaskSetupAdapter.kt | 4 +-- .../ui/adapter/social/AchievementAdapter.kt | 8 ++--- .../social/ChallengesListViewAdapter.kt | 2 +- .../adapter/social/ChatRecyclerViewAdapter.kt | 8 ++--- .../social/PublicGuildsRecyclerViewAdapter.kt | 10 +++--- .../ChallengeTasksRecyclerViewAdapter.kt | 2 +- .../ChallengesFilterRecyclerViewAdapter.kt | 10 +++--- .../tasks/BaseTasksRecyclerViewAdapter.kt | 2 +- .../habitica/ui/fragments/BaseMainFragment.kt | 9 ++--- .../habitica/ui/fragments/NewsFragment.kt | 3 -- .../AvatarCustomizationFragment.kt | 6 ++-- .../equipment/EquipmentDetailFragment.kt | 4 +-- .../inventory/items/ItemRecyclerFragment.kt | 1 - .../preferences/APIPreferenceFragment.kt | 2 +- .../AuthenticationPreferenceFragment.kt | 6 ++-- .../DayStartPreferenceDialogFragment.kt | 2 +- .../TimePreferenceDialogFragment.kt | 2 +- .../ui/fragments/setup/AvatarSetupFragment.kt | 8 ++--- .../skills/SkillTasksRecyclerViewFragment.kt | 8 ++--- .../ui/fragments/social/ChatListFragment.kt | 12 +++---- .../fragments/social/GuildDetailFragment.kt | 2 +- .../ui/fragments/social/InboxFragment.kt | 5 --- .../fragments/social/PublicGuildsFragment.kt | 2 +- .../fragments/social/TavernDetailFragment.kt | 2 +- .../ui/fragments/social/TavernFragment.kt | 2 +- .../challenges/ChallengeFilterDialogHolder.kt | 4 +-- .../challenges/ChallengeListFragment.kt | 9 ++--- .../challenges/ChallengesOverviewFragment.kt | 8 ++--- .../fragments/social/party/PartyFragment.kt | 6 ++-- .../social/party/PartyMemberListFragment.kt | 1 - .../tasks/RewardsRecyclerviewFragment.kt | 10 +++--- .../tasks/TaskRecyclerViewFragment.kt | 2 +- .../ui/helpers/AutocompleteAdapter.kt | 4 +-- .../helpers/FloatingActionMenuBehavior.java | 2 +- .../habitica/ui/helpers/KeyboardUtil.kt | 3 +- .../habitica/ui/helpers/Kotterknife.kt | 12 +++---- .../habitica/ui/helpers/MarkdownParser.kt | 8 ++--- .../habitica/ui/helpers/NavbarUtils.kt | 11 +++--- .../ui/helpers/RecyclerViewEmptySupport.kt | 4 +-- .../habitica/ui/menu/BottomSheetMenuItem.java | 2 +- .../ui/viewHolders/SectionViewHolder.kt | 2 +- .../ui/viewHolders/ShopItemViewHolder.kt | 2 +- .../viewHolders/tasks/BaseTaskViewHolder.kt | 2 +- .../tasks/ChecklistedViewHolder.kt | 4 +-- .../habitica/ui/viewmodels/BaseViewModel.kt | 5 --- .../habitica/ui/viewmodels/PartyViewModel.kt | 5 --- .../ui/views/CollapsibleSectionView.kt | 2 +- .../android/habitica/ui/views/CurrencyView.kt | 4 +-- .../habitica/ui/views/CurrencyViews.kt | 8 ++--- .../habitica/ui/views/HabiticaIcons.java | 8 ++--- .../habitica/ui/views/HabiticaSnackbar.kt | 8 ++--- .../habitica/ui/views/PaddedLinearLayout.kt | 3 -- .../ui/views/bottombar/BottomBar.java | 4 +-- .../ui/views/bottombar/BottomBarTab.java | 4 +-- .../InsufficientCurrencyDialog.kt | 5 ++- .../InsufficientHourglassesDialog.kt | 4 +-- .../ui/views/login/LoginBackgroundView.kt | 6 ++-- .../habitica/ui/views/login/StarView.kt | 6 ++-- .../habitica/ui/views/shops/PurchaseDialog.kt | 2 +- .../ui/views/shops/PurchaseDialogContent.kt | 2 +- .../views/shops/PurchaseDialogGearContent.kt | 4 +-- .../ui/views/social/OldQuestProgressView.kt | 2 +- .../habitica/ui/views/social/QuestMenuView.kt | 8 ++--- .../ui/views/social/QuestProgressView.kt | 34 +++++++++---------- .../habitica/ui/views/social/UsernameLabel.kt | 4 +-- .../ui/views/stats/BulkAllocateStatsDialog.kt | 8 ++--- .../subscriptions/SubscriptionDetailsView.kt | 1 - .../ui/views/tasks/TaskFilterDialog.kt | 8 ++--- .../tasks/form/HabitResetStreakButtons.kt | 2 +- .../ui/views/tasks/form/ReminderContainer.kt | 5 ++- .../views/tasks/form/ReminderItemFormView.kt | 2 -- .../views/tasks/form/RewardValueFormView.kt | 2 +- .../views/tasks/form/TaskDifficultyButtons.kt | 4 +-- .../tasks/form/TaskSchedulingControls.kt | 10 ++---- .../views/yesterdailies/YesterdailyDialog.kt | 2 +- .../habitica/utils/ContentDeserializer.kt | 18 ++-------- .../habitica/utils/GroupSerialization.kt | 13 ++----- .../habitica/utils/QuestDeserializer.kt | 5 +-- .../habitica/widget/BaseWidgetProvider.kt | 4 --- build.gradle | 2 +- 130 files changed, 269 insertions(+), 443 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java index 19b228300..9436a81eb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java @@ -123,9 +123,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { apiClient.validateNoRenewSubscription(validationRequest).subscribe(purchaseValidationResult -> { purchasedOrderList.add(purchase.orderId); - if (pendingGifts.containsKey(purchase.sku)) { - pendingGifts.remove(purchase.sku); - } + pendingGifts.remove(purchase.sku); requestListener.onSuccess(verifiedPurchases); EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase)); }, throwable -> { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt index 209c176ee..590912b04 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt @@ -6,7 +6,6 @@ import com.habitrpg.android.habitica.models.inventory.CustomizationSet import com.habitrpg.android.habitica.models.responses.SkillResponse import com.habitrpg.android.habitica.models.responses.UnlockResponse import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse -import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt index b2014a749..60ac890e0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt @@ -123,7 +123,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap return Flowable.empty() } return apiClient.leaveGroup(id) - .doOnNext { _ -> localRepository.updateMembership(userID, id, false) } + .doOnNext { localRepository.updateMembership(userID, id, false) } .flatMapMaybe { localRepository.getGroup(id).firstElement() } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt index 614fa3bd2..0d45ad128 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt @@ -2,12 +2,10 @@ package com.habitrpg.android.habitica.data.local import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.ChatMessage -import com.habitrpg.android.habitica.models.social.FindUsernameResult import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.models.social.GroupMembership import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable -import io.realm.Realm import io.realm.RealmResults interface SocialLocalRepository : BaseLocalRepository { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt index 994945688..d31acc42b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt @@ -4,7 +4,6 @@ import com.habitrpg.android.habitica.data.local.FAQLocalRepository import com.habitrpg.android.habitica.models.FAQArticle import io.reactivex.Flowable import io.realm.Realm -import io.realm.RealmObject.asFlowable import io.realm.RealmResults class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), FAQLocalRepository { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt index e2af9ae48..71e57205d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt @@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable import io.realm.Realm import io.realm.RealmResults -import io.realm.Sort class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), UserLocalRepository { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt index 5f17138d0..6b73c3773 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt @@ -1,34 +1,31 @@ package com.habitrpg.android.habitica.extensions import android.app.AlertDialog -import android.app.Dialog import android.content.DialogInterface -import androidx.annotation.IdRes -import android.view.View import com.habitrpg.android.habitica.R -public fun AlertDialog.Builder.setOkButton(listener: ((DialogInterface, Int) -> Unit)? = null): AlertDialog.Builder { - this.setPositiveButton(R.string.ok, { dialog, which -> +fun AlertDialog.Builder.setOkButton(listener: ((DialogInterface, Int) -> Unit)? = null): AlertDialog.Builder { + this.setPositiveButton(R.string.ok) { dialog, which -> listener?.invoke(dialog, which) - }) + } return this } -public fun AlertDialog.Builder.setCloseButton(listener: ((DialogInterface, Int) -> Unit)? = null): AlertDialog.Builder { - this.setPositiveButton(R.string.close, { dialog, which -> +fun AlertDialog.Builder.setCloseButton(listener: ((DialogInterface, Int) -> Unit)? = null): AlertDialog.Builder { + this.setPositiveButton(R.string.close) { dialog, which -> listener?.invoke(dialog, which) - }) + } return this } -public fun AlertDialog.setOkButton(whichButton: Int = AlertDialog.BUTTON_POSITIVE, listener: ((DialogInterface, Int) -> Unit)? = null) { - this.setButton(whichButton, context.getString(R.string.ok), { dialog, which -> +fun AlertDialog.setOkButton(whichButton: Int = AlertDialog.BUTTON_POSITIVE, listener: ((DialogInterface, Int) -> Unit)? = null) { + this.setButton(whichButton, context.getString(R.string.ok)) { dialog, which -> listener?.invoke(dialog, which) - }) + } } -public fun AlertDialog.setCloseButton(whichButton: Int = AlertDialog.BUTTON_POSITIVE, listener: ((DialogInterface, Int) -> Unit)? = null) { - this.setButton(whichButton, context.getString(R.string.close), { dialog, which -> +fun AlertDialog.setCloseButton(whichButton: Int = AlertDialog.BUTTON_POSITIVE, listener: ((DialogInterface, Int) -> Unit)? = null) { + this.setButton(whichButton, context.getString(R.string.close)) { dialog, which -> listener?.invoke(dialog, which) - }) + } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt index 5997c6a3f..3a5f34113 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt @@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.extensions import android.content.Context -public fun Int.dpToPx(context: Context?): Int { +fun Int.dpToPx(context: Context?): Int { val displayMetrics = context?.resources?.displayMetrics return ((this * (displayMetrics?.density ?: 1.0f)) + 0.5).toInt() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt index 1070d446a..02945548d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt @@ -1,9 +1,6 @@ package com.habitrpg.android.habitica.extensions import android.content.Context -import android.graphics.drawable.Drawable -import android.os.Build -import androidx.annotation.IdRes import android.view.View diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NavigationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NavigationManager.kt index dfa79c7ae..c631d0da8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NavigationManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NavigationManager.kt @@ -3,8 +3,6 @@ package com.habitrpg.android.habitica.helpers import android.os.Bundle import androidx.navigation.NavController import androidx.navigation.NavDirections -import androidx.navigation.NavOptions -import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragmentDirections import java.lang.ref.WeakReference object MainNavigationController { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java index 4d81d0ba1..889606e6a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java @@ -65,11 +65,11 @@ public class QrCodeManager { if (qrLayout == null) { return; } - this.qrCodeImageView = (ImageView) qrLayout.findViewById(R.id.QRImageView); - this.qrCodeDownloadButton = (Button) qrLayout.findViewById(R.id.QRDownloadButton); - AvatarView avatarView = (AvatarView) qrLayout.findViewById(R.id.avatarView); + this.qrCodeImageView = qrLayout.findViewById(R.id.QRImageView); + this.qrCodeDownloadButton = qrLayout.findViewById(R.id.QRDownloadButton); + AvatarView avatarView = qrLayout.findViewById(R.id.avatarView); avatarView.configureView(false, false, false); - this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper); + this.qrCodeWrapper = qrLayout.findViewById(R.id.qrCodeWrapper); if (userRepository != null) { userRepository.getUser(userId).firstElement().subscribe(avatarView::setAvatar, RxErrorHandler.handleEmptyError()); @@ -144,9 +144,9 @@ public class QrCodeManager { dialog.setContentView(R.layout.qr_dialogue); dialog.setTitle(R.string.qr_dialogue_title); - LinearLayout qrLayout = (LinearLayout) dialog.findViewById(R.id.qrLayout); + LinearLayout qrLayout = dialog.findViewById(R.id.qrLayout); this.setUpView(qrLayout); - Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK); + Button dialogButton = dialog.findViewById(R.id.dialogButtonOK); dialogButton.setOnClickListener(v -> dialog.dismiss()); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java index dc551bfc8..02c7438c0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java @@ -73,9 +73,9 @@ public class RemindersManager { dialog.setContentView(R.layout.custom_date_time_dialogue); dialog.setTitle("Select Date and Time"); - Button dialogConfirmButton = (Button) dialog.findViewById(R.id.customDialogConfirmButton); - TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker); - DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker); + Button dialogConfirmButton = dialog.findViewById(R.id.customDialogConfirmButton); + TimePicker dialogTimePicker = dialog.findViewById(R.id.timePicker); + DatePicker dialogDatePicker = dialog.findViewById(R.id.datePicker); dialogTimePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context)); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt index 96053dc6c..8ffe59438 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt @@ -3,9 +3,7 @@ package com.habitrpg.android.habitica.helpers import android.annotation.SuppressLint import android.content.Context import android.os.Environment -import com.habitrpg.android.habitica.HabiticaApplication import com.habitrpg.android.habitica.HabiticaBaseApplication -import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single import io.reactivex.schedulers.Schedulers 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 2c67ec9c3..ca472db50 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 @@ -2,8 +2,6 @@ package com.habitrpg.android.habitica.helpers import com.habitrpg.android.habitica.HabiticaBaseApplication import io.reactivex.Maybe -import io.reactivex.Observable -import io.reactivex.Single import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt index 4ae575c9a..d062c54a2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt @@ -2,5 +2,4 @@ package com.habitrpg.android.habitica.helpers.notifications import android.content.Context -class ChangeUsernameLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) { -} \ No newline at end of file +class ChangeUsernameLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt index 64dfbc97c..cca112f84 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt @@ -2,5 +2,4 @@ package com.habitrpg.android.habitica.helpers.notifications import android.content.Context -class GiftOneGetOneLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) { -} \ No newline at end of file +class GiftOneGetOneLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt index df2e95f1f..b43909aac 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt @@ -77,7 +77,7 @@ abstract class HabiticaLocalNotification(protected var context: Context, protect } @RequiresApi(Build.VERSION_CODES.O) -public fun NotificationManager.createOrUpdateHabiticaChannel() { +fun NotificationManager.createOrUpdateHabiticaChannel() { var hasChannel = false for (channel in notificationChannels) { if (channel.id == "default") { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt index 6c233a62d..742934387 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt @@ -1,11 +1,6 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.NotificationManager -import android.app.PendingIntent import android.content.Context -import android.content.Intent - -import com.habitrpg.android.habitica.ui.activities.MainActivity /** * Created by keithholliday on 7/1/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt index 2fd33c8e9..9a5672fc8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt @@ -1,10 +1,8 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.NotificationManager import android.app.PendingIntent import android.content.Context import android.content.Intent - import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt index a408a2319..2842c4a0f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt @@ -1,11 +1,6 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.NotificationManager -import android.app.PendingIntent import android.content.Context -import android.content.Intent - -import com.habitrpg.android.habitica.ui.activities.MainActivity /** * Created by keithholliday on 7/1/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt index 121606fd5..2ff08c903 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt @@ -1,11 +1,6 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.NotificationManager -import android.app.PendingIntent import android.content.Context -import android.content.Intent - -import com.habitrpg.android.habitica.ui.activities.MainActivity /** * Created by keithholliday on 7/1/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt index 35b254caf..23bc89237 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt @@ -1,11 +1,6 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.NotificationManager -import android.app.PendingIntent import android.content.Context -import android.content.Intent - -import com.habitrpg.android.habitica.ui.activities.MainActivity /** * Created by keithholliday on 7/1/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt index be8305e96..75947ad32 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt @@ -1,10 +1,6 @@ package com.habitrpg.android.habitica.helpers.notifications -import android.app.PendingIntent import android.content.Context -import android.content.Intent - -import com.habitrpg.android.habitica.ui.activities.MainActivity /** * Created by keithholliday on 7/2/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt index a3c028968..4b8d590d0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt @@ -16,7 +16,7 @@ class BuyRewardUseCase @Inject constructor(private val taskRepository: TaskRepository, private val soundManager: SoundManager, threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread) : UseCase(threadExecutor, postExecutionThread) { - override fun buildUseCaseObservable(requestValues: BuyRewardUseCase.RequestValues): Flowable { + override fun buildUseCaseObservable(requestValues: RequestValues): Flowable { return taskRepository .taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc) .doOnNext { soundManager.loadAndPlayAudio(SoundManager.SoundReward) } 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 e70592dd9..0788e8881 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 @@ -1,13 +1,8 @@ package com.habitrpg.android.habitica.interactors -import android.app.Activity import android.graphics.Bitmap -import android.graphics.drawable.Drawable import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import android.view.View -import android.widget.TextView - import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.events.ShareEvent import com.habitrpg.android.habitica.executors.PostExecutionThread @@ -15,16 +10,12 @@ import com.habitrpg.android.habitica.executors.ThreadExecutor import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.SoundManager import com.habitrpg.android.habitica.models.user.Stats -import com.habitrpg.android.habitica.models.user.SuppressedModals import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.AvatarView - -import org.greenrobot.eventbus.EventBus - -import javax.inject.Inject - import io.reactivex.Flowable import io.reactivex.functions.Consumer +import org.greenrobot.eventbus.EventBus +import javax.inject.Inject class LevelUpUseCase @Inject constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt index 64a1921d7..97dfc5660 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt @@ -39,7 +39,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh if (requestValues.hasLeveledUp == true) { return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.context)) .flatMap { userRepository.retrieveUser(true) } - .map({ it.stats }) + .map { it.stats } } else { val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user) val view = pair.first diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.kt index 1e3685e8b..d163c16a5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.kt @@ -16,7 +16,7 @@ class TodoCheckUseCase @Inject constructor(private val taskRepository: TaskRepository, private val soundManager: SoundManager, threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread) : UseCase(threadExecutor, postExecutionThread) { - override fun buildUseCaseObservable(requestValues: TodoCheckUseCase.RequestValues): Flowable { + override fun buildUseCaseObservable(requestValues: RequestValues): Flowable { return taskRepository.taskChecked(requestValues.user, requestValues.task, requestValues.up, false, requestValues.notifyFunc).doOnNext { soundManager.loadAndPlayAudio(SoundManager.SoundTodo) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java index 4637544bf..3f5b11177 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java @@ -3,31 +3,31 @@ package com.habitrpg.android.habitica.models.inventory; public interface Animal { - public String getKey(); + String getKey(); - public void setKey(String key); + void setKey(String key); - public String getText(); + String getText(); - public void setText(String text); + void setText(String text); - public String getType(); + String getType(); - public void setType(String type); + void setType(String type); - public String getAnimal(); + String getAnimal(); - public void setAnimal(String animal); + void setAnimal(String animal); - public String getColor(); + String getColor(); - public void setColor(String color); + void setColor(String color); - public boolean getPremium(); + boolean getPremium(); - public void setPremium(boolean premium); + void setPremium(boolean premium); - public Integer getNumberOwned(); + Integer getNumberOwned(); - public void setNumberOwned(Integer numberOwned); + void setNumberOwned(Integer numberOwned); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt index ec0b42bf8..9f46f58d5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt @@ -1,7 +1,5 @@ package com.habitrpg.android.habitica.models.inventory -import java.util.ArrayList - import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey 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 cd9eae260..2fbeedc38 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 @@ -258,7 +258,7 @@ open class Task : RealmObject, Parcelable { dest.writeDouble(this.value) dest.writeList(this.tags) dest.writeLong(this.dateCreated?.time ?: -1) - dest.writeInt(this.position ?: 0) + dest.writeInt(this.position) dest.writeValue(this.up) dest.writeValue(this.down) dest.writeByte(if (this.completed) 1.toByte() else 0.toByte()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt index c3770610e..e028fc561 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt @@ -1,17 +1,9 @@ package com.habitrpg.android.habitica.models.user -import com.habitrpg.android.habitica.models.inventory.Egg -import com.habitrpg.android.habitica.models.inventory.Food -import com.habitrpg.android.habitica.models.inventory.HatchingPotion -import com.habitrpg.android.habitica.models.inventory.Mount -import com.habitrpg.android.habitica.models.inventory.Pet -import com.habitrpg.android.habitica.models.inventory.QuestContent - -import java.util.Date - import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import java.util.* open class Items : RealmObject { 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 b36dd99bf..f1820ff2a 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 @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.receivers -import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent import android.content.BroadcastReceiver @@ -9,19 +8,14 @@ import android.content.Intent import android.media.RingtoneManager import android.os.Build import androidx.core.app.NotificationCompat -import com.habitrpg.android.habitica.HabiticaApplication import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R -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.RxErrorHandler import com.habitrpg.android.habitica.helpers.TaskAlarmManager import com.habitrpg.android.habitica.helpers.notifications.createOrUpdateHabiticaChannel import com.habitrpg.android.habitica.ui.activities.MainActivity -import io.reactivex.functions.Consumer -import java.util.HashMap -import java.util.NoSuchElementException +import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt index 6bdb67b7e..60b8c35bf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt @@ -78,7 +78,7 @@ class ItemDetailDialog(context: Context) : AlertDialog(context) { setView(contentViewLayout) - this.setButton(AlertDialog.BUTTON_NEGATIVE, context.getText(R.string.reward_dialog_dismiss)) { clickedDialog, _ -> clickedDialog.dismiss() } + this.setButton(BUTTON_NEGATIVE, context.getText(R.string.reward_dialog_dismiss)) { clickedDialog, _ -> clickedDialog.dismiss() } } fun setDescription(description: CharSequence) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt index f5d2d6c50..874aff703 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt @@ -6,7 +6,6 @@ import android.content.Context import android.os.Build import android.util.AttributeSet import android.util.DisplayMetrics -import android.view.View import android.view.WindowManager import android.widget.LinearLayout import com.habitrpg.android.habitica.R @@ -54,7 +53,7 @@ class MaxHeightLinearLayout : LinearLayout { val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as? WindowManager windowManager?.defaultDisplay?.getMetrics(displaymetrics) val height = (displaymetrics.heightPixels * maxHeight).toInt() - heightMeasurement = Math.min(heightMeasurement, View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.AT_MOST)) + heightMeasurement = Math.min(heightMeasurement, MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)) super.onMeasure(widthMeasureSpec, heightMeasurement) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt index 38997f1ab..0c0859763 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt @@ -16,7 +16,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder class AboutActivity : BaseActivity() { - private val pager: androidx.viewpager.widget.ViewPager by bindView(R.id.pager) + private val pager: ViewPager by bindView(R.id.pager) private val tabLayout: TabLayout by bindView(R.id.tab_layout) override fun getLayoutResId(): Int { @@ -80,9 +80,9 @@ class AboutActivity : BaseActivity() { return super.onOptionsItemSelected(item) } - private inner class PagerAdapter(fm: androidx.fragment.app.FragmentManager, internal var mNumOfTabs: Int) : FragmentStatePagerAdapter(fm) { + private inner class PagerAdapter(fm: FragmentManager, internal var mNumOfTabs: Int) : FragmentStatePagerAdapter(fm) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { return when (position) { 0 -> AboutFragment() 1 -> LibsBuilder() 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 e49977583..e6bad3d8e 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 @@ -1,25 +1,22 @@ package com.habitrpg.android.habitica.ui.activities import android.app.ProgressDialog -import android.content.Context import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.os.Bundle -import android.util.AttributeSet import android.view.Menu import android.view.MenuItem -import androidx.appcompat.app.AlertDialog import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.navigation.navArgs import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.* import com.habitrpg.android.habitica.ui.AvatarView diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt index d967e0fce..f740f4cf2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt @@ -271,7 +271,7 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener { } @Subscribe - public fun onConsumablePurchased(event: ConsumablePurchasedEvent) { + fun onConsumablePurchased(event: ConsumablePurchasedEvent) { if (isActive) { consumePurchase(event.purchase) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt index f78ee5b70..606bc8cf3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt @@ -243,7 +243,7 @@ class GiftIAPActivity: BaseActivity() { @Subscribe - public fun onConsumablePurchased(event: ConsumablePurchasedEvent) { + fun onConsumablePurchased(event: ConsumablePurchasedEvent) { consumePurchase(event.purchase) runOnUiThread { displayConfirmationDialog() 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 7197948b9..99833792d 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 @@ -29,7 +29,7 @@ class HabitButtonWidgetActivity : BaseActivity() { @field:[Inject Named(AppModule.NAMED_USER_ID)] lateinit var userId: String - internal val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView) + internal val recyclerView: RecyclerView by bindView(R.id.recyclerView) private var widgetId: Int = 0 private var adapter: SkillTasksRecyclerViewAdapter? = null @@ -56,10 +56,10 @@ class HabitButtonWidgetActivity : BaseActivity() { finish() } - var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = recyclerView.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager + var layoutManager: LinearLayoutManager? = recyclerView.layoutManager as? LinearLayoutManager if (layoutManager == null) { - layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this) + layoutManager = LinearLayoutManager(this) recyclerView.layoutManager = layoutManager } 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 ced653b73..b409d9834 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 @@ -3,19 +3,17 @@ package com.habitrpg.android.habitica.ui.activities import android.content.Intent import android.os.Build import android.os.Bundle -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentPagerAdapter -import androidx.core.content.ContextCompat -import androidx.core.content.res.ResourcesCompat -import androidx.viewpager.widget.ViewPager import android.view.View import android.view.WindowManager import android.widget.Button -import com.habitrpg.android.habitica.HabiticaBaseApplication +import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter +import androidx.viewpager.widget.ViewPager import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent -import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment @@ -25,12 +23,12 @@ import com.viewpagerindicator.IconPagerAdapter import io.reactivex.functions.Consumer import javax.inject.Inject -class IntroActivity : BaseActivity(), View.OnClickListener, androidx.viewpager.widget.ViewPager.OnPageChangeListener { +class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener { @Inject lateinit var contentRepository: InventoryRepository - private val pager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager) + private val pager: ViewPager by bindView(R.id.viewPager) private val indicator: IconPageIndicator by bindView(R.id.view_pager_indicator) private val skipButton: Button by bindView(R.id.skipButton) private val finishButton: Button by bindView(R.id.finishButton) @@ -99,9 +97,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, androidx.viewpager.w } - private inner class PagerAdapter(fm: androidx.fragment.app.FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter { + private inner class PagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { val fragment = IntroFragment() when (position) { 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 80696cb09..fab471084 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 @@ -9,10 +9,6 @@ import android.content.SharedPreferences import android.graphics.Color import android.os.Build import android.os.Bundle -import com.google.android.material.snackbar.Snackbar -import androidx.core.content.ContextCompat -import androidx.appcompat.app.AlertDialog -import androidx.preference.PreferenceManager import android.text.InputType import android.text.SpannableString import android.text.style.UnderlineSpan @@ -23,7 +19,10 @@ import android.view.Window import android.view.WindowManager import android.view.inputmethod.EditorInfo import android.widget.* +import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat import androidx.core.content.edit +import androidx.preference.PreferenceManager import com.facebook.* import com.facebook.login.LoginManager import com.facebook.login.LoginResult @@ -31,7 +30,11 @@ import com.google.android.gms.auth.GoogleAuthException import com.google.android.gms.auth.GoogleAuthUtil import com.google.android.gms.auth.GooglePlayServicesAvailabilityException import com.google.android.gms.auth.UserRecoverableAuthException -import com.google.android.gms.common.* +import com.google.android.gms.common.ConnectionResult +import com.google.android.gms.common.GoogleApiAvailability +import com.google.android.gms.common.GooglePlayServicesUtil +import com.google.android.gms.common.Scopes +import com.google.android.material.snackbar.Snackbar import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.api.HostConfig import com.habitrpg.android.habitica.components.AppComponent @@ -42,7 +45,6 @@ import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.auth.UserAuthResponse import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator -import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.login.LockableScrollView @@ -433,7 +435,7 @@ class LoginActivity : BaseActivity(), Consumer { @Suppress("DEPRECATION") GooglePlayServicesUtil.showErrorDialogFragment(statusCode, this@LoginActivity, - REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR) { _ -> + REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR) { } } else if (e is UserRecoverableAuthException) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt index b7ce02012..b3b1c2a28 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt @@ -21,7 +21,6 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment -import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import io.reactivex.functions.Consumer @@ -87,11 +86,11 @@ class PartyInviteActivity : BaseActivity() { val intent = Intent() val fragment = fragments[viewPager.currentItem] if (viewPager.currentItem == 1) { - intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, true) - intent.putExtra(PartyInviteActivity.EMAILS_KEY, fragment.values) + intent.putExtra(IS_EMAIL_KEY, true) + intent.putExtra(EMAILS_KEY, fragment.values) } else { - intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, false) - intent.putExtra(PartyInviteActivity.USER_IDS_KEY, fragment.values) + intent.putExtra(IS_EMAIL_KEY, false) + intent.putExtra(USER_IDS_KEY, fragment.values) } return intent } 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 5cb00e30e..478fab56e 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 @@ -75,7 +75,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - compositeSubscription.add(userRepository.getUser(hostConfig.user ?: "") + compositeSubscription.add(userRepository.getUser(hostConfig.user) .subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError())) val additionalData = HashMap() 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 770aaa563..271e7f90e 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 @@ -16,7 +16,7 @@ import io.reactivex.functions.Consumer import javax.inject.Inject class SkillMemberActivity : BaseActivity() { - private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView) + private val recyclerView: RecyclerView by bindView(R.id.recyclerView) private var viewAdapter: PartyMemberRecyclerViewAdapter? = null @@ -39,7 +39,7 @@ class SkillMemberActivity : BaseActivity() { } private fun loadMemberList() { - recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this) + recyclerView.layoutManager = LinearLayoutManager(this) viewAdapter = PartyMemberRecyclerViewAdapter(null, true) viewAdapter?.getUserClickedEvents()?.subscribe(Consumer { userId -> val resultIntent = Intent() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt index 43d7af04b..6481f87dd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt @@ -27,7 +27,7 @@ class SkillTasksActivity : BaseActivity() { @field:[Inject Named(AppModule.NAMED_USER_ID)] lateinit var userId: String - private val viewPager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager) + private val viewPager: ViewPager by bindView(R.id.viewPager) private val tabLayout: TabLayout by bindView(R.id.tab_layout) internal var viewFragmentsDictionary = SparseArray() @@ -50,7 +50,7 @@ class SkillTasksActivity : BaseActivity() { viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { val fragment = SkillTasksRecyclerViewFragment() when (position) { 0 -> fragment.taskType = Task.TYPE_HABIT diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt index 579e912eb..f3b087cba 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt @@ -1,11 +1,10 @@ package com.habitrpg.android.habitica.ui.adapter -import androidx.core.content.ContextCompat -import androidx.core.graphics.drawable.DrawableCompat -import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.ui.helpers.bindOptionalView @@ -15,7 +14,7 @@ import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject -class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): androidx.recyclerview.widget.RecyclerView.Adapter() { +class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): RecyclerView.Adapter() { var tintColor: Int = tintColor set(value) { @@ -64,7 +63,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): android notifyDataSetChanged() } - override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { val drawerItem = getItem(position) if (getItemViewType(position) == 0) { val itemHolder = holder as? DrawerItemViewHolder @@ -84,7 +83,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): android override fun getItemViewType(position: Int): Int = if (getItem(position).isHeader) 1 else 0 - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return if (viewType == 0) { DrawerItemViewHolder(parent.inflate(R.layout.drawer_main_item)) } else { @@ -92,7 +91,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): android } } - class DrawerItemViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + class DrawerItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { var tintColor: Int = 0 var backgroundTintColor: Int = 0 @@ -145,7 +144,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): android } } - class SectionHeaderViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + class SectionHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { var backgroundTintColor: Int = 0 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt index c77034ffe..b6ef5641b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt @@ -47,7 +47,7 @@ class SkillTasksRecyclerViewAdapter(data: OrderedRealmCollection?, autoUpd return taskSelectionEvents.toFlowable(BackpressureStrategy.DROP) } - inner class TaskViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { + inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { var task: Task? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt index 5aebf5ca5..048454d17 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt @@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import org.greenrobot.eventbus.EventBus -class SkillsRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { +class SkillsRecyclerViewAdapter : RecyclerView.Adapter() { var mana: Double = 0.toDouble() set(value) { @@ -46,7 +46,7 @@ class SkillsRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adap return skillList.size } - inner class SkillViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { + inner class SkillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { private val magicDrawable: Drawable private val skillImageView: SimpleDraweeView by bindView(R.id.skill_image) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt index 2d3a476ff..b87809165 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt @@ -77,7 +77,7 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: notifyDataSetChanged() } - inner class ItemViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { + inner class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { var ownedItem: OwnedItem? = null var item: Item? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt index f9e85d6eb..824510b27 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt @@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.ui.helpers.bindView import org.greenrobot.eventbus.EventBus import java.util.* -internal class CustomizationSetupAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { +internal class CustomizationSetupAdapter : RecyclerView.Adapter() { var userSize: String? = null var user: User? = null @@ -75,7 +75,7 @@ internal class CustomizationSetupAdapter : androidx.recyclerview.widget.Recycler return false } - internal inner class CustomizationViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { + internal inner class CustomizationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { private val imageView: ImageView by bindView(R.id.imageView) private val textView: TextView by bindView(R.id.textView) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt index d2390223a..0fb22eb54 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.ui.helpers.bindView import java.util.* -class TaskSetupAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { +class TaskSetupAdapter : RecyclerView.Adapter() { var checkedList: MutableList = mutableListOf() private var taskList: List> = emptyList() @@ -40,7 +40,7 @@ class TaskSetupAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { +class AchievementAdapter : RecyclerView.Adapter() { var itemType: String? = null var activity: MainActivity? = null @@ -30,7 +30,7 @@ class AchievementAdapter : androidx.recyclerview.widget.RecyclerView.Adapter?, autoUp return openChallengeFragmentEvents.toFlowable(BackpressureStrategy.DROP) } - class ChallengeViewHolder internal constructor(itemView: View, private val viewUserChallengesOnly: Boolean) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + class ChallengeViewHolder internal constructor(itemView: View, private val viewUserChallengesOnly: Boolean) : RecyclerView.ViewHolder(itemView) { private val challengeName: EmojiTextView by bindView(R.id.challenge_name) private val challengeDescription: TextView by bindView(R.id.challenge_shorttext) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt index 6065f40c5..11c948f29 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt @@ -52,7 +52,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection?, autoUp this.uuid = user?.id ?: "" } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return if (viewType == 0) { SystemChatMessageViewHolder(parent.inflate(R.layout.system_chat_message)) } else { @@ -60,7 +60,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection?, autoUp } } - override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { data.notNull { if (it[position].isSystemMessage) { (holder as? SystemChatMessageViewHolder)?.bind(it[position]) @@ -98,7 +98,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection?, autoUp return copyMessageEvents.toFlowable(BackpressureStrategy.DROP) } - inner class SystemChatMessageViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + inner class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private val textView: TextView by bindView(R.id.text_view) fun bind(chatMessage: ChatMessage?) { @@ -107,7 +107,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection?, autoUp } - inner class ChatRecyclerViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + inner class ChatRecyclerViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : RecyclerView.ViewHolder(itemView) { private val messageWrapper: ViewGroup by bindView(R.id.message_wrapper) private val avatarView: AvatarView by bindView(R.id.avatar_view) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt index 9015a7120..1e8619151 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt @@ -92,13 +92,13 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection?, auto override fun getFilter(): Filter { return object : Filter() { - override fun performFiltering(constraint: CharSequence): Filter.FilterResults { - val results = Filter.FilterResults() + override fun performFiltering(constraint: CharSequence): FilterResults { + val results = FilterResults() results.values = constraint - return Filter.FilterResults() + return FilterResults() } - override fun publishResults(constraint: CharSequence, results: Filter.FilterResults) { + override fun publishResults(constraint: CharSequence, results: FilterResults) { unfilteredData.notNull { if (constraint.isNotEmpty()) { updateData(it.where() @@ -110,7 +110,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection?, auto } } - class GuildViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + class GuildViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private val nameTextView: TextView by bindView(R.id.nameTextView) private val memberCountTextView: TextView by bindView(R.id.memberCountTextView) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt index 47d7626e4..dce1f2083 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt @@ -17,7 +17,7 @@ import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, layoutResource: Int, - newContext: Context, userID: String, sortCallback: SortableTasksRecyclerViewAdapter.SortTasksCallback?, + newContext: Context, userID: String, sortCallback: SortTasksCallback?, private val openTaskDisabled: Boolean, private val taskActionsDisabled: Boolean) : SortableTasksRecyclerViewAdapter("", taskFilterHelper, layoutResource, newContext, userID, sortCallback) { private val addItemSubject = PublishSubject.create() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt index cc09132c5..6a19412ca 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt @@ -11,11 +11,11 @@ import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.ui.helpers.bindView import java.util.* -class ChallengesFilterRecyclerViewAdapter(entries: Collection) : androidx.recyclerview.widget.RecyclerView.Adapter() { +class ChallengesFilterRecyclerViewAdapter(entries: Collection) : RecyclerView.Adapter() { private val entries: List - private val holderList: MutableList + private val holderList: MutableList val checkedEntries: List get() { val result = ArrayList() @@ -35,7 +35,7 @@ class ChallengesFilterRecyclerViewAdapter(entries: Collection) : androidx this.holderList = ArrayList() } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengeViewHolder { val view = LayoutInflater.from(parent.context) .inflate(R.layout.dialog_challenge_filter_group_item, parent, false) @@ -45,7 +45,7 @@ class ChallengesFilterRecyclerViewAdapter(entries: Collection) : androidx return challengeViewHolder } - override fun onBindViewHolder(holder: ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder, position: Int) { + override fun onBindViewHolder(holder: ChallengeViewHolder, position: Int) { holder.bind(entries[position]) } @@ -71,7 +71,7 @@ class ChallengesFilterRecyclerViewAdapter(entries: Collection) : androidx } } - class ChallengeViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { + class ChallengeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { internal val checkbox: CheckBox by bindView(itemView, R.id.challenge_filter_group_checkbox) var group: Group? = null 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 cfafa6063..8a40cc106 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 @@ -22,7 +22,7 @@ import java.util.* import javax.inject.Inject abstract class BaseTasksRecyclerViewAdapter(var taskType: String, private val taskFilterHelper: TaskFilterHelper?, private val layoutResource: Int, - newContext: Context, private val userID: String?) : androidx.recyclerview.widget.RecyclerView.Adapter() { + newContext: Context, private val userID: String?) : RecyclerView.Adapter() { @Inject lateinit var crashlyticsProxy: CrashlyticsProxy @Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt index 367a416b3..5b0ecfdfa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt @@ -2,23 +2,18 @@ package com.habitrpg.android.habitica.ui.fragments import android.content.Context import android.os.Bundle -import com.google.android.material.appbar.AppBarLayout -import com.google.android.material.appbar.CollapsingToolbarLayout -import com.google.android.material.tabs.TabLayout import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout - +import com.google.android.material.appbar.AppBarLayout +import com.google.android.material.tabs.TabLayout import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.SoundManager import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.MainActivity -import com.habitrpg.android.habitica.ui.views.bottombar.BottomBar import io.reactivex.functions.Consumer - import javax.inject.Inject abstract class BaseMainFragment : BaseFragment() { 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 f8032a589..a02b23814 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 @@ -28,9 +28,6 @@ class NewsFragment : BaseMainFragment() { webSettings.javaScriptEnabled = true webSettings.domStorageEnabled = true newsWebview.webChromeClient = object : WebChromeClient() { - override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean { - return super.onConsoleMessage(consoleMessage) - } } newsWebview.loadUrl("$address/static/new-stuff") } 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 a18805569..5991e4a2a 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 @@ -33,7 +33,7 @@ class AvatarCustomizationFragment : BaseMainFragment() { private var activeCustomization: String? = null internal var adapter: CustomizationRecyclerViewAdapter = CustomizationRecyclerViewAdapter() - internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2) + internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2) override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { @@ -82,8 +82,8 @@ class AvatarCustomizationFragment : BaseMainFragment() { setGridSpanCount(view.width) if (recyclerView.layoutManager == null) { - layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2) - layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() { + layoutManager = GridLayoutManager(activity, 2) + layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return if (adapter.getItemViewType(position) == 0) { layoutManager.spanCount 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 6ed87d2a0..3bec74e75 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 @@ -57,8 +57,8 @@ class EquipmentDetailFragment : BaseMainFragment() { } recyclerView.adapter = this.adapter - recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity) - recyclerView.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(getActivity(), androidx.recyclerview.widget.DividerItemDecoration.VERTICAL)) + recyclerView.layoutManager = LinearLayoutManager(activity) + recyclerView.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)) recyclerView.itemAnimator = SafeDefaultItemAnimator() type?.let { type -> inventoryRepository.getOwnedEquipment(type).firstElement().subscribe(Consumer> { this.adapter.updateData(it) }, RxErrorHandler.handleEmptyError()) } 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 b31c9e7cb..50e6afe80 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 @@ -23,7 +23,6 @@ import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.helpers.resetViews import io.reactivex.functions.Consumer -import io.realm.OrderedRealmCollection import javax.inject.Inject class ItemRecyclerFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt index 94f99e32c..a9062fcf0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt @@ -15,7 +15,7 @@ class APIPreferenceFragment: BasePreferencesFragment() { private val apiPreferences: List get() = Arrays.asList(getString(R.string.SP_APIToken), getString(R.string.SP_userID)) - lateinit private var qrCodeManager: QrCodeManager + private lateinit var qrCodeManager: QrCodeManager override fun onCreate(savedInstanceState: Bundle?) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt index 07465fd8d..e99b21b63 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt @@ -184,7 +184,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() { } .setNegativeButton(R.string.nevermind) { thisDialog, _ -> thisDialog.dismiss() } .create() - dialog.setOnShowListener { _ -> dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(context, R.color.red_10)) } + dialog.setOnShowListener { dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(context, R.color.red_10)) } dialog.setView(input) dialog.show() } @@ -240,7 +240,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() { } .setNegativeButton(R.string.nevermind) { thisDialog, _ -> thisDialog.dismiss() } .create() - dialog.setOnShowListener { _ -> dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(context, R.color.red_10)) } + dialog.setOnShowListener { dialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(context, R.color.red_10)) } dialog.show() } } @@ -264,7 +264,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() { private fun resetAccount() { @Suppress("DEPRECATION") val dialog = ProgressDialog.show(context, context?.getString(R.string.resetting_account), null, true) - userRepository.resetAccount().subscribe({ _ -> dialog.dismiss() }) { throwable -> + userRepository.resetAccount().subscribe({ dialog.dismiss() }) { throwable -> dialog.dismiss() RxErrorHandler.reportError(throwable) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt index 816eac21d..b10261f38 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt @@ -102,7 +102,7 @@ class DayStartPreferenceDialogFragment : PreferenceDialogFragmentCompat() { preferenceFragment: PreferenceFragmentCompat, key: String): DayStartPreferenceDialogFragment { val fragment = DayStartPreferenceDialogFragment() val arguments = Bundle(1) - arguments.putString(PreferenceDialogFragmentCompat.ARG_KEY, key) + arguments.putString(ARG_KEY, key) fragment.arguments = arguments fragment.setTargetFragment(preferenceFragment, 0) return fragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt index 7936ab4e9..08c75dd2e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt @@ -77,7 +77,7 @@ class TimePreferenceDialogFragment : PreferenceDialogFragmentCompat() { preferenceFragment: PreferenceFragmentCompat, key: String): TimePreferenceDialogFragment { val fragment = TimePreferenceDialogFragment() val arguments = Bundle(1) - arguments.putString(PreferenceDialogFragmentCompat.ARG_KEY, key) + arguments.putString(ARG_KEY, key) fragment.arguments = arguments fragment.setTargetFragment(preferenceFragment, 0) return fragment 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 e210d8bd1..80975e44b 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 @@ -41,7 +41,7 @@ class AvatarSetupFragment : BaseFragment() { var activity: SetupActivity? = null var width: Int = 0 private val avatarView: AvatarView? by bindOptionalView(R.id.avatarView) - private val customizationList: androidx.recyclerview.widget.RecyclerView? by bindOptionalView(R.id.customization_list) + private val customizationList: RecyclerView? by bindOptionalView(R.id.customization_list) private val subCategoryTabs: TabLayout? by bindOptionalView(R.id.subcategory_tabs) private val bodyButton: AvatarCategoryView? by bindOptionalView(R.id.body_button) private val skinButton: AvatarCategoryView? by bindOptionalView(R.id.skin_button) @@ -52,7 +52,7 @@ class AvatarSetupFragment : BaseFragment() { private val randomizeButton: Button? by bindOptionalView(R.id.randomize_button) internal var adapter: CustomizationSetupAdapter? = null - internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity) + internal var layoutManager: LinearLayoutManager = LinearLayoutManager(activity) private var user: User? = null private var subcategories: List = emptyList() @@ -80,8 +80,8 @@ class AvatarSetupFragment : BaseFragment() { this.adapter?.userSize = this.user?.preferences?.size ?: "slim" this.adapter?.user = this.user - this.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity) - this.layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL + this.layoutManager = LinearLayoutManager(activity) + this.layoutManager.orientation = LinearLayoutManager.HORIZONTAL this.customizationList?.layoutManager = this.layoutManager this.customizationList?.adapter = this.adapter diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt index 1f652e26a..01ef782af 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt @@ -31,10 +31,10 @@ class SkillTasksRecyclerViewFragment : BaseFragment() { @field:[Inject Named(AppModule.NAMED_USER_ID)] lateinit var userId: String - private val recyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(R.id.recyclerView) + private val recyclerView: RecyclerView? by bindView(R.id.recyclerView) var adapter: SkillTasksRecyclerViewAdapter = SkillTasksRecyclerViewAdapter(null, true) - internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null + internal var layoutManager: LinearLayoutManager? = null var taskType: String? = null val taskSelectionEvents: Flowable @@ -55,10 +55,10 @@ class SkillTasksRecyclerViewFragment : BaseFragment() { compositeSubscription.add(taskRepository.getTasks(taskType ?: "", userId).firstElement().subscribe(Consumer { tasks -> adapter.updateData(tasks) }, RxErrorHandler.handleEmptyError())) recyclerView?.adapter = adapter - layoutManager = recyclerView?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager + layoutManager = recyclerView?.layoutManager as? LinearLayoutManager if (layoutManager == null) { - layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context) + layoutManager = LinearLayoutManager(context) recyclerView?.layoutManager = layoutManager } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt index 6a53056f9..d6b99fcf4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt @@ -5,22 +5,22 @@ import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import androidx.appcompat.app.AlertDialog -import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.core.net.toUri +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.extensions.notNull -import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.AppConfigManager +import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.user.User @@ -114,10 +114,10 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener { super.onViewCreated(view, savedInstanceState) refreshLayout.setOnRefreshListener(this) - layoutManager = recyclerView.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager + layoutManager = recyclerView.layoutManager as? LinearLayoutManager if (layoutManager == null) { - layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context) + layoutManager = LinearLayoutManager(context) recyclerView.layoutManager = layoutManager } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt index 96444746f..fe0e35e66 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt @@ -127,7 +127,7 @@ class GuildDetailFragment : BaseFragment() { } private fun updateGuild(guild: Group?) { - guildTitleView?.text = guild?.name + guildTitleView.text = guild?.name guildDescriptionView.text = MarkdownParser.parseMarkdown(guild?.description) //gemCountWrapper.visibility = if (group?.balance != null && group.balance > 0) View.VISIBLE else View.GONE //gemCountTextView.text = (group?.balance ?: 0 * 4.0).toInt().toString() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt index f5a1c47c5..2285c307c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt @@ -65,11 +65,6 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi super.onDestroy() } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - //this.activity?.menuInflater?.inflate(R.menu.inbox, menu) - super.onCreateOptionsMenu(menu, inflater) - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { val id = item.itemId diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt index b21bbead9..ee6c7fadd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt @@ -71,7 +71,7 @@ class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.menu_public_guild, menu) - val searchItem = menu?.findItem(R.id.action_guild_search) + val searchItem = menu.findItem(R.id.action_guild_search) val guildSearchView = searchItem?.actionView as? SearchView val theTextArea = guildSearchView?.findViewById(R.id.search_src_text) context.notNull { theTextArea?.setHintTextColor(ContextCompat.getColor(it, R.color.white)) } 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 c7172626b..71b578e93 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 @@ -113,7 +113,7 @@ class TavernDetailFragment : BaseFragment() { } private fun bindButtons() { - innButton.setOnClickListener { _ -> + innButton.setOnClickListener { user?.notNull { user -> userRepository.sleep(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) } } guidelinesButton.setOnClickListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt index e79ce91f7..48ee36b25 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt @@ -58,7 +58,7 @@ class TavernFragment : BaseMainFragment() { } viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { return when (position) { 0 -> { tavernDetailFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt index 6ca9c95c3..ee2e913f3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt @@ -17,7 +17,7 @@ import java.util.* internal class ChallengeFilterDialogHolder private constructor(view: View, private val context: Activity) { - private val groupRecyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(view, R.id.challenge_filter_recycler_view) + private val groupRecyclerView: RecyclerView? by bindView(view, R.id.challenge_filter_recycler_view) private val allButton: Button? by bindView(view, R.id.challenge_filter_button_all) private val noneButton: Button? by bindView(view, R.id.challenge_filter_button_none) private val checkboxOwned: CheckBox? by bindView(view, R.id.challenge_filter_owned) @@ -51,7 +51,7 @@ internal class ChallengeFilterDialogHolder private constructor(view: View, priva } private fun fillChallengeGroups() { - this.groupRecyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context) + this.groupRecyclerView?.layoutManager = LinearLayoutManager(context) adapter = ChallengesFilterRecyclerViewAdapter(getGroups(challengesViewed)) if (currentFilter != null && currentFilter?.showByGroups != null) { adapter?.selectAll(currentFilter?.showByGroups ?: emptyList()) 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 7dbf8d7b0..6efcd937c 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 @@ -1,11 +1,9 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges -import android.content.Intent import android.os.Bundle -import android.view.* -import android.widget.RelativeLayout -import android.widget.TextView -import androidx.core.view.MenuItemCompat +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent @@ -18,7 +16,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.social.Challenge import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.modules.AppModule -import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt index 9e9f4e9aa..f5575cfda 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt @@ -8,17 +8,13 @@ import android.widget.TextView import androidx.core.view.MenuItemCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter - import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.data.ChallengeRepository -import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.helpers.resetViews -import com.habitrpg.android.habitica.utils.Action1 - import javax.inject.Inject class ChallengesOverviewFragment : BaseMainFragment() { @@ -27,7 +23,7 @@ class ChallengesOverviewFragment : BaseMainFragment() { internal lateinit var challengeRepository: ChallengeRepository private val viewPager: androidx.viewpager.widget.ViewPager? by bindView(R.id.viewPager) - var statePagerAdapter: androidx.fragment.app.FragmentStatePagerAdapter? = null + var statePagerAdapter: FragmentStatePagerAdapter? = null private var userChallengesFragment: ChallengeListFragment? = ChallengeListFragment() private var availableChallengesFragment: ChallengeListFragment? = ChallengeListFragment() @@ -113,7 +109,7 @@ class ChallengesOverviewFragment : BaseMainFragment() { statePagerAdapter = object : FragmentStatePagerAdapter(fragmentManager) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { return if (position == 0) { userChallengesFragment } else { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt index 2cedf7714..34feb263e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt @@ -33,7 +33,7 @@ class PartyFragment : BaseMainFragment() { private var firstFragment: Fragment? = null private var partyMemberListFragment: PartyMemberListFragment? = null private var chatFragment: ChatFragment? = null - private var viewPagerAdapter: androidx.fragment.app.FragmentPagerAdapter? = null + private var viewPagerAdapter: FragmentPagerAdapter? = null internal lateinit var viewModel: PartyViewModel @@ -232,7 +232,7 @@ class PartyFragment : BaseMainFragment() { viewPagerAdapter = object : FragmentPagerAdapter(fragmentManager) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { return when (position) { 0 -> { firstFragment = if (user?.hasParty() == true) { @@ -293,7 +293,7 @@ class PartyFragment : BaseMainFragment() { } this.viewPager?.adapter = viewPagerAdapter - viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener { + viewPager?.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { if (position == 1) { chatFragment?.setNavigatedToFragment() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt index 25437755c..309dd279d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.lifecycle.Observer import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.data.SocialRepository 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 e3822d5b2..7415bd2f0 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 @@ -29,10 +29,10 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - (layoutManager as androidx.recyclerview.widget.GridLayoutManager).spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() { + (layoutManager as GridLayoutManager).spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return if (recyclerAdapter?.getItemViewType(position) ?: 0 < 2) { - (layoutManager as androidx.recyclerview.widget.GridLayoutManager).spanCount + (layoutManager as GridLayoutManager).spanCount } else { 1 } @@ -50,8 +50,8 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() { }, RxErrorHandler.handleEmptyError()) } - override fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager = - androidx.recyclerview.widget.GridLayoutManager(context, 4) + override fun getLayoutManager(context: Context?): LinearLayoutManager = + GridLayoutManager(context, 4) override fun onRefresh() { refreshLayout.isRefreshing = true @@ -73,7 +73,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() { if (spanCount == 0) { spanCount = 1 } - (layoutManager as androidx.recyclerview.widget.GridLayoutManager).spanCount = spanCount + (layoutManager as GridLayoutManager).spanCount = spanCount } companion object { 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 db8e5e197..d1385b064 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 @@ -138,7 +138,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou //defines the enabled move directions in each state (idle, swiping, dragging). override fun getMovementFlags(recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder): Int { - return ItemTouchHelper.Callback.makeFlag(ItemTouchHelper.ACTION_STATE_DRAG, + return makeFlag(ItemTouchHelper.ACTION_STATE_DRAG, ItemTouchHelper.DOWN or ItemTouchHelper.UP) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt index d27d086a1..41c69dfe7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt @@ -11,18 +11,16 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.extensions.dpToPx import com.habitrpg.android.habitica.extensions.inflate -import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.auth.LocalAuthentication import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.social.FindUsernameResult import com.habitrpg.android.habitica.models.user.Authentication import com.habitrpg.android.habitica.models.user.Profile import com.habitrpg.android.habitica.ui.views.social.UsernameLabel -import io.reactivex.functions.Consumer import net.pherth.android.emoji_library.EmojiMap import net.pherth.android.emoji_library.EmojiParser import net.pherth.android.emoji_library.EmojiTextView -import java.util.Date +import java.util.* class AutocompleteAdapter(val context: Context, val socialRepository: SocialRepository? = null, var autocompleteContext: String? = null, var groupID: String? = null, val remoteAutocomplete: Boolean = false) : BaseAdapter(), Filterable { var chatMessages: List = arrayListOf() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java index 6460528a4..d33c2202b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java @@ -84,7 +84,7 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior { @Override public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child, View directTargetChild, View target, int nestedScrollAxes) { - ViewGroup fabContainer = (ViewGroup) child.findViewById(R.id.floating_menu_wrapper); + ViewGroup fabContainer = child.findViewById(R.id.floating_menu_wrapper); if (fabContainer.getChildCount() > 0) { if (fabContainer.getChildAt(0).getClass().equals(FloatingActionMenu.class)) { fab = (FloatingActionMenu) fabContainer.getChildAt(0); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt index ef9656f73..ecfb4b2cc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt @@ -18,10 +18,9 @@ package com.habitrpg.android.habitica.ui.helpers import android.app.Activity import android.graphics.Rect -import android.os.Build import android.view.View -import android.view.inputmethod.InputMethodManager import android.view.ViewTreeObserver +import android.view.inputmethod.InputMethodManager /** * Created by mikepenz on 14.03.15. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt index 977639746..e7d6a14e2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/Kotterknife.kt @@ -22,8 +22,8 @@ fun Activity.bindView(@IdRes id: Int) fun Dialog.bindView(@IdRes id: Int) : ReadOnlyProperty = required(id, viewFinder) -fun androidx.fragment.app.Fragment.bindView(@IdRes id: Int) - : ReadOnlyProperty = required(id, viewFinder) +fun Fragment.bindView(@IdRes id: Int) + : ReadOnlyProperty = required(id, viewFinder) fun ViewHolder.bindView(@IdRes id: Int) : ReadOnlyProperty = required(id, viewFinder) @@ -37,8 +37,8 @@ fun Activity.bindOptionalView(@IdRes id: Int) fun Dialog.bindOptionalView(@IdRes id: Int) : ReadOnlyProperty = optional(id, viewFinder) -fun androidx.fragment.app.Fragment.bindOptionalView(@IdRes id: Int) - : ReadOnlyProperty = optional(id, viewFinder) +fun Fragment.bindOptionalView(@IdRes id: Int) + : ReadOnlyProperty = optional(id, viewFinder) fun ViewHolder.bindOptionalView(@IdRes id: Int) : ReadOnlyProperty = optional(id, viewFinder) @@ -59,7 +59,7 @@ fun bindColor(context: Context, @ColorRes res: Int) : Lazy { return lazy(LazyThreadSafetyMode.NONE) { ContextCompat.getColor(context, res) } } -fun androidx.fragment.app.Fragment.resetViews() { +fun Fragment.resetViews() { LazyRegistry.reset(this) } @@ -70,7 +70,7 @@ private val Activity.viewFinder: Activity.(Int) -> View? get() = { findViewById(it) } private val Dialog.viewFinder: Dialog.(Int) -> View? get() = { findViewById(it) } -private val androidx.fragment.app.Fragment.viewFinder: androidx.fragment.app.Fragment.(Int) -> View? +private val Fragment.viewFinder: Fragment.(Int) -> View? get() = { view?.findViewById(it) } private val ViewHolder.viewFinder: ViewHolder.(Int) -> View? get() = { itemView.findViewById(it) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt index 4fa8ddbe9..515521063 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt @@ -2,21 +2,17 @@ package com.habitrpg.android.habitica.ui.helpers import android.graphics.Color import android.text.Html - -import com.commonsware.cwac.anddown.AndDown - -import net.pherth.android.emoji_library.EmojiParser - import android.text.Html.FROM_HTML_MODE_LEGACY import android.text.SpannableStringBuilder import android.text.Spanned import android.text.style.ForegroundColorSpan -import android.text.style.StyleSpan +import com.commonsware.cwac.anddown.AndDown import com.habitrpg.android.habitica.helpers.RxErrorHandler import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers +import net.pherth.android.emoji_library.EmojiParser import java.util.regex.Pattern /** diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt index 3f17a26b7..df492923b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt @@ -1,15 +1,14 @@ package com.habitrpg.android.habitica.ui.helpers import android.content.Context -import android.content.res.Configuration -import android.content.res.Resources import android.graphics.Point import android.os.Build -import androidx.annotation.IntRange import android.util.DisplayMetrics -import android.view.* -import androidx.annotation.IntegerRes - +import android.view.KeyCharacterMap +import android.view.KeyEvent +import android.view.ViewConfiguration +import android.view.WindowManager +import androidx.annotation.IntRange import com.habitrpg.android.habitica.R object NavbarUtils { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt index ec5ad5d30..a2e9876dd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt @@ -1,11 +1,9 @@ package com.habitrpg.android.habitica.ui.helpers import android.content.Context -import androidx.recyclerview.widget.RecyclerView import android.util.AttributeSet import android.view.View -import android.view.WindowInsets - +import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.ui.views.PaddedRecylerView //http://stackoverflow.com/a/27801394/1315039 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java index f2ca28d0e..0de6ea7ea 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java @@ -27,7 +27,7 @@ public class BottomSheetMenuItem { public View inflate(Context context, LayoutInflater inflater, ViewGroup contentView) { LinearLayout menuItemView = (LinearLayout) inflater.inflate(R.layout.menu_bottom_sheet_item, contentView, false); - TextView textView = (TextView) menuItemView.findViewById(R.id.textView); + TextView textView = menuItemView.findViewById(R.id.textView); textView.setText(this.title); if (this.isDestructive) { textView.setTextColor(ContextCompat.getColor(context, R.color.red_50)); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt index 32d718f73..9a74a2b70 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt @@ -11,7 +11,7 @@ import android.widget.TextView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.ui.helpers.bindView -class SectionViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) { +class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private val label: TextView by bindView(itemView, R.id.label) private val purchaseSetButton: Button? by bindView(itemView, R.id.purchaseSetButton) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt index 1e89c86c9..3f338780a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt @@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.ui.views.CurrencyView import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog -class ShopItemViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { +class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView) private val buyButton: View by bindView(itemView, R.id.buyButton) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt index 135324dc4..5d9eb60d0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt @@ -21,7 +21,7 @@ import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import org.greenrobot.eventbus.EventBus -abstract class BaseTaskViewHolder constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener { +abstract class BaseTaskViewHolder constructor(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { var task: Task? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt index da360ef1b..6bd00acd6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt @@ -116,8 +116,8 @@ abstract class ChecklistedViewHolder(itemView: View) : BaseTaskViewHolder(itemVi private fun onChecklistIndicatorClicked() { expandedChecklistRow = if (this.shouldDisplayExpandedChecklist()) null else adapterPosition if (this.shouldDisplayExpandedChecklist()) { - val recyclerView = this.checklistView.parent.parent as? androidx.recyclerview.widget.RecyclerView - val layoutManager = recyclerView?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager + val recyclerView = this.checklistView.parent.parent as? RecyclerView + val layoutManager = recyclerView?.layoutManager as? LinearLayoutManager layoutManager?.scrollToPositionWithOffset(this.adapterPosition, 15) } updateChecklistDisplay() 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 6ca0ec8e9..3626d7a39 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,17 +6,12 @@ import androidx.lifecycle.ViewModel import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.extensions.Optional -import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.helpers.RxErrorHandler -import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.models.user.User -import io.reactivex.BackpressureStrategy import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.functions.Consumer -import io.reactivex.subjects.BehaviorSubject import javax.inject.Inject abstract class BaseViewModel: ViewModel() { 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 fd361b3a1..c0da3b583 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 @@ -1,14 +1,9 @@ package com.habitrpg.android.habitica.ui.viewmodels -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.extensions.notNull import com.habitrpg.android.habitica.helpers.RxErrorHandler -import com.habitrpg.android.habitica.models.inventory.Quest import io.reactivex.functions.Consumer -import kotlinx.android.synthetic.main.fragment_chat.* class PartyViewModel: GroupViewModel() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt index 99e024fd7..1e3211f0a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt @@ -109,7 +109,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa context.notNull { caretColor = ContextCompat.getColor(it, R.color.black_50_alpha) } - orientation = LinearLayout.VERTICAL + orientation = VERTICAL titleView.setOnClickListener { isCollapsed = !isCollapsed } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt index 5645e86d1..902006969 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt @@ -3,11 +3,11 @@ package com.habitrpg.android.habitica.ui.views import android.content.Context import android.graphics.Bitmap import android.graphics.drawable.BitmapDrawable -import androidx.core.content.ContextCompat import android.util.AttributeSet import android.util.TypedValue import android.view.Gravity import android.view.View +import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.helpers.NumberAbbreviator @@ -119,7 +119,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView { visibility = if ("hourglasses" == this.currency) { if ("0" == text) View.GONE else View.VISIBLE } else { - View.VISIBLE; + View.VISIBLE } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt index de8405a5e..20d43163f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.views import android.content.Context -import android.os.Build import android.util.AttributeSet import android.util.TypedValue import android.widget.LinearLayout @@ -52,11 +51,8 @@ class CurrencyViews : LinearLayout { private fun setupView(view: CurrencyView, margin: Int) { this.addView(view) - val params = view.layoutParams as LayoutParams - params.setMargins(margin, 0, 0, 0) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - params.marginStart = margin - } + val params = view.layoutParams as? LayoutParams + params?.marginStart = margin view.layoutParams = params } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java index ed6da5ccf..030303e6b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java @@ -13166,25 +13166,25 @@ public class HabiticaIcons { class PaintCodeColor extends Color { private static float[] ColorToHSV(int originalColor) { - float hsv[] = new float[3]; + float[] hsv = new float[3]; RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv); return hsv; } public static int colorByChangingHue(int originalColor, float newHue) { - float hsv[] = ColorToHSV(originalColor); + float[] hsv = ColorToHSV(originalColor); hsv[0] = newHue; return HSVToColor(alpha(originalColor), hsv); } public static int colorByChangingSaturation(int originalColor, float newSaturation) { - float hsv[] = ColorToHSV(originalColor); + float[] hsv = ColorToHSV(originalColor); hsv[1] = newSaturation; return HSVToColor(alpha(originalColor), hsv); } public static int colorByChangingValue(int originalColor, float newValue) { - float hsv[] = ColorToHSV(originalColor); + float[] hsv = ColorToHSV(originalColor); hsv[2] = newValue; return HSVToColor(alpha(originalColor), hsv); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt index c16f09581..1e9d2d8f2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt @@ -149,10 +149,10 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb .setRightDiff(rightIcon, rightTextColor, rightText) when (displayType) { - HabiticaSnackbar.SnackbarDisplayType.FAILURE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_red) - HabiticaSnackbar.SnackbarDisplayType.FAILURE_BLUE, HabiticaSnackbar.SnackbarDisplayType.BLUE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_blue) - HabiticaSnackbar.SnackbarDisplayType.DROP, HabiticaSnackbar.SnackbarDisplayType.NORMAL -> snackbar.setBackgroundResource(R.drawable.snackbar_background_gray) - HabiticaSnackbar.SnackbarDisplayType.SUCCESS -> snackbar.setBackgroundResource(R.drawable.snackbar_background_green) + SnackbarDisplayType.FAILURE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_red) + SnackbarDisplayType.FAILURE_BLUE, SnackbarDisplayType.BLUE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_blue) + SnackbarDisplayType.DROP, SnackbarDisplayType.NORMAL -> snackbar.setBackgroundResource(R.drawable.snackbar_background_gray) + SnackbarDisplayType.SUCCESS -> snackbar.setBackgroundResource(R.drawable.snackbar_background_green) } snackbar.show() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt index b0aab2a0c..244ababbd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt @@ -1,11 +1,8 @@ package com.habitrpg.android.habitica.ui.views import android.content.Context -import android.os.Build import android.util.AttributeSet -import android.view.View import android.widget.LinearLayout -import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.ui.helpers.NavbarUtils open class PaddedLinearLayout : LinearLayout { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBar.java index 77bc8f0ce..bedf4f764 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBar.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBar.java @@ -269,8 +269,8 @@ public class BottomBar extends LinearLayout implements View.OnClickListener, Vie rootView.setLayoutParams(params); backgroundOverlay = rootView.findViewById(R.id.bb_bottom_bar_background_overlay); - outerContainer = (ViewGroup) rootView.findViewById(R.id.bb_bottom_bar_outer_container); - tabContainer = (ViewGroup) rootView.findViewById(R.id.bb_bottom_bar_item_container); + outerContainer = rootView.findViewById(R.id.bb_bottom_bar_outer_container); + tabContainer = rootView.findViewById(R.id.bb_bottom_bar_item_container); shadowView = findViewById(R.id.bb_bottom_bar_shadow); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBarTab.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBarTab.java index d3f8d73f4..88e9d8eaa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBarTab.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/bottombar/BottomBarTab.java @@ -99,11 +99,11 @@ public class BottomBarTab extends LinearLayout { setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); setBackgroundResource(MiscUtils.getDrawableRes(getContext(), R.attr.selectableItemBackgroundBorderless)); - iconView = (AppCompatImageView) findViewById(R.id.bb_bottom_bar_icon); + iconView = findViewById(R.id.bb_bottom_bar_icon); iconView.setImageResource(iconResId); if (type != Type.TABLET && !isTitleless) { - titleView = (TextView) findViewById(R.id.bb_bottom_bar_title); + titleView = findViewById(R.id.bb_bottom_bar_title); titleView.setVisibility(VISIBLE); if (type == Type.SHIFTING) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt index ec7af4c59..4fde46308 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt @@ -1,12 +1,11 @@ package com.habitrpg.android.habitica.ui.views.insufficientCurrency import android.content.Context -import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.widget.ImageView import android.widget.TextView +import androidx.appcompat.app.AlertDialog import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.ui.helpers.bindView /** * Created by phillip on 27.09.17. @@ -26,7 +25,7 @@ abstract class InsufficientCurrencyDialog(context: Context) : AlertDialog(contex imageView = view.findViewById(R.id.imageView) textView = view.findViewById(R.id.textView) - this.setButton(AlertDialog.BUTTON_NEUTRAL, context.getString(R.string.close)) { _, _ -> this.dismiss() } + this.setButton(BUTTON_NEUTRAL, context.getString(R.string.close)) { _, _ -> this.dismiss() } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt index d7ebe70db..dd896b420 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.views.insufficientCurrency import android.content.Context -import androidx.appcompat.app.AlertDialog - import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper @@ -13,6 +11,6 @@ class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDial imageView.setImageBitmap(HabiticaIconsHelper.imageOfHourglassShop()) textView.setText(R.string.insufficientHourglasses) - setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.get_hourglasses)) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity) } + setButton(BUTTON_POSITIVE, context.getString(R.string.get_hourglasses)) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity) } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt index 84e43b5a5..8530a45ef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt @@ -30,9 +30,9 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo private val blinkDuration: Int get() = random.nextInt(30) * 800 + 4 - private val starParams: RelativeLayout.LayoutParams + private val starParams: LayoutParams get() { - val params = RelativeLayout.LayoutParams(STAR_SIZE, STAR_SIZE) + val params = LayoutParams(STAR_SIZE, STAR_SIZE) params.leftMargin = random.nextInt(viewWidth) params.topMargin = random.nextInt(viewHeight) return params @@ -64,7 +64,7 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { - this.viewWidth = View.MeasureSpec.getSize(widthMeasureSpec) + this.viewWidth = MeasureSpec.getSize(widthMeasureSpec) this.setMeasuredDimension(viewWidth, viewHeight) params.width = viewWidth params.height = viewHeight diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt index d5765a145..52de669f8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt @@ -6,11 +6,9 @@ import android.animation.AnimatorListenerAdapter import android.animation.ObjectAnimator import android.animation.ValueAnimator import android.content.Context -import androidx.appcompat.widget.AppCompatImageView import android.util.AttributeSet import android.view.View -import android.widget.ImageView - +import androidx.appcompat.widget.AppCompatImageView import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class StarView : AppCompatImageView { @@ -22,7 +20,7 @@ class StarView : AppCompatImageView { constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context) : super(context) { - this.scaleType = ImageView.ScaleType.CENTER + this.scaleType = ScaleType.CENTER } fun setStarSize(size: Int) { 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 12a922140..c5cd47140 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 @@ -147,7 +147,7 @@ class PurchaseDialog(context: Context, component: AppComponent?, val item: ShopI closeButton.setOnClickListener { dismiss() } buyButton.setOnClickListener { onBuyButtonClicked() } - pinButton.setOnClickListener { _-> inventoryRepository.togglePinnedItem(shopItem).subscribe(Consumer { isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) } + pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe(Consumer { isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) } } private fun setUser(user: User) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt index 1d4d9a80c..1000ab2f7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt @@ -27,7 +27,7 @@ abstract class PurchaseDialogContent : LinearLayout { } private fun setupView() { - orientation = LinearLayout.VERTICAL + orientation = VERTICAL gravity = Gravity.CENTER_HORIZONTAL inflate(context, viewId, this) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt index 903244167..1267e459a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt @@ -24,9 +24,9 @@ internal class PurchaseDialogGearContent : PurchaseDialogContent { override val viewId: Int get() = R.layout.dialog_purchase_content_gear - constructor(context: Context) : super(context) {} + constructor(context: Context) : super(context) - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {} + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) override fun setItem(item: ShopItem) { super.setItem(item) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt index f742fa30a..790b9809b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt @@ -49,7 +49,7 @@ class OldQuestProgressView : LinearLayout { setWillNotDraw(false) inflate(R.layout.quest_progress_old, true) - orientation = LinearLayout.VERTICAL + orientation = VERTICAL setScaledPadding(context, 16, 16, 16, 16) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt index c76de7823..e9f933881 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt @@ -80,20 +80,20 @@ class QuestMenuView : LinearLayout { } fun hideBossArt() { - topView.orientation = LinearLayout.HORIZONTAL + topView.orientation = HORIZONTAL topView.setBackgroundColor(questContent?.colors?.mediumColor ?: 0) bossNameView.gravity = Gravity.LEFT - bossNameView.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1F) + bossNameView.layoutParams = LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1F) bossArtView.visibility = View.GONE typeTextView.setTextColor(questContent?.colors?.extraLightColor ?: 0) closeButton.visibility = View.GONE } fun showBossArt() { - topView.orientation = LinearLayout.VERTICAL + topView.orientation = VERTICAL topView.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent)) bossNameView.gravity = Gravity.RIGHT - bossNameView.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + bossNameView.layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) bossArtView.visibility = View.VISIBLE typeTextView.setTextColor(ContextCompat.getColor(context, R.color.white)) closeButton.visibility = View.VISIBLE 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 eeee1607f..761e0a38d 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 @@ -6,8 +6,6 @@ import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.RectF import android.graphics.drawable.GradientDrawable -import androidx.core.content.ContextCompat -import androidx.appcompat.app.AlertDialog import android.util.AttributeSet import android.view.LayoutInflater import android.view.View @@ -16,10 +14,11 @@ import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat import androidx.core.content.edit import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestContent @@ -27,6 +26,7 @@ import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils import com.habitrpg.android.habitica.ui.helpers.MarkdownParser +import com.habitrpg.android.habitica.ui.helpers.bindView import com.habitrpg.android.habitica.ui.views.* import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -81,8 +81,8 @@ class QuestProgressView : LinearLayout { private fun setupView(context: Context) { setWillNotDraw(false) - val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - inflater.inflate(R.layout.quest_progress, this) + val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater + inflater?.inflate(R.layout.quest_progress, this) questImageCaretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(ContextCompat.getColor(context, R.color.white), true)) questImageTitle.setOnClickListener { @@ -115,9 +115,7 @@ class QuestProgressView : LinearLayout { if (quest?.isValid == true) { val colors = quest?.colors if (colors != null) { - rect.set(0.0f, 0.0f, (canvas?.width?.toFloat() - ?: 1.0f) / displayDensity, (canvas?.height?.toFloat() - ?: 1.0f) / displayDensity) + rect.set(0.0f, 0.0f, width.toFloat() / displayDensity, height.toFloat() / displayDensity) canvas?.scale(displayDensity, displayDensity) HabiticaIcons.drawQuestBackground(canvas, rect, colors.darkColor, colors.mediumColor, colors.extraLightColor) canvas?.scale(1.0f / displayDensity, 1.0f / displayDensity) @@ -200,11 +198,11 @@ class QuestProgressView : LinearLayout { DataBindingUtils.loadImage("rage_strike_${strike.key}") { Observable.just(it) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(Consumer { + .subscribe(Consumer { bitmap -> val displayDensity = resources.displayMetrics.density - val width = it.width * displayDensity - val height = it.height * displayDensity - val scaledImage = Bitmap.createScaledBitmap(it, width.toInt(), height.toInt(), false) + val width = bitmap.width * displayDensity + val height = bitmap.height * displayDensity + val scaledImage = Bitmap.createScaledBitmap(bitmap, width.toInt(), height.toInt(), false) iconView.setImageBitmap(HabiticaIconsHelper.imageOfRageStrikeActive(context, scaledImage)) iconView.setOnClickListener { showActiveStrikeAlert(strike.key) @@ -234,9 +232,9 @@ class QuestProgressView : LinearLayout { npcBannerView.identifier = key alert.setAdditionalContentView(npcBannerView, 1) - alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close), { dialog, _ -> + alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() - }) + } alert.show() } @@ -246,9 +244,9 @@ class QuestProgressView : LinearLayout { alert.setTitleBackground(R.color.orange_10) alert.setSubtitle(R.string.pending_strike_subtitle) alert.setMessage(R.string.pending_strike_description) - alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close), { dialog, _ -> + alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() - }) + } alert.show() } @@ -258,9 +256,9 @@ class QuestProgressView : LinearLayout { alert.setTitleBackground(R.color.orange_10) alert.setSubtitle(R.string.strike_description_subtitle) alert.setMessage(R.string.strike_description_description) - alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close), { dialog, _ -> + alert.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() - }) + } alert.show() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt index 19be23d7d..9188e73a2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt @@ -2,8 +2,6 @@ package com.habitrpg.android.habitica.ui.views.social import android.content.Context import android.os.Build -import androidx.core.content.ContextCompat -import androidx.core.content.res.ResourcesCompat import android.util.AttributeSet import android.util.TypedValue import android.view.Gravity @@ -41,7 +39,7 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont } init { - val params = LinearLayout.LayoutParams( + val params = LayoutParams( FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT) params.gravity = Gravity.CENTER_VERTICAL 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 f5fd84a85..766f87429 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 @@ -63,10 +63,10 @@ class BulkAllocateStatsDialog(context: Context, component: AppComponent?) : Aler val view = inflater.inflate(R.layout.dialog_bulk_allocate, null) setView(view) - this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.save)) { _, _ -> + this.setButton(BUTTON_POSITIVE, context.getString(R.string.save)) { _, _ -> saveChanges() } - this.setButton(AlertDialog.BUTTON_NEUTRAL, context.getString(R.string.action_cancel)) { _, _ -> + this.setButton(BUTTON_NEUTRAL, context.getString(R.string.action_cancel)) { _, _ -> this.dismiss() } } @@ -145,13 +145,13 @@ class BulkAllocateStatsDialog(context: Context, component: AppComponent?) : Aler } private fun updateTitle() { - allocatedTitle.text = allocatedPoints.toString() + "/" + pointsToAllocate.toString() + allocatedTitle.text = "$allocatedPoints/$pointsToAllocate" if (allocatedPoints > 0) { titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_400)) } else { titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400)) } - getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = allocatedPoints > 0 + getButton(BUTTON_POSITIVE).isEnabled = allocatedPoints > 0 } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt index aadb0465f..cd286b161 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.views.subscriptions -import android.content.ComponentName import android.content.Context import android.content.Intent import android.net.Uri 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 54e527a74..4d852a069 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 @@ -72,7 +72,7 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog taskFilters.setOnCheckedChangeListener(this) - this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.done)) { _, _ -> + this.setButton(BUTTON_POSITIVE, context.getString(R.string.done)) { _, _ -> if (isEditing) { stopEditing() } @@ -80,14 +80,14 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog this.dismiss() } - setButton(AlertDialog.BUTTON_NEUTRAL, getContext().getString(R.string.clear)) { _, _ -> } + setButton(BUTTON_NEUTRAL, getContext().getString(R.string.clear)) { _, _ -> } tagsEditButton.setOnClickListener { editButtonClicked() } } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val clearButton = getButton(AlertDialog.BUTTON_NEUTRAL) + val clearButton = getButton(BUTTON_NEUTRAL) if (clearButton != null) { clearButton.setOnClickListener { if (isEditing) { @@ -333,7 +333,7 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog } private fun filtersChanged() { - val clearButton = getButton(AlertDialog.BUTTON_NEUTRAL) + val clearButton = getButton(BUTTON_NEUTRAL) if (clearButton != null) { clearButton.isEnabled = hasActiveFilters() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt index 6b0db3878..402c2d854 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitResetStreakButtons.kt @@ -34,7 +34,7 @@ class HabitResetStreakButtons @JvmOverloads constructor( val height = 28.dpToPx(context) for (resetOption in HabitResetOption.values()) { val button = createButton(resetOption) - val layoutParams = LinearLayout.LayoutParams(0, height) + val layoutParams = LayoutParams(0, height) layoutParams.weight = 1f if (resetOption != lastResetOption) { layoutParams.marginEnd = margin diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt index 91215f4af..fcbffee3a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import androidx.core.view.children import androidx.core.view.updateMargins import com.habitrpg.android.habitica.extensions.dpToPx -import com.habitrpg.android.habitica.models.tasks.ChecklistItem import com.habitrpg.android.habitica.models.tasks.RemindersItem import io.realm.RealmList @@ -45,7 +44,7 @@ class ReminderContainer @JvmOverloads constructor( } init { - orientation = LinearLayout.VERTICAL + orientation = VERTICAL addReminderViewAt(0) } @@ -74,7 +73,7 @@ class ReminderContainer @JvmOverloads constructor( } else { addView(view, indexToUse) } - val layoutParams = view.layoutParams as? LinearLayout.LayoutParams + val layoutParams = view.layoutParams as? LayoutParams layoutParams?.updateMargins(bottom = 8.dpToPx(context)) view.layoutParams = layoutParams } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt index 684f0039c..27a10268b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt @@ -1,9 +1,7 @@ package com.habitrpg.android.habitica.ui.views.tasks.form -import android.app.DatePickerDialog import android.app.TimePickerDialog import android.content.Context -import android.content.DialogInterface import android.util.AttributeSet import android.view.Gravity import android.view.ViewGroup diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt index 15cbcdb18..1c58d7265 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt @@ -35,7 +35,7 @@ class RewardValueFormView @JvmOverloads constructor( downButton.isEnabled = field > 0 } - var valueString = "" + private var valueString = "" set(value) { field = value diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt index 855e66c0f..993398fb0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.views.tasks.form import android.content.Context -import android.graphics.drawable.BitmapDrawable import android.util.AttributeSet import android.view.View import android.widget.ImageView @@ -9,7 +8,6 @@ import android.widget.LinearLayout import android.widget.Space import android.widget.TextView import androidx.core.content.ContextCompat -import androidx.core.view.children import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.android.habitica.extensions.inflate @@ -39,7 +37,7 @@ class TaskDifficultyButtons @JvmOverloads constructor( addView(button) if (difficulty != lastDifficulty) { val space = Space(context) - val layoutParams = LinearLayout.LayoutParams(0, LayoutParams.WRAP_CONTENT) + val layoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT) layoutParams.weight = 1f space.layoutParams = layoutParams addView(space) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt index 1ae43f827..618195c2d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt @@ -8,17 +8,13 @@ import android.view.View import android.view.ViewGroup import android.widget.* import androidx.appcompat.widget.AppCompatEditText -import androidx.appcompat.widget.AppCompatTextView import androidx.core.content.ContextCompat -import androidx.preference.PreferenceManager import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.dpToPx import com.habitrpg.android.habitica.extensions.inflate -import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper import com.habitrpg.android.habitica.models.tasks.Days import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.helpers.bindView -import java.lang.NumberFormatException import java.text.DateFormat import java.text.DateFormatSymbols import java.util.* @@ -157,7 +153,7 @@ class TaskSchedulingControls @JvmOverloads constructor( daysOfMonth = null } - orientation = LinearLayout.VERTICAL + orientation = VERTICAL configureViewsForType() configureViewsForFrequency() } @@ -226,7 +222,7 @@ class TaskSchedulingControls @JvmOverloads constructor( val lastWeekday = weekdayOrder.last() for (weekdayCode in weekdayOrder) { val button = TextView(context, null, 0, R.style.TaskFormWeekdayButton) - val layoutParams = LinearLayout.LayoutParams(size, size) + val layoutParams = LayoutParams(size, size) button.layoutParams = layoutParams button.text = weekdays[weekdayCode].first().toUpperCase().toString() val isActive = isWeekdayActive(weekdayCode) @@ -244,7 +240,7 @@ class TaskSchedulingControls @JvmOverloads constructor( weeklyRepeatWrapper.addView(button) if (weekdayCode != lastWeekday) { val space = Space(context) - val spaceLayoutParams = LinearLayout.LayoutParams(0, LayoutParams.WRAP_CONTENT) + val spaceLayoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT) spaceLayoutParams.weight = 1f space.layoutParams = spaceLayoutParams weeklyRepeatWrapper.addView(space) 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 97b9937df..9e0c9060e 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 @@ -35,7 +35,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater val view = inflater?.inflate(R.layout.dialog_yesterdaily, null) this.setView(view) - this.setButton(AlertDialog.BUTTON_POSITIVE, + this.setButton(BUTTON_POSITIVE, context.getString(R.string.start_day) ) { _, _ -> } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt index a26869712..84e816f0b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt @@ -6,27 +6,15 @@ import com.google.gson.JsonDeserializer import com.google.gson.JsonElement import com.google.gson.JsonParseException import com.google.gson.reflect.TypeToken -import com.habitrpg.android.habitica.data.CustomizationRepository import com.habitrpg.android.habitica.extensions.getAsString import com.habitrpg.android.habitica.models.ContentGear import com.habitrpg.android.habitica.models.ContentResult import com.habitrpg.android.habitica.models.FAQArticle import com.habitrpg.android.habitica.models.Skill -import com.habitrpg.android.habitica.models.inventory.Customization -import com.habitrpg.android.habitica.models.inventory.Egg -import com.habitrpg.android.habitica.models.inventory.Equipment -import com.habitrpg.android.habitica.models.inventory.Food -import com.habitrpg.android.habitica.models.inventory.HatchingPotion -import com.habitrpg.android.habitica.models.inventory.Mount -import com.habitrpg.android.habitica.models.inventory.Pet -import com.habitrpg.android.habitica.models.inventory.QuestContent - -import java.lang.reflect.Type - -import javax.inject.Inject - +import com.habitrpg.android.habitica.models.inventory.* import io.realm.RealmList -import java.util.ArrayList +import java.lang.reflect.Type +import java.util.* class ContentDeserializer : JsonDeserializer { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt index 74c4aa26d..b9e61c8cd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt @@ -1,23 +1,14 @@ package com.habitrpg.android.habitica.utils -import com.google.gson.JsonDeserializationContext -import com.google.gson.JsonDeserializer -import com.google.gson.JsonElement -import com.google.gson.JsonObject -import com.google.gson.JsonParseException -import com.google.gson.JsonSerializationContext -import com.google.gson.JsonSerializer +import com.google.gson.* import com.google.gson.reflect.TypeToken import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestRageStrike import com.habitrpg.android.habitica.models.members.Member -import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.social.Group - -import java.lang.reflect.Type - import io.realm.Realm import io.realm.RealmList +import java.lang.reflect.Type class GroupSerialization : JsonDeserializer, JsonSerializer { @Throws(JsonParseException::class) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt index d13565ed1..346919239 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt @@ -3,16 +3,13 @@ package com.habitrpg.android.habitica.utils import com.google.gson.JsonDeserializationContext 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.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestMember import com.habitrpg.android.habitica.models.inventory.QuestProgress import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect - -import java.lang.reflect.Type - import io.realm.RealmList +import java.lang.reflect.Type class QuestDeserializer : JsonDeserializer { @Throws(JsonParseException::class) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt index c552655d7..14f0d728f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt @@ -99,10 +99,6 @@ abstract class BaseWidgetProvider : AppWidgetProvider() { AmplitudeManager.sendEvent("widgets", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_CREATE_WIDGET, additionalData) } - override fun onUpdate(context: Context?, appWidgetManager: AppWidgetManager?, appWidgetIds: IntArray?) { - super.onUpdate(context, appWidgetManager, appWidgetIds) - } - override fun onDeleted(context: Context, appWidgetIds: IntArray) { val additionalData = HashMap() additionalData["identifier"] = this.javaClass.simpleName diff --git a/build.gradle b/build.gradle index 09cf4bdcc..d0132f741 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.21' + ext.kotlin_version = '1.3.30' ext.build_tools_version = '28.0.3' ext.sdk_version = 28