diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro index 15e1ba3a7..c511cae23 100644 --- a/Habitica/proguard-rules.pro +++ b/Habitica/proguard-rules.pro @@ -97,21 +97,6 @@ -keepclassmembers class * { native ; } -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip - -# Do not strip any method/class that is annotated with @DoNotStrip --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.common.internal.DoNotStrip *; -} - -# Keep native methods --keepclassmembers class * { - native ; -} -#end fresko #amplitude -keep class com.google.android.gms.ads.** { *; } diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml index b706c0c89..15e6339d5 100644 --- a/Habitica/res/layout/activity_armoire.xml +++ b/Habitica/res/layout/activity_armoire.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal"> - - - - diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml index f892e641f..b5b158ed5 100644 --- a/Habitica/res/layout/chat_item.xml +++ b/Habitica/res/layout/chat_item.xml @@ -35,7 +35,7 @@ - - - - diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml index 7ab09a57f..895be21a2 100644 --- a/Habitica/res/layout/dialog_hatch_pet_button.xml +++ b/Habitica/res/layout/dialog_hatch_pet_button.xml @@ -15,7 +15,7 @@ android:textColor="@color/white" android:layout_marginEnd="6dp" /> - diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml index 71e560cf7..f2d784958 100644 --- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml +++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml @@ -15,7 +15,7 @@ android:text="@string/reward_dialog_buy" android:textColor="@color/brand_300" style="@style/SubHeader1" /> - - diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml index 024f16c38..614f6c32b 100644 --- a/Habitica/res/layout/fragment_gift_gem_balance.xml +++ b/Habitica/res/layout/fragment_gift_gem_balance.xml @@ -18,7 +18,7 @@ app:showMount="false" app:showSleeping="false" android:layout_gravity="center_horizontal"/> - - - diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml index 69706b2c3..ff7653273 100644 --- a/Habitica/res/layout/item_inbox_overview.xml +++ b/Habitica/res/layout/item_inbox_overview.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - diff --git a/Habitica/res/layout/menu_bottom_sheet_item.xml b/Habitica/res/layout/menu_bottom_sheet_item.xml index f1bc752ad..0fd7574bd 100644 --- a/Habitica/res/layout/menu_bottom_sheet_item.xml +++ b/Habitica/res/layout/menu_bottom_sheet_item.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" style="@style/BottomMenuItemText" tools:text="Menu Item"/> - - - - (R.id.gem_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGem()) + (dialogContent.findViewById(R.id.gem_icon) as? ImageView)?.setImageBitmap( + HabiticaIconsHelper.imageOfGem()) val dialog = HabiticaAlertDialog(itemView.context) dialog.addButton(R.string.purchase_button, true) { _, _ -> 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 6460d7a1e..043b5a1cd 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 @@ -14,7 +14,7 @@ import com.habitrpg.common.habitica.extensions.isUsingNightModeResources import com.habitrpg.android.habitica.models.Skill import com.habitrpg.android.habitica.models.user.OwnedItem import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.subjects.PublishSubject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt index ba74a5f2b..ba218b5b8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt @@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.databinding.GearListItemBinding import com.habitrpg.android.habitica.models.inventory.Equipment import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.subjects.PublishSubject class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt index b0f082009..983c8e243 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt @@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.models.user.Stats -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List) : ArrayAdapter(context, resource, R.id.textView, objects) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt index 9320cfe68..950f6e00d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions import com.habitrpg.common.habitica.helpers.EmojiParser -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.subjects.PublishSubject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt index 3c850d49b..9b406565b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt @@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter import com.habitrpg.common.habitica.helpers.EmojiParser -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.realm.Case import io.realm.OrderedRealmCollection import java.util.Locale diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt index ec3a996a2..12e0dc8f6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt @@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.functions.Action diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index b4a1a6013..1c930c965 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.models.tasks.Attribute import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt index 73c04e42e..f35438e5c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt @@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.SetupActivity import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter import com.habitrpg.android.habitica.ui.fragments.BaseFragment -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import java.util.Date class TaskSetupFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt index 1b14dfc22..6d17af42a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.ui.fragments.BaseFragment -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.subjects.PublishSubject import java.util.concurrent.TimeUnit diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt index b3ff2011b..c5d47dd86 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt @@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar import io.reactivex.rxjava3.core.Flowable diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt index 0e36f7438..e86c4aeef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt @@ -25,7 +25,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import com.habitrpg.common.habitica.views.UsernameLabel +import com.habitrpg.android.habitica.ui.views.UsernameLabel import javax.inject.Inject class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener { 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 bde759f26..a7f76692d 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 @@ -28,7 +28,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.common.habitica.models.PlayerTier -import com.habitrpg.common.habitica.views.UsernameLabel +import com.habitrpg.android.habitica.ui.views.UsernameLabel import javax.inject.Inject class TavernDetailFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt index e9569346f..55ab3ca7d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt @@ -36,7 +36,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.common.habitica.helpers.EmojiParser import com.habitrpg.common.habitica.helpers.setMarkdown import com.habitrpg.common.habitica.models.tasks.TaskType -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import retrofit2.HttpException import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt index a706835d9..eb4eb1c11 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt @@ -26,8 +26,8 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.common.habitica.helpers.setMarkdown import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel -import com.habitrpg.common.habitica.views.HabiticaIcons -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIcons +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.SnackbarActivity import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import kotlinx.coroutines.Dispatchers diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt index bef1f6e90..39c4c28e7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt @@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.common.habitica.helpers.setMarkdown -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.functions.Consumer import javax.inject.Inject @@ -45,13 +45,20 @@ class FAQOverviewFragment : BaseMainFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding?.healthSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge()) - binding?.experienceSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward()) - binding?.manaSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge()) - binding?.goldSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward()) - binding?.gemsSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGem()) - binding?.hourglassesSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge()) - binding?.statsSection?.findViewById(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfStats()) + binding?.healthSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfHeartLarge()) + binding?.experienceSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfExperienceReward()) + binding?.manaSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfMagicLarge()) + binding?.goldSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfGoldReward()) + binding?.gemsSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfGem()) + binding?.hourglassesSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfHourglassLarge()) + binding?.statsSection?.findViewById(R.id.icon_view)?.setImageBitmap( + HabiticaIconsHelper.imageOfStats()) binding?.moreHelpTextView?.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)")) binding?.moreHelpTextView?.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) } 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 80033e1a9..2063d4c2a 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 @@ -47,7 +47,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.common.habitica.models.responses.TaskDirection import com.habitrpg.common.habitica.models.responses.TaskScoringResult import com.habitrpg.common.habitica.models.tasks.TaskType -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.disposables.CompositeDisposable import kotlinx.coroutines.Job 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 5088338a0..d624d7787 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 @@ -15,7 +15,7 @@ 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.common.habitica.views.UsernameLabel +import com.habitrpg.android.habitica.ui.views.UsernameLabel import com.habitrpg.common.habitica.helpers.EmojiMap import com.habitrpg.common.habitica.helpers.EmojiParser import java.util.Date diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt index 935b2356a..a595185ca 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt @@ -23,7 +23,7 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils import com.habitrpg.common.habitica.extensions.dpToPx import com.habitrpg.common.habitica.helpers.MarkdownParser import com.habitrpg.common.habitica.helpers.setParsedMarkdown -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Maybe import io.reactivex.rxjava3.schedulers.Schedulers diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt index 9be773190..8bdc10c86 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt @@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.PartyMemberBinding import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.user.Stats -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener { private val binding = PartyMemberBinding.bind(itemView) 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 4c180c4d1..4f126516e 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 @@ -11,7 +11,7 @@ import com.habitrpg.common.habitica.extensions.dpToPx import com.habitrpg.common.habitica.extensions.isUsingNightModeResources import com.habitrpg.android.habitica.models.shops.ShopItem import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt index d291df02d..f5c863667 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt @@ -10,7 +10,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator import com.habitrpg.common.habitica.models.responses.TaskDirection import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.ItemDetailDialog -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class RewardViewHolder( itemView: View, 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 81bc6c7bc..e3ee68a1d 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 @@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.ViewCollapsibleSectionBinding import com.habitrpg.common.habitica.extensions.getThemeColor import com.habitrpg.common.habitica.extensions.layoutInflater -import com.habitrpg.common.habitica.views.HabiticaIconsHelper class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) { val infoIconView: ImageView diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt similarity index 94% rename from common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt index fbd641889..d62f07d79 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt @@ -1,4 +1,4 @@ -package com.habitrpg.common.habitica.views +package com.habitrpg.android.habitica.ui.views import android.animation.ValueAnimator import android.content.Context @@ -13,8 +13,8 @@ import androidx.core.animation.doOnEnd import androidx.core.animation.doOnStart import androidx.core.content.ContextCompat import androidx.core.view.updateLayoutParams -import com.habitrpg.common.habitica.extensions.isUsingNightModeResources import com.habitrpg.common.habitica.R +import com.habitrpg.common.habitica.extensions.isUsingNightModeResources import com.habitrpg.common.habitica.helpers.NumberAbbreviator class CurrencyView : androidx.appcompat.widget.AppCompatTextView { @@ -69,21 +69,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView { private fun configureCurrency() { if ("gold" == currency) { - icon = HabiticaIconsHelper.imageOfGold() + icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGold() if (lightBackground) { setTextColor(ContextCompat.getColor(context, R.color.yellow_1)) } else { setTextColor(ContextCompat.getColor(context, R.color.yellow_100)) } } else if ("gems" == currency) { - icon = HabiticaIconsHelper.imageOfGem() + icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGem() if (lightBackground) { setTextColor(ContextCompat.getColor(context, R.color.green_10)) } else { setTextColor(ContextCompat.getColor(context, R.color.green_50)) } } else if ("hourglasses" == currency) { - icon = HabiticaIconsHelper.imageOfHourglass() + icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfHourglass() if (lightBackground) { setTextColor(ContextCompat.getColor(context, R.color.brand_300)) } else { 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 134a0089c..6d3f44a55 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 @@ -6,7 +6,6 @@ import android.util.TypedValue import android.widget.LinearLayout import com.habitrpg.android.habitica.R import com.habitrpg.common.habitica.extensions.isUsingNightModeResources -import com.habitrpg.common.habitica.views.CurrencyView class CurrencyViews : LinearLayout { var lightBackground: Boolean = false diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java similarity index 99% rename from common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java index 0f8228b7e..2dc734973 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java @@ -1,4 +1,4 @@ -package com.habitrpg.common.habitica.views; +package com.habitrpg.android.habitica.ui.views; import android.content.Context; import android.graphics.Bitmap; diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java similarity index 99% rename from common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java index 5263e360f..d53a38a1d 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java @@ -1,4 +1,4 @@ -package com.habitrpg.common.habitica.views; +package com.habitrpg.android.habitica.ui.views; import android.content.Context; import android.graphics.Bitmap; @@ -8,8 +8,6 @@ import android.graphics.RectF; import androidx.annotation.ColorInt; -import com.habitrpg.common.habitica.views.HabiticaIcons; - /** * Created by phillip on 05.09.17. */ diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt similarity index 91% rename from common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt index 6ab09431d..ce0c49760 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt @@ -1,4 +1,4 @@ -package com.habitrpg.common.habitica.views +package com.habitrpg.android.habitica.ui.views import android.content.Context import android.util.AttributeSet @@ -44,7 +44,7 @@ class UsernameLabel @JvmOverloads constructor( tierIconView.visibility = View.GONE } else { tierIconView.visibility = View.VISIBLE - tierIconView.setImageBitmap(HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC)) + tierIconView.setImageBitmap(com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC)) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt index d328c626d..e5eed8ced 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt @@ -16,7 +16,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.inventory.QuestDropItem import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.common.habitica.views.PixelArtView class QuestCompletedDialogContent : LinearLayout { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt index df9a974fb..5c722cc5d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt @@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class EquipmentOverviewItem @JvmOverloads constructor( context: Context, 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 9ce7df8aa..115e0f181 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 @@ -6,7 +6,7 @@ import androidx.core.os.bundleOf import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.addCloseButton import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDialog(context) { override fun onCreate(savedInstanceState: Bundle?) { 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 e6a9d17b7..d7c004062 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 @@ -8,7 +8,7 @@ import android.content.Context import android.util.AttributeSet import android.view.View import androidx.appcompat.widget.AppCompatImageView -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class StarView : AppCompatImageView { 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 a5ded43d3..d6ba0758b 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 @@ -28,9 +28,9 @@ import com.habitrpg.android.habitica.models.shops.ShopItem import com.habitrpg.android.habitica.models.user.OwnedItem import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.ArmoireActivityDirections -import com.habitrpg.common.habitica.views.CurrencyView +import com.habitrpg.android.habitica.ui.views.CurrencyView import com.habitrpg.android.habitica.ui.views.CurrencyViews -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.SnackbarActivity import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt index 755e8c296..42fda0c87 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt @@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseGemsBinding import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.shops.ShopItem -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.common.habitica.views.PixelArtView internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt index 5253c89d0..67d3e1b88 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt @@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.inventory.QuestDropItem import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.common.habitica.views.PixelArtView class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(context) { 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 7f5d8fb60..a10a867ba 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 @@ -18,8 +18,8 @@ import com.habitrpg.android.habitica.models.inventory.QuestProgress import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect import com.habitrpg.android.habitica.models.user.User import com.habitrpg.common.habitica.extensions.loadImage -import com.habitrpg.common.habitica.views.HabiticaIcons -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIcons +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class OldQuestProgressView : LinearLayout { private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this) 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 fffb1a616..129275201 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 @@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestContent import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import java.util.Locale class QuestMenuView : LinearLayout { 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 50044c633..9a32b88b4 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 @@ -28,8 +28,8 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.common.habitica.extensions.DataBindingUtils import com.habitrpg.common.habitica.extensions.loadImage import com.habitrpg.common.habitica.helpers.setMarkdown -import com.habitrpg.common.habitica.views.HabiticaIcons -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIcons +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.NPCBannerView import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt index 6bd94abec..8a3455f0d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.databinding.StatsViewBinding import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.extensions.setTintWith import com.habitrpg.android.habitica.helpers.HapticFeedbackManager -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) { private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true) 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 8c396b4b1..fb2d10d45 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 @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.SubscriptionDetailsBinding import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.user.SubscriptionPlan -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import java.text.DateFormat import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt index db4f51f32..f5dd0af0c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt @@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.TaskFormHabitScoringBinding import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.common.habitica.extensions.layoutInflater -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class HabitScoringButtonsView @JvmOverloads constructor( context: Context, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt index b91d58f85..1230ef00a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt @@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.databinding.FormStepperValueBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.common.habitica.extensions.layoutInflater -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import java.text.DecimalFormat class StepperValueFormView @JvmOverloads constructor( 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 c3351ac4c..4f706e911 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 @@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.common.habitica.models.tasks.TaskDifficulty -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class TaskDifficultyButtons @JvmOverloads constructor( context: Context, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt index 0bdaf10a4..1cc60c14d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt @@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.common.habitica.views.AvatarView import com.habitrpg.android.habitica.ui.activities.MainActivity -import com.habitrpg.common.habitica.views.HabiticaIconsHelper +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class AvatarStatsWidgetProvider : BaseWidgetProvider() { diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt index 0c3964c53..9b2689c61 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt @@ -4,7 +4,6 @@ import android.app.Application import android.content.Intent import com.habitrpg.common.habitica.extensions.setupCoil import com.habitrpg.common.habitica.helpers.MarkdownParser -import com.habitrpg.common.habitica.views.HabiticaIconsHelper import com.habitrpg.wearos.habitica.data.repositories.TaskRepository import com.habitrpg.wearos.habitica.data.repositories.UserRepository import com.habitrpg.wearos.habitica.ui.activities.BaseActivity @@ -26,7 +25,6 @@ class MainApplication : Application() { override fun onCreate() { super.onCreate() - HabiticaIconsHelper.init(this) MarkdownParser.setup(this) setupCoil() diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt index 3332b620d..fa9959a69 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt @@ -8,7 +8,6 @@ import androidx.activity.viewModels import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.ActivityStatsBinding -import com.habitrpg.common.habitica.views.HabiticaIconsHelper import com.habitrpg.wearos.habitica.models.user.Stats import com.habitrpg.wearos.habitica.models.user.User import com.habitrpg.wearos.habitica.ui.viewmodels.StatsViewModel @@ -25,6 +24,8 @@ class StatsActivity : BaseActivity() { viewModel.user.observe(this) { loadViews(it) } + + viewModel.retrieveUser() } private fun setViews() { @@ -58,9 +59,9 @@ class StatsActivity : BaseActivity() { binding.expStatValue.visibility = INVISIBLE binding.mpStatValue.visibility = INVISIBLE - binding.hpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfHeartLarge(), R.color.hp_bar_color) - binding.expStatValue.setStatValueResources(HabiticaIconsHelper.imageOfExperience(), R.color.exp_bar_color) - binding.mpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfMagic(), R.color.mpColor) + binding.hpStatValue.setStatValueResources(R.drawable.heart, R.color.hp_bar_color) + binding.expStatValue.setStatValueResources(R.drawable.experience, R.color.exp_bar_color) + binding.mpStatValue.setStatValueResources(R.drawable.magic, R.color.mpColor) } private fun updateStats(user: User) { diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt index 83a07e251..080ab510d 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt @@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.extensions.localizedCapitalize import com.habitrpg.common.habitica.extensions.dpToPx import com.habitrpg.common.habitica.extensions.loadImage import com.habitrpg.common.habitica.models.responses.TaskScoringResult -import com.habitrpg.common.habitica.views.HabiticaIconsHelper import com.habitrpg.wearos.habitica.ui.viewmodels.TaskResultViewModel import com.habitrpg.wearos.habitica.ui.views.TaskRewardChip import dagger.hilt.android.AndroidEntryPoint @@ -57,7 +56,7 @@ class TaskResultActivity : BaseActivity = userRepository.getUser().asLiveData() diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt index 09c03546a..6ddd83490 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt @@ -2,7 +2,6 @@ package com.habitrpg.wearos.habitica.ui.views import android.animation.ValueAnimator import android.content.Context -import android.graphics.Bitmap import android.graphics.Color import android.util.AttributeSet import androidx.constraintlayout.widget.ConstraintLayout @@ -31,8 +30,8 @@ class StatValue @JvmOverloads constructor( startUpdateCountAnimation(currentValue) } - fun setStatValueResources(bitmap: Bitmap, bitmapColor: Int) { - binding.bitmap.setImageBitmap(bitmap) + fun setStatValueResources(resId: Int, bitmapColor: Int) { + binding.bitmap.setImageResource(resId) binding.currentValue.setTextColor( context?.resources?.getColor(bitmapColor, null) ?: Color.WHITE ) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt index 13c619c3c..73a1330c2 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt @@ -47,8 +47,8 @@ class TaskRewardChip @JvmOverloads constructor( gravity = Gravity.CENTER } - fun set(value: Double?, icon: Bitmap) { - binding.iconView.setImageBitmap(icon) + fun set(value: Double?, iconRes: Int) { + binding.iconView.setImageResource(iconRes) var text = formatter.format(value?.round(if (value < 1 && value > -1) 1 else 0)) if (text.firstOrNull() == '0') { text = text.substring(1) diff --git a/wearos/src/main/res/drawable-hdpi/experience.png b/wearos/src/main/res/drawable-hdpi/experience.png deleted file mode 100644 index a0f4a06b7..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/experience.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/habit_diagonal.png b/wearos/src/main/res/drawable-hdpi/habit_diagonal.png deleted file mode 100644 index e16e1f5b6..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/habit_diagonal.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-hdpi/habit_diagonal.webp new file mode 100644 index 000000000..c44f32a76 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/habit_diagonal.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_avatar.png b/wearos/src/main/res/drawable-hdpi/icon_avatar.png deleted file mode 100644 index dc4050d65..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_avatar.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_avatar.webp b/wearos/src/main/res/drawable-hdpi/icon_avatar.webp new file mode 100644 index 000000000..55a6f8295 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_avatar.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_dailies.png b/wearos/src/main/res/drawable-hdpi/icon_dailies.png deleted file mode 100644 index b0835b568..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_dailies.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_dailies.webp b/wearos/src/main/res/drawable-hdpi/icon_dailies.webp new file mode 100644 index 000000000..93099b7dd Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_dailies.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_habits.png b/wearos/src/main/res/drawable-hdpi/icon_habits.png deleted file mode 100644 index 356e8d066..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_habits.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_habits.webp b/wearos/src/main/res/drawable-hdpi/icon_habits.webp new file mode 100644 index 000000000..1f31a2afb Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_habits.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_settings.png b/wearos/src/main/res/drawable-hdpi/icon_settings.png deleted file mode 100644 index c1de183e0..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_settings.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_settings.webp b/wearos/src/main/res/drawable-hdpi/icon_settings.webp new file mode 100644 index 000000000..12b8c1bea Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_settings.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_stats.png b/wearos/src/main/res/drawable-hdpi/icon_stats.png deleted file mode 100644 index 829ce553e..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_stats.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_stats.webp b/wearos/src/main/res/drawable-hdpi/icon_stats.webp new file mode 100644 index 000000000..6d975f181 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_stats.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_todos.png b/wearos/src/main/res/drawable-hdpi/icon_todos.png deleted file mode 100644 index a785c45f1..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/icon_todos.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/icon_todos.webp b/wearos/src/main/res/drawable-hdpi/icon_todos.webp new file mode 100644 index 000000000..d3013aab1 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/icon_todos.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/magic.png b/wearos/src/main/res/drawable-hdpi/magic.png deleted file mode 100644 index 88a1f5607..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/magic.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-hdpi/watch_habit_negative.png deleted file mode 100644 index b33059881..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/watch_habit_negative.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp new file mode 100644 index 000000000..3fc69f420 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-hdpi/watch_habit_positive.png deleted file mode 100644 index 2828fd1c5..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/watch_habit_positive.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp new file mode 100644 index 000000000..08b4b0e54 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png deleted file mode 100644 index 2be2812fd..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp new file mode 100644 index 000000000..0f42a55c1 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_add.png b/wearos/src/main/res/drawable-hdpi/watch_task_add.png deleted file mode 100644 index 9388cefde..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/watch_task_add.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_add.webp b/wearos/src/main/res/drawable-hdpi/watch_task_add.webp new file mode 100644 index 000000000..489844990 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/watch_task_add.webp differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_minus.png b/wearos/src/main/res/drawable-hdpi/watch_task_minus.png deleted file mode 100644 index d0af9df8b..000000000 Binary files a/wearos/src/main/res/drawable-hdpi/watch_task_minus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-hdpi/watch_task_minus.webp new file mode 100644 index 000000000..499863d08 Binary files /dev/null and b/wearos/src/main/res/drawable-hdpi/watch_task_minus.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/broken_heart.png b/wearos/src/main/res/drawable-mdpi/broken_heart.png deleted file mode 100644 index cee972753..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/broken_heart.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/broken_heart.webp b/wearos/src/main/res/drawable-mdpi/broken_heart.webp new file mode 100644 index 000000000..96bcfc969 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/broken_heart.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/checkmark.png b/wearos/src/main/res/drawable-mdpi/checkmark.png deleted file mode 100644 index 5ef0f45ab..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/checkmark.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/checkmark.webp b/wearos/src/main/res/drawable-mdpi/checkmark.webp new file mode 100644 index 000000000..f8a822070 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/checkmark.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/experience.png b/wearos/src/main/res/drawable-mdpi/experience.png deleted file mode 100644 index cd22d0e25..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/experience.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/experience.webp b/wearos/src/main/res/drawable-mdpi/experience.webp new file mode 100644 index 000000000..45ace4f2b Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/experience.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/gold.webp b/wearos/src/main/res/drawable-mdpi/gold.webp new file mode 100644 index 000000000..3471f0f83 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/gold.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/habit_diagonal.png b/wearos/src/main/res/drawable-mdpi/habit_diagonal.png deleted file mode 100644 index e16e1f5b6..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/habit_diagonal.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-mdpi/habit_diagonal.webp new file mode 100644 index 000000000..c44f32a76 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/habit_diagonal.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/handoff.png b/wearos/src/main/res/drawable-mdpi/handoff.png deleted file mode 100644 index 3656b0163..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/handoff.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/heart.webp b/wearos/src/main/res/drawable-mdpi/heart.webp new file mode 100644 index 000000000..1667efdb3 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/heart.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_avatar.png b/wearos/src/main/res/drawable-mdpi/icon_avatar.png deleted file mode 100644 index 0de54ad05..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_avatar.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_avatar.webp b/wearos/src/main/res/drawable-mdpi/icon_avatar.webp new file mode 100644 index 000000000..439338438 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_avatar.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_dailies.png b/wearos/src/main/res/drawable-mdpi/icon_dailies.png deleted file mode 100644 index 24fed64f7..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_dailies.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_dailies.webp b/wearos/src/main/res/drawable-mdpi/icon_dailies.webp new file mode 100644 index 000000000..57bb2b828 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_dailies.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_habits.png b/wearos/src/main/res/drawable-mdpi/icon_habits.png deleted file mode 100644 index 9046fe165..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_habits.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_habits.webp b/wearos/src/main/res/drawable-mdpi/icon_habits.webp new file mode 100644 index 000000000..1cca6a297 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_habits.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_plus.png b/wearos/src/main/res/drawable-mdpi/icon_plus.png deleted file mode 100644 index 5354565ab..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_plus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_plus.webp b/wearos/src/main/res/drawable-mdpi/icon_plus.webp new file mode 100644 index 000000000..e9f6512ae Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_plus.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_settings.png b/wearos/src/main/res/drawable-mdpi/icon_settings.png deleted file mode 100644 index 3764285a6..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_settings.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_settings.webp b/wearos/src/main/res/drawable-mdpi/icon_settings.webp new file mode 100644 index 000000000..28f1d3e2b Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_settings.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_stats.png b/wearos/src/main/res/drawable-mdpi/icon_stats.png deleted file mode 100644 index 98cd4e586..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_stats.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_stats.webp b/wearos/src/main/res/drawable-mdpi/icon_stats.webp new file mode 100644 index 000000000..63553e50a Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_stats.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_todos.png b/wearos/src/main/res/drawable-mdpi/icon_todos.png deleted file mode 100644 index 91c0d1989..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/icon_todos.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/icon_todos.webp b/wearos/src/main/res/drawable-mdpi/icon_todos.webp new file mode 100644 index 000000000..bcd26f720 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/icon_todos.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/magic.png b/wearos/src/main/res/drawable-mdpi/magic.png deleted file mode 100644 index e9cc12874..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/magic.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/magic.webp b/wearos/src/main/res/drawable-mdpi/magic.webp new file mode 100644 index 000000000..2e84c1763 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/magic.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-mdpi/watch_habit_negative.png deleted file mode 100644 index 87472b37c..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/watch_habit_negative.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp new file mode 100644 index 000000000..7836ea886 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-mdpi/watch_habit_positive.png deleted file mode 100644 index 33685979e..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/watch_habit_positive.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp new file mode 100644 index 000000000..b1ecd0150 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png deleted file mode 100644 index 382ef7390..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp new file mode 100644 index 000000000..933bb3464 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_add.png b/wearos/src/main/res/drawable-mdpi/watch_task_add.png deleted file mode 100644 index 28c520279..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/watch_task_add.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_add.webp b/wearos/src/main/res/drawable-mdpi/watch_task_add.webp new file mode 100644 index 000000000..e9f6512ae Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/watch_task_add.webp differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_minus.png b/wearos/src/main/res/drawable-mdpi/watch_task_minus.png deleted file mode 100644 index 0cb8ab949..000000000 Binary files a/wearos/src/main/res/drawable-mdpi/watch_task_minus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-mdpi/watch_task_minus.webp new file mode 100644 index 000000000..a28a91f82 Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/watch_task_minus.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/broken_heart.png b/wearos/src/main/res/drawable-xhdpi/broken_heart.png deleted file mode 100644 index 72a0eba89..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/broken_heart.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/broken_heart.webp b/wearos/src/main/res/drawable-xhdpi/broken_heart.webp new file mode 100644 index 000000000..abc481c22 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/broken_heart.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/checkmark.png b/wearos/src/main/res/drawable-xhdpi/checkmark.png deleted file mode 100644 index f55e2942e..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/checkmark.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/checkmark.webp b/wearos/src/main/res/drawable-xhdpi/checkmark.webp new file mode 100644 index 000000000..27c78d414 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/checkmark.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/experience.png b/wearos/src/main/res/drawable-xhdpi/experience.png deleted file mode 100644 index 2cb5dc1f2..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/experience.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/experience.webp b/wearos/src/main/res/drawable-xhdpi/experience.webp new file mode 100644 index 000000000..5e7c8aeb6 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/experience.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/gold.webp b/wearos/src/main/res/drawable-xhdpi/gold.webp new file mode 100644 index 000000000..05300312f Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/gold.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/habit_diagonal.png b/wearos/src/main/res/drawable-xhdpi/habit_diagonal.png deleted file mode 100644 index 3fbab0a14..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/habit_diagonal.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp new file mode 100644 index 000000000..095eb121b Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/handoff.png b/wearos/src/main/res/drawable-xhdpi/handoff.png deleted file mode 100644 index 864df57dd..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/handoff.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/heart.webp b/wearos/src/main/res/drawable-xhdpi/heart.webp new file mode 100644 index 000000000..161688a9c Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/heart.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xhdpi/icon_avatar.png deleted file mode 100644 index a655d4919..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_avatar.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xhdpi/icon_avatar.webp new file mode 100644 index 000000000..e48c0ca84 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_avatar.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xhdpi/icon_dailies.png deleted file mode 100644 index fb8bf36b1..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_dailies.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xhdpi/icon_dailies.webp new file mode 100644 index 000000000..00770abf6 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_dailies.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_habits.png b/wearos/src/main/res/drawable-xhdpi/icon_habits.png deleted file mode 100644 index 70e3f7a5f..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_habits.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xhdpi/icon_habits.webp new file mode 100644 index 000000000..f15f57658 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_habits.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_plus.png b/wearos/src/main/res/drawable-xhdpi/icon_plus.png deleted file mode 100644 index 2190e4475..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_plus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_plus.webp b/wearos/src/main/res/drawable-xhdpi/icon_plus.webp new file mode 100644 index 000000000..fdc1b5ddc Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_plus.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_settings.png b/wearos/src/main/res/drawable-xhdpi/icon_settings.png deleted file mode 100644 index a637d57c5..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_settings.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xhdpi/icon_settings.webp new file mode 100644 index 000000000..907327a58 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_settings.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_stats.png b/wearos/src/main/res/drawable-xhdpi/icon_stats.png deleted file mode 100644 index df98550f8..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_stats.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xhdpi/icon_stats.webp new file mode 100644 index 000000000..a68b8b999 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_stats.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_todos.png b/wearos/src/main/res/drawable-xhdpi/icon_todos.png deleted file mode 100644 index 90a1ca206..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/icon_todos.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xhdpi/icon_todos.webp new file mode 100644 index 000000000..0bf45b3d7 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/icon_todos.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/magic.png b/wearos/src/main/res/drawable-xhdpi/magic.png deleted file mode 100644 index 3bb78d2af..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/magic.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/magic.webp b/wearos/src/main/res/drawable-xhdpi/magic.webp new file mode 100644 index 000000000..c0528a52b Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/magic.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png deleted file mode 100644 index 31487cdf0..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp new file mode 100644 index 000000000..95a5d46d6 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png deleted file mode 100644 index e762dacd5..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp new file mode 100644 index 000000000..5c81f93f7 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png deleted file mode 100644 index 79f625631..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp new file mode 100644 index 000000000..8407ed9c6 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xhdpi/watch_task_add.png deleted file mode 100644 index cc7474925..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/watch_task_add.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xhdpi/watch_task_add.webp new file mode 100644 index 000000000..9ec1f55d8 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/watch_task_add.webp differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xhdpi/watch_task_minus.png deleted file mode 100644 index d8f4536a5..000000000 Binary files a/wearos/src/main/res/drawable-xhdpi/watch_task_minus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp new file mode 100644 index 000000000..8e5489d46 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/broken_heart.png b/wearos/src/main/res/drawable-xxhdpi/broken_heart.png deleted file mode 100644 index 8793117b6..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/broken_heart.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/broken_heart.webp b/wearos/src/main/res/drawable-xxhdpi/broken_heart.webp new file mode 100644 index 000000000..03a3575ae Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/broken_heart.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/checkmark.png b/wearos/src/main/res/drawable-xxhdpi/checkmark.png deleted file mode 100644 index d5a4ec6ff..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/checkmark.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/checkmark.webp b/wearos/src/main/res/drawable-xxhdpi/checkmark.webp new file mode 100644 index 000000000..38aacdf95 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/checkmark.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/experience.png b/wearos/src/main/res/drawable-xxhdpi/experience.png deleted file mode 100644 index 47d16b80f..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/experience.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/experience.webp b/wearos/src/main/res/drawable-xxhdpi/experience.webp new file mode 100644 index 000000000..f2db68b30 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/experience.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/gold.webp b/wearos/src/main/res/drawable-xxhdpi/gold.webp new file mode 100644 index 000000000..b7fb68f8e Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/gold.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png b/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png deleted file mode 100644 index bbd54c3c1..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp new file mode 100644 index 000000000..a9a8c8f18 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/handoff.png b/wearos/src/main/res/drawable-xxhdpi/handoff.png deleted file mode 100644 index 7e1c33b49..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/handoff.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/heart.webp b/wearos/src/main/res/drawable-xxhdpi/heart.webp new file mode 100644 index 000000000..e454c57a1 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/heart.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xxhdpi/icon_avatar.png deleted file mode 100644 index 2387e92aa..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_avatar.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp new file mode 100644 index 000000000..e42a581fb Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xxhdpi/icon_dailies.png deleted file mode 100644 index eeb44de96..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_dailies.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp new file mode 100644 index 000000000..8630568e2 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_habits.png b/wearos/src/main/res/drawable-xxhdpi/icon_habits.png deleted file mode 100644 index 5bfd5a88a..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_habits.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xxhdpi/icon_habits.webp new file mode 100644 index 000000000..c4beb1c05 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_habits.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_plus.png b/wearos/src/main/res/drawable-xxhdpi/icon_plus.png deleted file mode 100644 index da8394652..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_plus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_plus.webp b/wearos/src/main/res/drawable-xxhdpi/icon_plus.webp new file mode 100644 index 000000000..848f9f89f Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_plus.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_settings.png b/wearos/src/main/res/drawable-xxhdpi/icon_settings.png deleted file mode 100644 index 47de4c725..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_settings.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xxhdpi/icon_settings.webp new file mode 100644 index 000000000..46f32a9ee Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_settings.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_stats.png b/wearos/src/main/res/drawable-xxhdpi/icon_stats.png deleted file mode 100644 index eec092c2b..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_stats.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xxhdpi/icon_stats.webp new file mode 100644 index 000000000..6600fd0ea Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_stats.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_todos.png b/wearos/src/main/res/drawable-xxhdpi/icon_todos.png deleted file mode 100644 index b37ffcc61..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/icon_todos.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xxhdpi/icon_todos.webp new file mode 100644 index 000000000..3801a6c57 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/icon_todos.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/magic.png b/wearos/src/main/res/drawable-xxhdpi/magic.png deleted file mode 100644 index aeec05d78..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/magic.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/magic.webp b/wearos/src/main/res/drawable-xxhdpi/magic.webp new file mode 100644 index 000000000..c4f8f7a81 Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/magic.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png deleted file mode 100644 index 76b1ac67d..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp new file mode 100644 index 000000000..3dacbc28f Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png deleted file mode 100644 index c87abb893..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp new file mode 100644 index 000000000..406a9ccbe Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png deleted file mode 100644 index 52dec330e..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp new file mode 100644 index 000000000..cce655d7f Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xxhdpi/watch_task_add.png deleted file mode 100644 index a65f54d00..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/watch_task_add.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp new file mode 100644 index 000000000..8e9956baf Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png deleted file mode 100644 index ade3510a0..000000000 Binary files a/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp new file mode 100644 index 000000000..cca5e5d7e Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/experience.png b/wearos/src/main/res/drawable-xxxhdpi/experience.png deleted file mode 100644 index a69d690d9..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/experience.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/experience.webp b/wearos/src/main/res/drawable-xxxhdpi/experience.webp new file mode 100644 index 000000000..9624da9ac Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/experience.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png deleted file mode 100644 index 77ff583c1..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp new file mode 100644 index 000000000..6e693b801 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png deleted file mode 100644 index 8f1333f68..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp new file mode 100644 index 000000000..1624a728c Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_habits.png b/wearos/src/main/res/drawable-xxxhdpi/icon_habits.png deleted file mode 100644 index 88dd1137f..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_habits.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp new file mode 100644 index 000000000..27830af77 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_settings.png b/wearos/src/main/res/drawable-xxxhdpi/icon_settings.png deleted file mode 100644 index c09a30bb9..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_settings.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp new file mode 100644 index 000000000..90efa4309 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_stats.png b/wearos/src/main/res/drawable-xxxhdpi/icon_stats.png deleted file mode 100644 index 8e6873782..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_stats.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp new file mode 100644 index 000000000..e3d5caf88 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_todos.png b/wearos/src/main/res/drawable-xxxhdpi/icon_todos.png deleted file mode 100644 index ad8fbc38e..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/icon_todos.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp new file mode 100644 index 000000000..c95435e2d Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/magic.png b/wearos/src/main/res/drawable-xxxhdpi/magic.png deleted file mode 100644 index 09645056c..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/magic.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/magic.webp b/wearos/src/main/res/drawable-xxxhdpi/magic.webp new file mode 100644 index 000000000..4e886aa21 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/magic.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png deleted file mode 100644 index 31aeb3813..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp new file mode 100644 index 000000000..e7c4013c9 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png deleted file mode 100644 index d02d33828..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp new file mode 100644 index 000000000..a0e8ffa4a Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png deleted file mode 100644 index e7e98a26f..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp new file mode 100644 index 000000000..10c3d8ed3 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png deleted file mode 100644 index ac116bdff..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp new file mode 100644 index 000000000..1832821e2 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png deleted file mode 100644 index 283caf99b..000000000 Binary files a/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png and /dev/null differ diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp new file mode 100644 index 000000000..c59da49f5 Binary files /dev/null and b/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp differ diff --git a/wearos/src/main/res/drawable/cancel.xml b/wearos/src/main/res/drawable/cancel.xml index c13da3188..ce53ea724 100644 --- a/wearos/src/main/res/drawable/cancel.xml +++ b/wearos/src/main/res/drawable/cancel.xml @@ -1,6 +1,6 @@ + + diff --git a/wearos/src/main/res/drawable/logout.xml b/wearos/src/main/res/drawable/logout.xml index 0673850d0..1d6f5b75b 100644 --- a/wearos/src/main/res/drawable/logout.xml +++ b/wearos/src/main/res/drawable/logout.xml @@ -1,6 +1,6 @@