sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-22 13:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update deprecated code

Browse source
This commit is contained in:
Phillip Thelen 2021-06-04 16:11:48 +02:00
parent 393521ace9
commit b15bc38c0a
158 changed files with 1005 additions and 989 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable-hdpi/drawer_shadow.9.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 B

After

Width:  |  Height:  |  Size: 127 B

1
Habitica/res/layout/activity_adventure_guide.xml
View file

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorContentBackground"
android:orientation="vertical"
tools:context=".ui.activities.PrefsActivity">

3
Habitica/res/layout/activity_class_selection.xml
View file

@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/content_background">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

3
Habitica/res/layout/activity_create_challenge.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="?attr/colorContentBackground">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

5
Habitica/res/layout/activity_fixcharacter.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="?attr/colorContentBackground">
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -181,7 +180,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_window"
android:hint="@string/gold_capitalilzed"
android:hint="@string/gold_capitalized"
android:paddingStart="16dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/goldEditText"

3
Habitica/res/layout/activity_full_profile.xml
View file

@ -6,8 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="?attr/colorContentBackground">
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

3
Habitica/res/layout/activity_gift_gems.xml
View file

@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background">
android:layout_height="match_parent">
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"

3
Habitica/res/layout/activity_gift_subscription.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/content_background">
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

7
Habitica/res/layout/activity_group_form.xml
View file

@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="?attr/colorContentBackground">
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:orientation="vertical"
@ -20,9 +19,9 @@
android:layout_width="50dp"
android:layout_height="wrap_content"
android:src="@drawable/ic_close_white_24dp"
android:tint="?colorPrimary"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:contentDescription="@string/cancel" />
android:contentDescription="@string/cancel"
app:tint="?colorPrimary" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"

3
Habitica/res/layout/activity_guidelines.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/content_background">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

3
Habitica/res/layout/activity_notifications.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activities.NotificationsActivity"
android:background="?attr/colorContentBackground">
tools:context=".ui.activities.NotificationsActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

3
Habitica/res/layout/activity_party_invite.xml
View file

@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background">
android:layout_height="match_parent">
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"

3
Habitica/res/layout/activity_prefs.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="?attr/colorContentBackground">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

3
Habitica/res/layout/activity_report_message.xml
View file

@ -14,8 +14,7 @@
android:id="@+id/bottom_sheet"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
app:behavior_peekHeight="350dp"
app:behavior_hideable="true"
android:background="@color/content_background">
app:behavior_hideable="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"

3
Habitica/res/layout/activity_skill_members.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="?attr/colorContentBackground">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

3
Habitica/res/layout/activity_skill_tasks.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="?attr/colorContentBackground">
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

3
Habitica/res/layout/activity_task_form.xml
View file

@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="?attr/colorContentBackground">
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

4
Habitica/res/layout/activity_verify_username.xml
View file

@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/content_background">
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -22,7 +21,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_large"
android:background="@color/content_background"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"

1
Habitica/res/layout/adventure_guide_item.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="match_parent"

1
Habitica/res/layout/avatar_with_bars.xml
View file

@ -5,7 +5,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:background="?attr/headerBackgroundColor"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical"

1
Habitica/res/layout/daily_item_card.xml
View file

@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorContentBackground"
android:foreground="?selectableItemBackground">
<LinearLayout

1
Habitica/res/layout/dialog_first_drop.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/dialog_hatch_pet_button.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="60dp">

4
Habitica/res/layout/dialog_levelup.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<FrameLayout

4
Habitica/res/layout/dialog_levelup_10.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<LinearLayout

1
Habitica/res/layout/dialog_pet_suggest_hatch.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"

1
Habitica/res/layout/dialog_purchase_shopitem_button.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/buyButton"
android:layout_width="wrap_content"
android:layout_height="40dp"

1
Habitica/res/layout/dialog_purchase_shopitem_header.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"

3
Habitica/res/layout/fragment_about.xml
View file

@ -5,8 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical"
android:background="?attr/colorContentBackground">
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"

1
Habitica/res/layout/fragment_chat.xml
View file

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

4
Habitica/res/layout/fragment_equipment_overview.xml
View file

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical">

2
Habitica/res/layout/fragment_faq_overview.xml
View file

