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

Clean up themes

Browse source
This commit is contained in:
Phillip Thelen 2019-08-07 10:29:58 +02:00
parent 2b77acc593
commit 59bf5b10d6
74 changed files with 90 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable-hdpi/bottom_navigation_inset.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Habitica/res/drawable-hdpi/fab_background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Habitica/res/drawable-hdpi/ic_filters_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 307 B

BIN
Habitica/res/drawable-hdpi/ic_filters_active.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 142 B

BIN
Habitica/res/drawable-mdpi/bottom_navigation_inset.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Habitica/res/drawable-mdpi/fab_background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Habitica/res/drawable-mdpi/ic_filters_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 199 B

BIN
Habitica/res/drawable-mdpi/ic_filters_active.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 108 B

4
Habitica/res/drawable-v21/selection_highlight.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/brand_500">
android:color="?colorPrimaryDistinct">
<item android:id="@android:id/mask"
android:drawable="@color/brand" />
android:drawable="?colorPrimary" />
</ripple>

BIN
Habitica/res/drawable-xhdpi/bottom_navigation_inset.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Habitica/res/drawable-xhdpi/fab_background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 5 KiB

BIN
Habitica/res/drawable-xhdpi/ic_filters_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 341 B

BIN
Habitica/res/drawable-xhdpi/ic_filters_active.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 146 B

BIN
Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
Habitica/res/drawable-xxhdpi/fab_background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
Habitica/res/drawable-xxhdpi/ic_filters_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 472 B

BIN
Habitica/res/drawable-xxhdpi/ic_filters_active.webp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 180 B

BIN
Habitica/res/drawable-xxxhdpi/ic_filters_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 794 B

2
Habitica/res/drawable/avatar_customization_category_bg.xml
View file

@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/brand_200" />
<solid android:color="?colorPrimaryOffset" />
</shape>
</item>
<item android:left="0dp" android:right="0dp" android:gravity="bottom">

2
Habitica/res/drawable/avatar_customization_subcategory_bg.xml
View file

@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/brand_100" />
<solid android:color="?colorPrimary" />
</shape>
</item>
<item android:left="0dp" android:right="0dp" android:gravity="bottom">

2
Habitica/res/drawable/badge_bg.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="3dp" />
<solid android:color="@color/brand_400" />
<solid android:color="?colorAccent" />
</shape>

6
Habitica/res/drawable/badge_circle.xml
View file

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="10dip"/>
<solid
android:color="@color/brand_400" />
<corners android:radius="10dip"/>
<solid android:color="?colorAccent" />
</shape>

2
Habitica/res/drawable/button_background_primary.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/brand_400" />
<solid android:color="?colorAccent" />
<corners android:radius="8dp"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<stroke android:width="1dp" android:color="#19000000" />

2
Habitica/res/drawable/challenge_gem_add_button_enabled.xml
View file

@ -3,6 +3,6 @@
<item >
<bitmap
android:src="@drawable/ic_add_white_18dp"
android:tint="@color/brand_400" />
android:tint="?colorAccent" />
</item>
</layer-list>

2
Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
View file

@ -3,6 +3,6 @@
<item >
<bitmap
android:src="@drawable/minus"
android:tint="@color/brand_400" />
android:tint="?colorAccent" />
</item>
</layer-list>

6
Habitica/res/drawable/layout_rounded_bg_brand_100.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/brand_100" />
<corners android:radius="@dimen/bar_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/nav_item_color_state.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white" android:state_enabled="true" />
<item android:color="@color/brand_200" android:state_enabled="false" />
<item android:color="?colorPrimaryOffset" android:state_enabled="false" />
</selector>

2
Habitica/res/drawable/pill_bg_purple.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/brand_100"/>
<solid android:color="?colorPrimary"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_radio_selected.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/brand_400"/>
<solid android:color="?colorAccent"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

6
Habitica/res/drawable/purchase_button_background.xml
View file