@ -54,7 +54,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:subtitle="@string/currency"
app:title="@string/gold_capitalilzed"
app:title="@string/gold_capitalized"
app:titleColor="@color/text_orange_white"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"

3
Habitica/res/layout/fragment_gem_purchase.xml
View file

@ -5,8 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical"
android:background="@color/content_background">
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

6
Habitica/res/layout/fragment_guild_detail.xml
View file

@ -8,13 +8,11 @@
android:background="@color/window_background">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background">
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/content_background">
android:layout_height="wrap_content">
<TextView
android:id="@+id/title_view"
android:layout_width="match_parent"

1
Habitica/res/layout/fragment_guild_list.xml
View file

@ -5,7 +5,6 @@
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<FrameLayout

1
Habitica/res/layout/fragment_inbox_message_list.xml
View file

@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

1
Habitica/res/layout/fragment_items.xml
View file

@ -16,7 +16,6 @@
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
android:id="@+id/recyclerView"

3
Habitica/res/layout/fragment_no_party.xml
View file

@ -2,8 +2,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/refreshLayout"
android:background="?attr/colorContentBackground">
android:id="@+id/refreshLayout">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"

2
Habitica/res/layout/fragment_quest_detail.xml
View file

@ -10,7 +10,6 @@
android:layout_height="match_parent"
>
<LinearLayout
android:background="@color/content_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/content_border"
@ -50,7 +49,6 @@
android:layout_height="1dp"
android:background="@color/black_10_alpha"/>
<LinearLayout
android:background="@color/content_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"

3
Habitica/res/layout/fragment_recyclerview.xml
View file

@ -2,8 +2,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background">
android:layout_height="match_parent">
<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
android:id="@+id/recyclerView"

3
Habitica/res/layout/fragment_recyclerview_stable.xml
View file

@ -11,8 +11,7 @@
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical"
android:clipToPadding="false"
android:background="@color/content_background"/>
android:clipToPadding="false"/>
<TextView
android:layout_width="match_parent"

1
Habitica/res/layout/fragment_refresh_recyclerview.xml
View file

@ -5,7 +5,6 @@
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<FrameLayout

1
Habitica/res/layout/fragment_skills.xml
View file

@ -5,6 +5,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarSize="3dp"
android:background="@color/content_background"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical" />

3
Habitica/res/layout/fragment_stats.xml
View file

@ -6,8 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical"
android:background="?attr/colorContentBackground">
android:scrollbars="vertical">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"

3
Habitica/res/layout/fragment_subscription.xml
View file

@ -12,8 +12,7 @@
android:layout_height="match_parent"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical"
android:background="@color/content_background">
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
Habitica/res/layout/fragment_support_main.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout

3
Habitica/res/layout/fragment_viewpager.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.viewpager2.widget.ViewPager2 xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
android:id="@+id/viewPager" />

1
Habitica/res/layout/mount_overview_item.xml
View file

@ -4,7 +4,6 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:background="?attr/colorContentBackground"
android:focusable="true">
<LinearLayout

1
Habitica/res/layout/notification_item.xml
View file

@ -3,7 +3,6 @@
android:id="@+id/notification_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorContentBackground"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingTop="10dp"

1
Habitica/res/layout/notifications_header.xml
View file

@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorContentBackground"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingTop="10dp"

1
Habitica/res/layout/pet_overview_item.xml
View file

@ -4,7 +4,6 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:background="?attr/colorContentBackground"
android:focusable="true">
<LinearLayout
android:id="@+id/card_view"

1
Habitica/res/layout/progress_bar.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"

3
Habitica/res/layout/reward_item_card.xml
View file

@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/content_background">
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/main_task_wrapper"

1
Habitica/res/layout/row_quest_reward_imageview.xml
View file

@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/layout_rounded_bg_window"
android:gravity="center_vertical"
android:layout_marginBottom="4dp">

1
Habitica/res/layout/row_shopitem.xml
View file

@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/content_background"
android:focusable="true">
<LinearLayout
android:id="@+id/container"

1
Habitica/res/layout/skill_task_item_card.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"

3
Habitica/res/layout/system_chat_message.xml
View file

@ -7,8 +7,7 @@
android:paddingStart="55dp"
android:paddingEnd="@dimen/chat_horizontal_inset"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:background="@color/content_background">
android:paddingBottom="4dp">
<TextView
android:background="@drawable/system_chat_background"
android:id="@+id/text_view"

1
Habitica/res/layout/todo_item_card.xml
View file

@ -3,7 +3,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:background="?attr/colorContentBackground"
android:foreground="?selectableItemBackground"
android:orientation="vertical">

7
Habitica/res/layout/value_bar.xml
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon_view"

3
Habitica/res/menu/inbox_chat.xml
View file

@ -1,6 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/open_profile" android:title="@string/profile"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

3
Habitica/res/menu/menu_create_refresh.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_create_item"
android:title="@string/create"
app:showAsAction="never" />

4
Habitica/res/menu/menu_full_profile.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/copy_username"
android:title="@string/copy_username" />
<item android:id="@+id/copy_userid"

3
Habitica/res/menu/menu_party_admin.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_invite_item"
android:title="@string/invite"
app:showAsAction="never" />

3
Habitica/res/menu/menu_party_invite.xml
View file

@ -1,6 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_send_invites" android:title="@string/send_invites"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

3
Habitica/res/menu/menu_save.xml
View file

@ -1,6 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_save_changes" android:title="@string/save_changes"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

3
Habitica/res/menu/menu_task_create.xml
View file

@ -1,6 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_save" android:title="@string/create"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

3
Habitica/res/menu/menu_task_edit.xml
View file

@ -1,6 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_delete" android:title="@string/delete"
android:orderInCategory="100" app:showAsAction="always" />
<item android:id="@+id/action_save" android:title="@string/save_changes"

2
Habitica/res/values-be/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">Абнавіць</string>
<string name="XP_default">Вопыт</string>
<string name="HP_default">Здароўе</string>

2
Habitica/res/values-de/strings.xml
View file

@ -947,7 +947,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
<string name="using_habitica">Habitica nutzen</string>
<string name="level_unabbreviated">Level %d</string>
<string name="delete_reminder">Erinnerung löschen</string>
<string name="gold_capitalilzed">Gold</string>
<string name="gold_capitalized">Gold</string>
<string name="user_level_with_class_unabbreviated">Level %1$d %2$s</string>
<string name="selected">Ausgewählt</string>
<string name="off">Aus</string>

2
Habitica/res/values-el/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">Ανανέωση</string>
<string name="XP_default">Εμπειρία</string>
<string name="HP_default">Υγεία</string>

2
Habitica/res/values-en-rGB/strings.xml
View file

@ -1004,7 +1004,7 @@
<string name="level_unabbreviated">Level %d</string>
<string name="delete_reminder">Delete Reminder</string>
<string name="number_responded">%1$d/%2$d Responded</string>
<string name="gold_capitalilzed">Gold</string>
<string name="gold_capitalized">Gold</string>
<string name="user_level_with_class_unabbreviated">Level %1$d %2$s</string>
<string name="not_selected">Not selected</string>
<string name="selected">Selected</string>

2
Habitica/res/values-es/strings.xml
View file

@ -713,7 +713,7 @@
<string name="subscribe_listitem5_description">Encuentra aun más objetos en Habitica con un bonus 2x de límite de botín diario.</string>
<string name="subscribe_listitem3_description_new">¡Suscríbete ahora para obtener este %s y recibir objetos nuevos cada mes!</string>
<string name="subscribe_listitem5">Duplicar el botín</string>
<string name="gold_capitalilzed">Oro</string>
<string name="gold_capitalized">Oro</string>
<string name="create_account_short">Crear una cuenta</string>
<string name="login_incentive_short_count">%d conexiones</string>
<string name="login_incentive_short">Conéctate regularmente a Habitica</string>

2
Habitica/res/values-fi/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">Lataa uudelleen</string>
<string name="XP_default">Kokemuspisteet</string>
<string name="HP_default">Terveys</string>

2
Habitica/res/values-fr/strings.xml
View file