@ -5,7 +5,7 @@
<item android:state_pressed="true" >
<shape android:shape="rectangle">
<solid
android:color="@color/brand_500" >
android:color="?colorPrimaryDistinct" >
</solid>
<corners
android:radius="8dp">
@ -16,7 +16,7 @@
<item android:state_focused="true" >
<shape android:shape="rectangle">
<solid
android:color="@color/brand_400">
android:color="?colorAccent">
</solid>
<corners
android:radius="8dp">
@ -36,7 +36,7 @@
<item>
<shape android:shape="rectangle">
<solid
android:color="@color/brand_300">
android:color="?colorPrimaryOffset">
</solid>
<corners
android:radius="8dp">

2
Habitica/res/drawable/subscription_unselected.xml
View file

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<corners android:radius="@dimen/daily_checkbox_corner_radius"/>
<stroke android:color="@color/brand_100" android:width="1dp" />
<stroke android:color="?colorPrimary" android:width="1dp" />
<size android:height="16dp" android:width="16dp" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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

@ -164,7 +164,7 @@
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_gravity="bottom"
android:background="@color/brand_200"
android:background="?colorPrimaryOffset"
android:elevation="0dp"
android:fillViewport="false"

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

@ -18,7 +18,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/brand_200"
android:background="?colorPrimaryOffset"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
@ -28,7 +28,7 @@
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/brand_500"
android:textColorHint="?textColorPrimaryDark"
app:hintTextAppearance="@style/TextAppearance.AppCompat"
android:id="@+id/create_challenge_title_input_layout">
@ -39,8 +39,8 @@
android:hint="@string/new_challenge_title"
android:id="@+id/create_challenge_title"
android:textColor="@color/white"
android:textColorHighlight="@color/brand_500"
android:textColorHint="@color/brand_500"
android:textColorHighlight="?textColorPrimaryDark"
android:textColorHint="?textColorPrimaryDark"
tools:text="Get in shape"
android:inputType="text" />
@ -49,7 +49,7 @@
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/brand_500"
android:textColorHint="?textColorPrimaryDark"
android:id="@+id/create_challenge_description_input_layout"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -64,17 +64,12 @@
android:maxLines="5"
android:minLines="3"
android:textColor="@color/white"
android:textColorHighlight="@color/brand_500"
android:textColorHint="@color/brand_500" />
android:textColorHighlight="?textColorPrimaryDark"
android:textColorHint="?textColorPrimaryDark" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/brand_700" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -169,8 +164,7 @@
android:layout_height="20dp"
android:layout_marginTop="39dp"
android:drawablePadding="12dp"
android:drawableRight="@drawable/ic_info_outline_black_24dp"
android:drawableTint="@color/brand_300"
android:drawableEnd="@drawable/ic_info_outline_black_24dp"
android:gravity="center"
android:text="@string/short_name"
android:textColor="#cc000000" />

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

@ -67,7 +67,7 @@
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_gravity="bottom"
android:background="@color/brand_200"
android:background="?colorPrimaryOffset"
android:elevation="0dp"
android:fillViewport="false"

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

@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:text="@string/create"
style="@style/HabiticaButton.Borderless"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:paddingEnd="@dimen/spacing_large"
android:paddingStart="@dimen/spacing_large"
android:minWidth="20dp"/>

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

@ -133,7 +133,7 @@
tools:text="@string/report_explanation"
android:textColor="@color/gray_200"
style="@style/Caption3"
android:textColorLink="@color/brand_400"
android:textColorLink="?colorAccent"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

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

@ -27,7 +27,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/brand_200"
android:textColor="?colorPrimaryOffset"
android:text="@string/usernamePromptTitle"
android:gravity="center"
android:textSize="16sp"

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

@ -10,5 +10,5 @@
android:layout_width="70dp"
android:layout_height="70dp"
android:gravity="center"
tools:background="@color/brand_200"
tools:background="?colorPrimaryOffset"
tools:drawableTop="@drawable/icon_body" />

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

@ -17,7 +17,7 @@
android:id="@+id/subcategory_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabIndicatorColor="@color/brand_400"
app:tabIndicatorColor="?colorAccent"
app:tabIndicatorHeight="2dp"
app:tabTextColor="@color/white_50_alpha"
app:tabSelectedTextColor="@color/white"

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

@ -4,7 +4,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:parentTag="android.widget.RelativeLayout"
tools:background="@color/brand_100">
tools:background="?colorPrimary">
<ImageView
android:id="@+id/icon_view"
android:layout_width="wrap_content"
@ -18,7 +18,7 @@
android:id="@+id/title_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/brand_500"
android:textColor="?textColorPrimaryDark"
tools:text="@string/habits"
android:layout_gravity="center"
android:textSize="12sp"

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