@ -985,7 +985,7 @@
<string name="level_unabbreviated">Niveau %d</string>
<string name="delete_reminder">Supprimer le rappel</string>
<string name="number_responded">%1$d/%2$d réponses</string>
<string name="gold_capitalilzed">Or</string>
<string name="gold_capitalized">Or</string>
<string name="user_level_with_class_unabbreviated">Niveau %1$d %2$s</string>
<string name="not_selected">Non sélectionné</string>
<string name="selected">Sélectionné</string>

2
Habitica/res/values-hi/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">ताज़ा करें</string>
<string name="XP_default">अनुभव</string>
<string name="HP_default">स्वास्थ्य</string>

2
Habitica/res/values-hu/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">Frissítés</string>
<string name="XP_default">Tapasztalat</string>
<string name="HP_default">Életerő</string>

2
Habitica/res/values-it/strings.xml
View file

@ -761,7 +761,7 @@
<string name="subscribe_listitem5_description">Scopri ancora più oggetti in Habitica con un bonus 2x sul limite di bottini giornalieri.</string>
<string name="subscribe_listitem3_description_new">Abbonati ora per ottenere %s e ricevere nuovi articoli ogni mese!</string>
<string name="subscribe_listitem5">Raddoppia il Bottino</string>
<string name="gold_capitalilzed">Oro</string>
<string name="gold_capitalized">Oro</string>
<string name="create_account_short">Crea un Account</string>
<string name="login_incentive_short_count">%d Accessi</string>
<string name="login_incentive_short">Accedi ad Habitica regolarmente</string>

2
Habitica/res/values-iw/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">ריענון</string>
<string name="XP_default">ניסיון</string>
<string name="HP_default">בריאות</string>

2
Habitica/res/values-ja/strings.xml
View file

@ -752,7 +752,7 @@
<string name="off">オフ</string>
<string name="on">オン</string>
<string name="every">くり返しの間隔</string>
<string name="gold_capitalilzed">ゴールド</string>
<string name="gold_capitalized">ゴールド</string>
<string name="user_level_with_class_unabbreviated">レベル %1$d %2$s</string>
<string name="weeks">週</string>
<string name="repeats">くり返し</string>

2
Habitica/res/values-ko/strings.xml
View file

@ -788,7 +788,7 @@
<string name="remaining_months">%d 달 남음</string>
<string name="ago_weeks">%d주 전</string>
<string name="ago_months">%d 개월 전</string>
<string name="gold_capitalilzed">골드</string>
<string name="gold_capitalized">골드</string>
<string name="login_incentive_short_count">체크인 %d 회</string>
<string name="login_incentive_short">해비티카에 정기적으로 접속하세요</string>
<string name="login_incentive_count">해비티카에 %d 회 접속해서 잠금해제하세요.</string>

2
Habitica/res/values-lt/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="action_refresh">Atnaujinti</string>
<string name="XP_default">Partirtis</string>
<string name="HP_default">Gyvybingumas</string>

2
Habitica/res/values-nl/strings.xml
View file

@ -929,7 +929,7 @@
<string name="level_unabbreviated">Niveau %d</string>
<string name="delete_reminder">Verwijder Herinnering</string>
<string name="number_responded">%1$d/%2$d Heeft Geantwoord</string>
<string name="gold_capitalilzed">Goud</string>
<string name="gold_capitalized">Goud</string>
<string name="user_level_with_class_unabbreviated">Niveau %1$d %2$s</string>
<string name="not_selected">Niet geselecteerd</string>
<string name="selected">Geselecteerd</string>

2
Habitica/res/values-pl/strings.xml
View file

@ -670,7 +670,7 @@
<string name="ago_weeks">%d tygodni temu</string>
<string name="party_invite_short">Zaproś Znajomych</string>
<string name="login_incentive_short">Odwiedzaj Habitica regularnie</string>
<string name="gold_capitalilzed">Złoto</string>
<string name="gold_capitalized">Złoto</string>
<string name="create_account_short">stwórz konto</string>
<string name="login_incentive_short_count">%d Wizyt</string>
<string name="subscribe_listitem5">Podwój Łup</string>

2
Habitica/res/values-pt-rBR/strings.xml
View file