@ -18,7 +18,7 @@
android:layout_marginStart="24dp"
android:textAllCaps="false"
style="@style/Subheader2"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:background="#f9f9f9"
android:id="@+id/btn_add_task"
tools:text="Add habit">

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

@ -76,7 +76,7 @@
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:text="@string/expand_notes"
android:padding="0dp"
android:textColor="@color/brand_400"/>
android:textColor="?colorAccent"/>
<TextView
android:id="@+id/approvalRequiredTextField"
android:layout_width="match_parent"

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

@ -99,7 +99,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/close"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:background="@drawable/alert_dialog_background"
android:layout_marginTop="@dimen/spacing_large"
android:visibility="gone"

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

@ -3,6 +3,6 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/HabiticaButton.Borderless"
android:textColor="@color/brand_400">
android:textColor="?colorAccent">
</Button>

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

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="22dp"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/brand_100"
android:background="?colorPrimary"
tools:text="Social"
style="@style/Body1"
android:textSize="12sp"

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

@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="38dp"
android:text="@string/want_to_subscribe"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:background="@drawable/layout_rounded_bg_lighter_gray"
android:layout_marginTop="18dp"/>
</LinearLayout>

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

@ -4,7 +4,7 @@
android:layout_height="48dp"
xmlns:tools="http://schemas.android.com/tools"
android:layout_gravity="right|end"
tools:background="@color/brand_100"
tools:background="?colorPrimary"
android:clickable="true">
<ImageView

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

@ -98,7 +98,6 @@
android:layout_width="250dp"
android:layout_height="35dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="35sp"
android:background="@drawable/rounded_purple_square"
android:text="@string/about.rate_our_app"
@ -112,7 +111,6 @@
android:layout_height="35dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20sp"
android:background="@drawable/rounded_purple_square"
android:text="@string/about.bugreport"
android:textAllCaps="false"
@ -147,7 +145,6 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="10sp"
android:background="@drawable/rounded_purple_square"
android:text="@string/about.source_code"
android:textAllCaps="false"
android:textColor="@color/white"

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

@ -101,7 +101,7 @@
android:text="@string/gem.purchase.subtitle"
android:gravity="center"
android:textStyle="normal|bold"
android:textColor="@color/brand_100"
android:textColor="?colorPrimary"
android:textSize="16sp"
android:lineSpacingExtra="4dp"
android:layout_marginTop="23dp"

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

@ -141,7 +141,7 @@
android:id="@+id/username_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
style="@style/HabiticaButton.Gray.600"
android:background="@drawable/layout_rounded_bg_gray_700"
android:layout_marginTop="@dimen/spacing_large"

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

@ -10,7 +10,7 @@
android:layout_height="wrap_content"
style="@style/FragmentDialogTitle"
android:id="@+id/titleTextView"
android:background="@color/brand_100"
android:background="?colorPrimary"
android:textColor="@android:color/white" />
<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
android:id="@+id/recyclerView"

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

@ -15,7 +15,7 @@
android:layout_height="wrap_content"
style="@style/FragmentDialogTitle"
android:id="@+id/titleTextView"
android:background="@color/brand_100"
android:background="?colorPrimary"
android:textColor="@android:color/white" />
<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
android:id="@+id/recyclerView"

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

@ -79,7 +79,7 @@
android:text="@string/subscribe_prompt"
android:gravity="center"
android:textStyle="normal|bold"
android:textColor="@color/brand_100"
android:textColor="?colorPrimary"
android:textSize="16sp"
android:lineSpacingExtra="4dp"
android:layout_marginTop="8dp"
@ -297,7 +297,7 @@
android:layout_height="wrap_content"
android:text="@string/gift_subscription"
android:background="@color/transparent"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:textAllCaps="false"/>
</LinearLayout>

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

@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/two_handed"
android:textColor="@color/brand_400"
android:textColor="?colorAccent"
android:drawablePadding="@dimen/spacing_small"
android:layout_marginBottom="@dimen/spacing_small"/>
<com.nex3z.flowlayout.FlowLayout

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

@ -78,7 +78,7 @@
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:text="@string/expand_notes"
android:padding="0dp"
android:textColor="@color/brand_400"/>
android:textColor="?colorAccent"/>
<TextView
android:id="@+id/approvalRequiredTextField"
android:layout_width="match_parent"

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

@ -18,8 +18,9 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@color/brand_100" />
android:background="?barColor" />
<ImageView
android:id="@+id/cutout_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bottom_navigation_inset"/>
@ -27,7 +28,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@color/brand_100" />
android:background="?barColor" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

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

@ -48,6 +48,6 @@
android:layout_height="wrap_content"
android:background="@color/transparent"
android:text="@string/dismiss_all"
android:textColor="@color/brand_400" />
android:textColor="?colorAccent" />
</LinearLayout>

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

@ -35,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/priceLabel"
android:textColor="@color/brand_100"
android:textColor="?colorPrimary"
android:textSize="24sp"
android:fontFamily="@string/font_family_medium"
tools:text="$ 21" />
@ -44,7 +44,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/descriptionTextView"
android:textColor="@color/brand_100"
android:textColor="?colorPrimary"
tools:text="recurring every month"
/>
<LinearLayout

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

@ -65,7 +65,7 @@
android:layout_height="30dp"
android:gravity="center_vertical"
android:orientation="horizontal"
tools:background="@color/brand_50"
tools:background="?colorPrimaryDark"
android:paddingLeft="@dimen/spacing_medium"
android:paddingRight="@dimen/spacing_large">
<ImageView

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

@ -55,7 +55,7 @@
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:text="@string/expand_notes"
android:padding="0dp"
android:textColor="@color/brand_400"/>
android:textColor="?colorAccent"/>
<TextView
android:id="@+id/approvalRequiredTextField"
android:layout_width="match_parent"

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

@ -6,7 +6,7 @@
android:gravity="center_vertical"
android:paddingLeft="6dp"
android:paddingRight="6dp"
tools:background="@color/brand_200">
tools:background="?colorPrimaryOffset">
<ImageView
android:id="@+id/imageView"
android:layout_width="@dimen/setup_customization_size"

36
Habitica/res/layout/tavern_daniel_item.xml
View file

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="120dp"
android:src="@drawable/npc_daniel"
android:layout_margin="10dp"
android:layout_gravity="center"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center|center_horizontal"
android:orientation="vertical">
<Button
android:id="@+id/btn.toggle.inn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tavern.inn.rest"
android:layout_gravity="center"
android:textColor="@color/white"
android:drawableTint="@color/white"
android:backgroundTint="@color/brand"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/inn_description"
/>
</LinearLayout>
</LinearLayout>

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

@ -77,7 +77,7 @@
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:text="@string/expand_notes"
android:padding="0dp"
android:textColor="@color/brand_400"/>
android:textColor="?colorAccent"/>
<TextView
android:id="@+id/approvalRequiredTextField"
android:layout_width="match_parent"

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