@ -958,7 +958,7 @@
<string name="level_unabbreviated">Nível %d</string>
<string name="delete_reminder">Excluir lembrete</string>
<string name="number_responded">%1$d/%2$d Respondeu</string>
<string name="gold_capitalilzed">Ouro</string>
<string name="gold_capitalized">Ouro</string>
<string name="user_level_with_class_unabbreviated">Nível %1$d %2$s</string>
<string name="not_selected">Não selecionado</string>
<string name="selected">Selecionado</string>

2
Habitica/res/values-pt-rPT/strings.xml
View file

@ -476,7 +476,7 @@
<string name="subscribe_listitem3">Itens Misteriosos Mensais</string>
<string name="subscribe_prompt">Torne-se um subscrito para receber benefícios exclusivos!</string>
<string name="subscribe_title">Subscrições ajudam os desenvolvedores e também a manter o Habitica a funcionar</string>
<string name="gold_capitalilzed">Ouro</string>
<string name="gold_capitalized">Ouro</string>
<string name="create_account_short">Criar uma conta</string>
<string name="login_incentive_short_count">%d Check-ins</string>
<string name="login_incentive_short">Entre em Habitica regularmente</string>

2
Habitica/res/values-ru/strings.xml
View file

@ -797,7 +797,7 @@
<string name="ago_1month">1 месяц назад</string>
<string name="authentication_error_body">Введённые данные некорректны.</string>
<string name="inbox_messages_title_nosender">Вы получили %d сообщений</string>
<string name="gold_capitalilzed">Золото</string>
<string name="gold_capitalized">Золото</string>
<string name="user_level_with_class_unabbreviated">Уровень %1$d %2$s</string>
<string name="preference_email_kicked_group">Исключен из группы</string>
<string name="learn_more">Подробнее</string>

2
Habitica/res/values-sv/strings.xml
View file

@ -594,7 +594,7 @@
<string name="subscribe_listitem2">Mystiskt Timglas</string>
<string name="subscribe_listitem3">Månatlig Mystiska Föremål</string>
<string name="subscribe_listitem1">Guld för Juveler</string>
<string name="gold_capitalilzed">Guld</string>
<string name="gold_capitalized">Guld</string>
<string name="user_level_with_class_unabbreviated">Nivå %1$d %2$s</string>
<string name="remaining_1hour">1h kvar</string>
<string name="remaining_hours">%dh kvar</string>

2
Habitica/res/values-th/strings.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="XP_default">ค่าประสบการณ์</string>
<string name="HP_default">พลังชีวิต</string>
<!--Prefs-->

2
Habitica/res/values-tr/strings.xml
View file

@ -708,7 +708,7 @@
<string name="subscribe_listitem5_description">2 kat eşya düşürme oranı ile daha çok Habitica eşyası keşfet.</string>
<string name="subscribe_listitem3_description_new">Şimdi abone olarak %s\'ı elde edebilir ve her ay yeni eşyalar kazanabilirsin!</string>
<string name="subscribe_listitem5">İki kat eşya düşürme</string>
<string name="gold_capitalilzed">Altın</string>
<string name="gold_capitalized">Altın</string>
<string name="create_account_short">hesap oluştur</string>
<string name="login_incentive_short">Habitica\'ya düzenli olarak giriş yap</string>
<string name="party_invite_short">Arkadaşlarını davet et</string>

2
Habitica/res/values-uk/strings.xml
View file

@ -749,7 +749,7 @@
<string name="confirm_delete_tag_title">Ви впевнені\?</string>
<string name="edit_tag_btn_edit">Редагувати</string>
<string name="chat_message_copied">Повідомлення скопійовано до буфера обміну</string>
<string name="gold_capitalilzed">Золото</string>
<string name="gold_capitalized">Золото</string>
<string name="gold_plural">золото</string>
<string name="successful_purchase">Придбано %1$s</string>
<string name="create_account_short">створити акаунт</string>

2
Habitica/res/values-vi/strings.xml
View file

@ -935,7 +935,7 @@
<string name="level_unabbreviated">Cấp độ %d</string>
<string name="delete_reminder">Xóa Nhắc nhở</string>
<string name="number_responded">%1$d/%2$d Phản hồi</string>
<string name="gold_capitalilzed">Vàng</string>
<string name="gold_capitalized">Vàng</string>
<string name="user_level_with_class_unabbreviated">Cấp độ %1$d %2$s</string>
<string name="not_selected">Không chọn</string>
<string name="selected">Đã chọn</string>