@ -380,7 +380,7 @@
</style>
<style name="subscriptionBoxText">
<item name="android:textColor">@color/brand_100</item>
<item name="android:textColor">?colorPrimary</item>
</style>
<style name="subscriptionBoxText.Title">

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -10,13 +10,13 @@ import android.view.*
import android.widget.*
import androidx.appcompat.widget.AppCompatCheckedTextView
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.content.ContextCompat
import com.google.android.material.textfield.TextInputLayout
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.ChallengeRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.social.Challenge
import com.habitrpg.android.habitica.models.social.Group
@ -306,7 +306,7 @@ class ChallengeFormActivity : BaseActivity() {
supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
supportActionBar.title = ""
supportActionBar.setBackgroundDrawable(ColorDrawable(ContextCompat.getColor(this, R.color.brand_200)))
supportActionBar.setBackgroundDrawable(ColorDrawable(getThemeColor(R.attr.colorPrimaryOffset)))
supportActionBar.elevation = 0f
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
View file

@ -20,6 +20,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.social.ChatMessage
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
@ -125,7 +126,7 @@ class ReportMessageActivity : BaseActivity() {
private fun setStatusBarDim(dim: Boolean) {
if (dim) {
appBar.elevation = 0f
window.statusBarColor = ContextCompat.getColor(this, R.color.brand_50)
window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
closeButton.visibility = View.GONE
toolbarTextView.setTypeface(null, Typeface.BOLD)
} else {

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -27,6 +27,7 @@ import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
import com.habitrpg.android.habitica.extensions.addCancelButton
import com.habitrpg.android.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.TaskAlarmManager
import com.habitrpg.android.habitica.models.Tag
@ -129,7 +130,7 @@ class TaskFormActivity : BaseActivity() {
setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
tintColor = ContextCompat.getColor(this, R.color.brand_300)
tintColor = getThemeColor(R.attr.colorAccent)
val bundle = intent.extras ?: return

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
View file

@ -379,10 +379,14 @@ class NavigationDrawerFragment : DialogFragment() {
private fun setNotificationsSeen(allSeen: Boolean) {
context?.let {
val colorId = if (allSeen) R.color.gray_200 else R.color.brand_400
val color = if (allSeen) {
ContextCompat.getColor(it, R.color.gray_200)
} else {
it.getThemeColor(R.attr.colorAccent)
}
val bg = notificationsBadge.background as? GradientDrawable
bg?.color = ColorStateList.valueOf(ContextCompat.getColor(it, colorId))
bg?.color = ColorStateList.valueOf(color)
}
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
View file

@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.extensions.addOkButton
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.extensions.setScaledPadding
import com.habitrpg.android.habitica.helpers.RxErrorHandler
@ -77,7 +78,7 @@ class StatsFragment: BaseMainFragment() {
leftSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
rightSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
context?.let {
val color = ContextCompat.getColor(it, R.color.brand_200)
val color = it.getThemeColor(R.attr.colorPrimaryOffset)
distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
View file

@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.tasks
import android.app.Activity
import android.content.Intent
import android.graphics.PorterDuff
import android.os.Bundle
import android.view.*
import androidx.fragment.app.FragmentPagerAdapter
@ -9,6 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.TagRepository
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.AmplitudeManager
import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.RxErrorHandler
@ -212,7 +214,11 @@ class TasksFragment : BaseMainFragment() {
if (filterCount == 0) {
filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
} else {
filterMenuItem?.setIcon(R.drawable.ic_filters_active)
context?.let {
val filterIcon = it.getDrawable(R.drawable.ic_filters_active)
filterIcon?.setColorFilter(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
filterMenuItem?.setIcon(filterIcon)
}
}
}
@ -220,7 +226,7 @@ class TasksFragment : BaseMainFragment() {
if (bottomNavigation == null) {
return
}
compositeSubscription.add(tutorialRepository.getTutorialSteps(Arrays.asList("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
val activeTutorialFragments = ArrayList<String>()
for (step in tutorialSteps) {
var id = -1

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
View file

@ -11,6 +11,7 @@ import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.ui.helpers.bindView
class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
@ -145,7 +146,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
}
if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(ContextCompat.getColor(context, R.color.brand_200)))
infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
} else {
infoIconView.visibility = View.GONE
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
View file

@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.models.social.ChatMessage
import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
@ -105,7 +106,7 @@ class ChatBarView : LinearLayout {
private fun setSendButtonEnabled(enabled: Boolean) {
val tintColor: Int = if (enabled) {
ContextCompat.getColor(context, R.color.brand_400)
context.getThemeColor(R.attr.colorAccent)
} else {
ContextCompat.getColor(context, R.color.gray_400)
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
View file

@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.user.User
import io.reactivex.disposables.Disposable
@ -144,7 +145,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
private fun updateTitle() {
allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
if (allocatedPoints > 0) {
titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_400))
titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
} else {
titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400))
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
View file

@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.TagRepository
import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
import com.habitrpg.android.habitica.extensions.getThemeColor
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.Tag
import com.habitrpg.android.habitica.models.tasks.Task
@ -116,7 +117,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
intArrayOf(android.R.attr.state_checked) //enabled
),
intArrayOf(Color.LTGRAY, //disabled
ContextCompat.getColor(context, R.color.brand_400) //enabled
context.getThemeColor(R.attr.colorAccent) //enabled
)
)
val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics).toInt()