2
Habitica/res/values-zh-rTW/strings.xml
View file

@ -1006,7 +1006,7 @@
<string name="level_unabbreviated">%d級</string>
<string name="delete_reminder">刪除提醒</string>
<string name="number_responded">%1$d/%2$d已回應</string>
<string name="gold_capitalilzed">金幣</string>
<string name="gold_capitalized">金幣</string>
<string name="user_level_with_class_unabbreviated">%1$d級%2$s</string>
<string name="not_selected">未選中</string>
<string name="selected">已選擇</string>

2
Habitica/res/values-zh/strings.xml
View file

@ -1004,7 +1004,7 @@
<string name="level_unabbreviated">%d级</string>
<string name="delete_reminder">删除提醒</string>
<string name="number_responded">%1$d/%2$d已回应</string>
<string name="gold_capitalilzed">金币</string>
<string name="gold_capitalized">金币</string>
<string name="not_selected">未选中</string>
<string name="selected">已选择</string>
<string name="off">关</string>

6
Habitica/res/values/attrs.xml
View file

@ -82,12 +82,6 @@
<declare-styleable name="CurrencyViews">
<attr name="hasLightBackground" />
</declare-styleable>
<declare-styleable name="FixValuesEditText">
<attr name="fixIconName" format="string" />
<attr name="title" />
<attr name="iconBgColor" format="color" />
<attr name="hintStyle" format="reference" />
</declare-styleable>
<declare-styleable name="StatsView">
<attr name="titleBackgroundColor" format="color" />
<attr name="statsColor" />

2
Habitica/res/values/strings.xml
View file

@ -350,7 +350,7 @@
<string name="create_account_short">create an account</string>
<string name="successful_purchase">Purchased %1$s</string>
<string name="gold_plural">gold</string>
<string name="gold_capitalilzed">Gold</string>
<string name="gold_capitalized">Gold</string>
<string name="chat_message_copied">Message copied to Clipboard</string>
<string name="edit_tag_btn_edit">Edit</string>
<string name="confirm_delete_tag_title">Are you sure?</string>

2
Habitica/res/values/styles.habitica.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- All possible font familys -->
<string name="font_family_medium">sans-serif-medium</string>
<string name="font_family_regular">sans-serif</string>

3
Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
View file

@ -52,6 +52,7 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.customization.Avatar
import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopFragment;
@ -343,4 +344,6 @@ public interface UserComponent {
void inject(@NotNull GuildOverviewFragment guildOverviewFragment);
void inject(@NotNull PromoWebFragment promoWebFragment);
void inject(@NotNull ItemDialogFragment itemDialogFragment);
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
View file

@ -39,8 +39,6 @@ interface TaskRepository : BaseRepository {
fun markTaskCompleted(taskId: String, isCompleted: Boolean)
fun saveReminder(remindersItem: RemindersItem)
fun <T: BaseMainObject> modify(obj: T, transaction: (T) -> Unit)
fun swapTaskPosition(firstPosition: Int, secondPosition: Int)

8
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
View file

@ -345,7 +345,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
if (habitResponse.notifications != null) {
notificationsManager.setNotifications(habitResponse.notifications)
}
habitResponse.getData()
habitResponse.data
}
}
@ -354,7 +354,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
if (habitResponse.notifications != null) {
notificationsManager.setNotifications(habitResponse.notifications)
}
habitResponse.getData()
habitResponse.data
}
}
@ -385,7 +385,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
override fun feedPet(petKey: String, foodKey: String): Flowable<FeedResponse> {
return apiService.feedPet(petKey, foodKey)
.map {
it.data.message = it.message
it.data?.message = it.message
it
}
.compose(configureApiCallObserver())
@ -604,7 +604,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
if (habitResponse.notifications != null) {
notificationsManager.setNotifications(habitResponse.notifications)
}
habitResponse.getData()
habitResponse.data
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
View file

@ -210,7 +210,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
}
return apiClient.hatchPet(egg.key, hatchingPotion.key)
.doOnNext {
localRepository.save(it)
localRepository.save(it, userID)
if (!appConfigManager.enableLocalChanges()) {
successFunction()
}

Some files were not shown because too many files have changed in this diff Show more