sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-15 02:31:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Begin implementing dark mode

Browse source
This commit is contained in:
Phillip Thelen 2020-09-04 18:17:34 +02:00
parent 4cebaa4be0
commit 0728eed1af
359 changed files with 1810 additions and 2004 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -128,8 +128,6 @@
<meta-data
android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
android:value="false"/>
<activity
android:name=".ui.activities.AboutActivity" />
<activity
android:name=".ui.activities.TaskFormActivity"
android:parentActivityName=".ui.activities.MainActivity"

4
Habitica/AndroidManifestTesting.xml
View file

@ -66,10 +66,6 @@
android:screenOrientation="portrait">
</activity>
<activity
android:name=".ui.activities.AboutActivity"
android:theme="@style/AppThemeWithActionBarBlackText"
android:screenOrientation="portrait"/>
<activity
android:name=".ui.activities.TaskFormActivity"
android:theme="@style/AppThemeWithActionBarBlackText"

4
Habitica/build.gradle
View file

@ -60,7 +60,7 @@ dependencies {
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
//App Compatibility and Material Design
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
// Emojis
@ -343,4 +343,4 @@ gradle.projectsEvaluated {
check { findbugs { skip true } }
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'

2
Habitica/res/drawable-mdpi/layout_rounded_bg_gray.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/task_gray" />
<solid android:color="@color/disabled_background" />
<corners android:radius="@dimen/bar_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/achievement_section_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">
<solid android:color="@color/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="12dp" />
</shape>

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

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

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<size android:width="24dp" android:height="80dp" />
<solid android:color="@color/gray_700" />
<solid android:color="@color/window_background" />
<corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
</shape>

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

@ -4,7 +4,7 @@
<corners
android:radius="100dip"/>
<solid
android:color="@color/gray_600" />
android:color="@color/offset_background" />
<padding
android:left="6dip"
android:right="6dip" />

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

@ -1,7 +1,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<solid android:color="@color/content_background" />
<stroke
android:width="0.5dip"

2
Habitica/res/drawable/button_background_gray_700.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="8dp"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/button_background_gray_600.xml → Habitica/res/drawable/button_background_offset.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/gray_600" />
<solid android:color="@color/offset_background" />
<corners android:radius="8dp"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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

@ -5,7 +5,7 @@
<item android:state_pressed="true" >
<shape>
<solid
android:color="@color/gray_200"/>
android:color="@color/inverted_background_offset"/>
<corners
android:radius="3dp" />
<padding
@ -19,7 +19,7 @@
<item android:state_focused="true" >
<shape>
<solid
android:color="@color/gray_200"
android:color="@color/inverted_background_offset"
android:angle="270" />
<corners
android:radius="3dp" />
@ -34,7 +34,7 @@
<item>
<shape>
<solid
android:color="@color/gray_100"
android:color="@color/inverted_background"
android:angle="270" />
<corners
android:radius="3dp" />

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<solid android:color="@color/gray_300" />
<solid android:color="@color/dimmed_background" />
</shape>

2
Habitica/res/drawable/circle_gray600.xml → Habitica/res/drawable/circle_offset.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<solid android:color="@color/gray_600" />
<solid android:color="@color/offset_background" />
</shape>

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

@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/daily_checkbox_corner_radius"/>
<solid android:color="@color/gray_600" />
<solid android:color="@color/offset_background" />
<size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

4
Habitica/res/drawable/edittext.xml
View file

@ -2,14 +2,14 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="18dp">
<shape android:shape="rectangle">
<solid android:color="@color/gray_500" />
<solid android:color="@color/content_background_offset" />
<corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
</shape>
</item>
<item android:bottom="2dp" android:top="18dp">
<shape android:shape="rectangle">
<solid android:color="@color/gray_700" />
<solid android:color="@color/window_background" />
<corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
</shape>
</item>

4
Habitica/res/drawable/gradient_white.xml
View file

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<gradient
android:angle="90"
android:endColor="@color/white_80_alpha"
android:startColor="@color/white"
android:endColor="@color/content_80_alpha"
android:startColor="@color/content_background"
android:type="linear" />
</shape>

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

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="24dp" android:height="24dp" />
<stroke android:color="@color/gray_600" android:width="2dp" />
<stroke android:color="@color/offset_background" android:width="2dp" />
</shape>

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

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="32dp" android:height="32dp" />
<stroke android:width="2dp" android:color="@color/gray_500" />
<stroke android:width="2dp" android:color="@color/content_background_offset" />
</shape>

3
Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml → Habitica/res/drawable/layout_rounded_bg_content.xml
View file

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

2
Habitica/res/drawable/layout_rounded_bg_white_15.xml → Habitica/res/drawable/layout_rounded_bg_content_15.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/white_15_alpha" />
<solid android:color="@color/content_15_alpha" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_gray_50.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/gray_50" />
<solid android:color="@color/equipment_overview_background" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_light_gray.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/gray_500" />
<solid android:color="@color/content_background_offset" />
<corners android:radius="@dimen/bar_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_gray_700.xml → Habitica/res/drawable/layout_rounded_bg_offset.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/gray_700" />
<solid android:color="@color/offset_background" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_shopitem.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="6dp"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_shopitem_price.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/gray_600_30" />
<solid android:color="@color/offset_background_30" />
<corners android:bottomLeftRadius="6dp" android:bottomRightRadius="6dp"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_white.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="?colorContentBackground" />
<solid android:color="@color/content_background" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_gray_600.xml → Habitica/res/drawable/layout_rounded_bg_window.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/gray_600" />
<solid android:color="@color/window_background" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml → Habitica/res/drawable/layout_rounded_bg_window_blue_border.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="@dimen/bar_radius"/>
<stroke android:width="2dp" android:color="@color/blue_10" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

2
Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml → Habitica/res/drawable/layout_rounded_bg_window_brand_border.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="@dimen/bar_radius"/>
<stroke android:width="2dp" android:color="@color/brand_300" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

2
Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml → Habitica/res/drawable/layout_rounded_bg_window_red_border.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="@dimen/bar_radius"/>
<stroke android:width="2dp" android:color="@color/red_10" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

7
Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml Normal file
View file

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

2
Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml → Habitica/res/drawable/layout_rounded_bg_window_yellow_border.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/gray_700" />
<solid android:color="@color/window_background" />
<corners android:radius="@dimen/bar_radius"/>
<stroke android:width="2dp" android:color="@color/yellow_5" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

2
Habitica/res/drawable/layout_top_rounded_bg.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/white" />
<solid android:color="?attr/colorContentBackground" />
<corners android:topLeftRadius="@dimen/rounded_button_radius" android:topRightRadius="@dimen/rounded_button_radius" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

4
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="?colorPrimaryOffset" android:state_enabled="false" />
<item android:color="@color/content_background" android:state_enabled="true" />
<item android:color="@color/brand_background_dark" android:state_enabled="false" />
</selector>

2
Habitica/res/drawable/pill_bg.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/pill_gray"/>
<solid android:color="@color/window_background"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_white.xml → Habitica/res/drawable/pill_bg_content.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/white"/>
<solid android:color="@color/content_background"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_gray.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/gray_600"/>
<solid android:color="@color/offset_background"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_gray_100.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/gray_100"/>
<solid android:color="@color/inverted_background"/>
<corners android:radius="200dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_purple_400.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="@color/color_accent"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

4
Habitica/res/drawable/pill_bg_radio_unselected.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<solid android:color="@color/content_background"/>
<corners android:radius="20dip"/>
<stroke android:color="@color/days_gray" android:width="1dp" />
<stroke android:color="@color/separator" android:width="1dp" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/pill_bg_gray_700.xml → Habitica/res/drawable/pill_bg_window.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/gray_700"/>
<solid android:color="@color/window_background"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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

@ -4,7 +4,7 @@
<item android:id="@android:id/background">
<shape>
<solid
android:color="@color/white"
android:color="?attr/colorContentBackground"
/>
</shape>

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

@ -26,7 +26,7 @@
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid
android:color="@color/gray_200">
android:color="@color/inverted_background_offset">
</solid>
<corners
android:radius="8dp">
@ -36,7 +36,7 @@
<item>
<shape android:shape="rectangle">
<solid
android:color="@color/brand_400">
android:color="@color/color_accent">
</solid>
<corners
android:radius="8dp">

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/gray_700" />
<solid android:color="@color/window_background" />
<corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
</shape>

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

@ -3,6 +3,6 @@
<solid android:color="@color/transparent" />
<stroke
android:width="1dp"
android:color="@color/gray_600"/>
android:color="@color/offset_background"/>
<corners android:radius="6dp" />
</shape>

4
Habitica/res/drawable/rounded_border_white.xml → Habitica/res/drawable/rounded_border_content.xml
View file

@ -1,8 +1,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<solid android:color="@color/content_background" />
<stroke
android:width="1dp"
android:color="@color/gray_600"/>
android:color="@color/offset_background"/>
<corners android:radius="6dp" />
</shape>

13
Habitica/res/drawable/rounded_purple_square.xml
View file

@ -2,15 +2,6 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- view background color -->
<solid
android:color="@color/brand_400" >
</solid>
<!-- Here is the corner radius -->
<corners
android:radius="5dp" >
</corners>
<solid android:color="@color/brand_400" />
<corners android:radius="5dp" />
</shape>

4
Habitica/res/drawable/seekbar_thumb.xml
View file

@ -10,10 +10,10 @@
<size
android:width="10dp"
android:height="10dp" />
<solid android:color="@color/white" />
<solid android:color="@color/content_background" />
<stroke
android:width="1dp"
android:color="@color/gray_400" />
android:color="@color/content_background_offset" />
</shape>
</rotate>
</item>

2
Habitica/res/drawable/subscription_box_bg.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/gray_700"/>
<solid android:color="@color/window_background"/>
<corners android:radius="8dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

4
Habitica/res/drawable/subscription_box_bg_selected.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray_700"/>
<solid android:color="@color/window_background"/>
<corners android:radius="8dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<stroke android:color="@color/brand_400" android:width="3dp" />
<stroke android:color="@color/text_brand_neon" android:width="3dp" />
</shape>

2
Habitica/res/drawable/system_chat_background.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">
<stroke android:color="@color/gray_500" android:width="1dp" />
<stroke android:color="@color/content_background_offset" android:width="1dp" />
<corners android:radius="4dp" />
</shape>

2
Habitica/res/drawable/task_background.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">
<solid android:color="@color/gray_700" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:radius="8dp" />
</shape>

4
Habitica/res/drawable/task_form_control_bg.xml
View file

@ -2,14 +2,14 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/gray_500" />
<solid android:color="@color/content_background_offset" />
<corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
</shape>
</item>
<item android:bottom="4dp">
<shape android:shape="rectangle">
<solid android:color="@color/gray_700" />
<solid android:color="@color/window_background" />
<corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
</shape>
</item>

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

@ -4,7 +4,7 @@
<item>
<shape android:shape="oval">
<corners android:radius="@dimen/daily_checkbox_corner_radius"/>
<solid android:color="@color/gray_600" />
<solid android:color="@color/offset_background" />
<size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:height="1dip" />
<solid android:color="@color/gray_500" />
<solid android:color="@color/separator" />
</shape>

8
Habitica/res/layout/achievement_grid_item.xml
View file

@ -8,13 +8,13 @@
android:gravity="center_vertical"
android:paddingTop="13dp"
android:paddingBottom="13dp"
tools:background="@color/white">
tools:background="?attr/colorContentBackground">
<LinearLayout
android:id="@+id/achievement_container"
android:layout_width="156dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:clipChildren="true"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
@ -37,8 +37,8 @@
android:minHeight="40dp"
style="@style/Body1"
android:gravity="center"
android:textColor="@color/gray_100"
android:background="@color/gray_600"
android:textColor="@color/text_secondary"
android:background="@color/offset_background"
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"
android:paddingTop="@dimen/spacing_small"

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

@ -43,12 +43,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_100"/>
android:textColor="@color/text_primary"/>
<TextView
android:id="@+id/achievement_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Caption3"
android:textColor="@color/gray_100"/>
android:textColor="@color/text_secondary"/>
</LinearLayout>
</LinearLayout>

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

@ -12,9 +12,9 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:gravity="center"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
style="@style/Body1"
android:background="@drawable/circle_gray600"
android:background="@drawable/circle_offset"
tools:text="12"
android:layout_marginStart="35dp"
android:layout_marginEnd="25dp"/>
@ -23,6 +23,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
tools:text="This is the quest title"/>
</LinearLayout>

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

@ -24,7 +24,7 @@
android:background="@drawable/achievement_section_badge_bg"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
style="@style/Overline"
tools:text="1"/>
</LinearLayout>

47
Habitica/res/layout/activity_about.xml
View file

@ -1,47 +0,0 @@
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/white">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
android:background="@color/brand_300"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.AboutActivity">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:elevation="6dp"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_below="@id/tab_layout"
android:background="@color/white"
/>
</RelativeLayout>
</LinearLayout>

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

@ -4,9 +4,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:background="?attr/colorContentBackground"
android:orientation="vertical"
android:background="@color/white">
tools:context=".ui.activities.PrefsActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -16,86 +16,97 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorContentBackground"
android:minHeight="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/Theme.AppCompat.Light"
android:background="@color/white"/>
app:popupTheme="@style/Theme.AppCompat.Light" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical">
<LinearLayout
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/adventure_guide_art"
android:layout_marginBottom="@dimen/spacing_medium"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/getting_started"
style="@style/Subheader1"
android:textColor="@color/gray_50"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="@dimen/spacing_medium"/>
<TextView
android:id="@+id/description_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/adventure_guide_description"
style="@style/Body2"
android:textColor="@color/gray_50"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/your_progress"
android:textColor="@color/gray_100"
style="@style/Caption1"/>
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/progress_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Caption2.Regular"
android:textColor="@color/gray_300"
android:text="@string/lets_get_started"/>
</LinearLayout>
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="@dimen/spacing_medium"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:progressBackgroundTint="@color/gray_600"
android:progressTint="@color/yellow_50"/>
<LinearLayout
android:id="@+id/achievement_container"
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
android:layout_height="match_parent"
android:scrollbarSize="3dp"
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_medium"
android:src="@drawable/adventure_guide_art" />
<TextView
style="@style/Subheader1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="@dimen/spacing_medium"
android:text="@string/getting_started"
android:textColor="@color/text_primary" />
<TextView
android:id="@+id/description_view"
style="@style/Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:gravity="center_horizontal"
android:text="@string/adventure_guide_description"
android:textColor="@color/text_primary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="30dp">
<TextView
style="@style/Caption1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/your_progress"
android:textColor="@color/text_secondary" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<TextView
android:id="@+id/progress_textview"
style="@style/Caption2.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lets_get_started"
android:textColor="@color/text_quad" />
</LinearLayout>
<ProgressBar
android:id="@+id/progress_bar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="@dimen/spacing_medium"
android:progressBackgroundTint="@color/offset_background"
android:progressTint="@color/yellow_50" />
<LinearLayout
android:id="@+id/achievement_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/content_background">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
android:background="@color/white"
android:background="@color/content_background"
app:layout_scrollFlags="scroll|enterAlways"
app:title="@string/choose_class"
app:titleTextColor="@color/gray_50"
app:titleTextColor="@color/text_primary"
app:theme="@style/ToolbarDarkBackArrow"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>

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

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/white">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -202,7 +202,7 @@
android:hint="@string/identify_your_challenge_with_a_tag"
android:maxLines="1"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
android:textColorHint="#61000000" />
</com.google.android.material.textfield.TextInputLayout>

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

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/white">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/outer_inset"
android:text="@string/fix_character_description"
android:background="@color/gray_700"
android:background="@color/window_background"
android:layout_marginBottom="16dp"
/>
<FrameLayout
@ -55,7 +55,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/health"
android:paddingStart="16dp">
@ -76,7 +76,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -98,7 +98,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/experience_points"
android:paddingStart="16dp">
@ -119,7 +119,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -141,7 +141,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/mana_points"
android:paddingStart="16dp">
@ -162,7 +162,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -184,7 +184,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/gold_capitalilzed"
android:paddingStart="16dp">
@ -205,7 +205,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -227,7 +227,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/character_level"
android:paddingStart="16dp">
@ -248,7 +248,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -271,7 +271,7 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:paddingTop="8dp"
android:hint="@string/streak_label"
android:paddingStart="16dp">
@ -292,7 +292,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:background="@color/content_background_offset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
</LinearLayout>

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

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

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

@ -21,7 +21,7 @@
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:background="@color/content_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.appbar.AppBarLayout
@ -35,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="@color/white"
android:background="?attr/colorContentBackground"
app:layout_collapseMode="pin"
app:popupTheme="@style/Theme.AppCompat.Light" />
</com.google.android.material.appbar.AppBarLayout>

8
Habitica/res/layout/activity_gift1get1_info.xml
View file

@ -4,14 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
android:background="@color/content_background">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="30dp"
android:background="@color/white">
android:background="@color/content_background">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -124,7 +124,7 @@
android:layout_height="wrap_content"
android:text="@string/g1g1_info_2_text"
android:gravity="center"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:lineSpacingExtra="1dp"
android:layout_marginBottom="22dp"
android:layout_marginStart="15dp"
@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:text="@string/g1g1_info_3_text"
android:gravity="center"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:lineSpacingExtra="1dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"/>

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/content_background">
<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"
@ -11,7 +11,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/content_background">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -51,6 +51,6 @@
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@android:color/white" />
android:background="@color/content_background" />
</LinearLayout>
</FrameLayout>

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

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/white">
android:background="@color/content_background">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -49,7 +49,7 @@
android:id="@+id/username_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:textSize="12sp"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/spacing_large"/>
@ -59,7 +59,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/gift_subscription_subtitle"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:layout_marginLeft="@dimen/spacing_large"
android:layout_marginRight="@dimen/spacing_large"/>
<LinearLayout

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

@ -4,14 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/gray_700">
android:background="@color/window_background">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="30dp"
android:background="@color/white">
android:background="?attr/colorContentBackground">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -46,21 +46,21 @@
android:layout_marginLeft="@dimen/spacing_large"
android:layout_marginRight="@dimen/spacing_large"
android:background="@drawable/edittext"
android:textColorHint="@color/gray_50">
android:textColorHint="@color/text_primary">
<com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
android:id="@+id/group_name_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:hint="@string/name"
android:textColor="@android:color/black"
android:textColor="@color/text_primary"
android:inputType="textCapSentences"
android:background="@color/transparent"
android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large"
android:paddingTop="20dp"
android:textColorHint="@color/gray_50"
android:textColorHint="@color/text_secondary"
/>
</com.google.android.material.textfield.TextInputLayout>
@ -72,7 +72,7 @@
android:layout_marginLeft="@dimen/spacing_large"
android:layout_marginRight="@dimen/spacing_large"
android:background="@drawable/edittext"
android:textColorHint="@color/gray_50">
android:textColorHint="@color/text_primary">
<com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
android:id="@+id/group_description_edittext"
@ -80,14 +80,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:hint="@string/description"
android:textColor="@android:color/black"
android:textColor="@color/text_primary"
android:inputType="textCapSentences|textMultiLine"
android:background="@color/transparent"
android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large"
android:paddingTop="20dp"
android:textColorHint="@color/gray_50"
android:textColorHint="@color/text_primary"
android:minLines="3"
android:gravity="top" />
</com.google.android.material.textfield.TextInputLayout>

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

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

10
Habitica/res/layout/activity_main.xml
View file

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
android:background="@color/white">
android:background="@color/content_background">
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->
@ -53,10 +53,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar.Modern"
style="@style/Toolbar.Modern"
android:background="?attr/headerBackgroundColor"
app:layout_collapseMode="pin"
app:popupTheme="@style/Theme.AppCompat.Light">
app:popupTheme="@style/Theme.AppCompat.DayNight">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -96,8 +96,6 @@
android:background="?headerOffsetColor"
android:elevation="0dp"
android:fillViewport="false"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:layout_anchor="@+id/collapsing_toolbar"
app:layout_anchorGravity="bottom"
@ -110,7 +108,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:background="@color/gray_50"
android:background="@color/text_primary"
android:textSize="14sp"
android:gravity="center_horizontal"
android:padding="@dimen/spacing_small"

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

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

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/content_background">
<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"
@ -11,7 +11,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/content_background">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="@color/gray_700"
android:background="@color/window_background"
android:elevation="0dp"
android:fillViewport="false"
@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@android:color/white" />
android:background="@color/content_background" />
</LinearLayout>

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

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

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

@ -22,7 +22,7 @@
android:id="@+id/content_container"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/content_background"
>
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
@ -37,9 +37,9 @@
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
app:title=""
android:background="@color/white"
android:background="@color/content_background"
app:layout_scrollFlags="scroll|enterAlways"
app:titleTextColor="@color/gray_50"
app:titleTextColor="@color/text_primary"
app:theme="@style/ReportMessageToolbar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark">
<ImageButton
@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:text="@string/report_violation"
android:textSize="20sp"
android:textColor="@color/gray_50"
android:textColor="@color/text_primary"
android:layout_marginEnd="36dp"
android:id="@+id/toolbar_title" />
<Button
@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Report NAME for violation:"
android:textColor="@color/gray_10"
android:textColor="@color/text_primary"
style="@style/Caption1"
android:layout_marginBottom="@dimen/spacing_medium"
android:layout_marginStart="13dp"/>
@ -96,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/border_1f000000"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
style="@style/Body2"
android:lineSpacingExtra="4sp"
android:paddingTop="11dp"
@ -118,7 +118,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/reason_for_report"
android:textColor="@color/gray_50"
android:textColor="@color/text_primary"
android:paddingBottom="34dp"
android:paddingTop="16dp"
android:paddingStart="@dimen/spacing_large"
@ -131,7 +131,7 @@
android:layout_height="wrap_content"
android:gravity="center"
tools:text="@string/report_explanation"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
style="@style/Caption3"
android:textColorLink="?colorAccent"
/>

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

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

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

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/white">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -46,6 +46,6 @@
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@android:color/white" />
android:background="@color/content_background" />
</LinearLayout>

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

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/white">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -30,7 +30,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="?attr/colorContentBackground"
android:paddingBottom="@dimen/spacing_large">
<LinearLayout
android:id="@+id/upper_text_wrapper"
@ -82,7 +82,7 @@
android:visibility="gone"
style="@style/Caption1"
android:gravity="center"
android:textColor="@color/gray_10"
android:textColor="@color/text_primary"
tools:visibility="visible"
tools:text="Challenge Name"/>
</LinearLayout>

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

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
android:background="@color/content_background">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_large"
android:background="@color/white"
android:background="@color/content_background"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
@ -36,7 +36,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
android:text="@string/usernamePromptBody"
android:gravity="center"
android:textSize="14sp"
@ -45,7 +45,7 @@
android:id="@+id/wiki_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
android:text="@string/usernamePromptWiki"
android:gravity="center"
android:textSize="14sp"
@ -63,7 +63,7 @@
android:paddingLeft="@dimen/spacing_medium"
android:paddingRight="@dimen/spacing_medium"
android:layout_marginLeft="1dp"
android:background="@color/gray_700"
android:background="@color/window_background"
android:gravity="center_vertical"
/>
<View android:background="@color/gray_600"
@ -79,17 +79,17 @@
<TableRow>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/gray_600" android:layout_span="3" />
android:background="@color/offset_background" android:layout_span="3" />
</TableRow>
<TableRow>
<TextView android:text="@string/username"
android:background="@color/gray_700"
android:background="@color/window_background"
android:layout_height="41dp"
android:paddingLeft="@dimen/spacing_medium"
android:paddingRight="@dimen/spacing_medium"
android:layout_marginLeft="1dp"
android:gravity="center_vertical"/>
<View android:background="@color/gray_600"
<View android:background="@color/offset_background"
android:layout_width="1dp"
android:layout_height="42dp"/>
<LinearLayout
@ -100,7 +100,7 @@
android:layout_height="match_parent"
android:text="\@"
android:gravity="center_vertical"
android:textColor="@color/gray_400"/>
android:textColor="@color/text_dimmed"/>
<EditText android:id="@+id/username_edit_text"
android:background="@color/transparent"
android:layout_width="0dp"
@ -143,7 +143,7 @@
android:layout_marginLeft="@dimen/spacing_large"
android:layout_marginRight="@dimen/spacing_large"
android:textSize="12sp"
android:textColor="@color/gray_200"/>
android:textColor="@color/text_ternary"/>
<ImageView
android:layout_width="121dp"
android:layout_height="31dp"
@ -158,7 +158,7 @@
android:text="@string/usernamePromptDisclaimer"
android:gravity="center"
android:textSize="12sp"
android:textColor="@color/gray_300"/>
android:textColor="@color/text_quad"/>
</LinearLayout>
</ScrollView>
<FrameLayout

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

@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:text="@string/onboarding_tasks"
style="@style/Body1"
android:textColor="@color/gray_50"/>
android:textColor="@color/text_primary"/>
<LinearLayout
android:layout_width="match_parent"
@ -42,7 +42,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/gray_50"
android:textColor="@color/text_primary"
android:textSize="12sp" />
<TextView
@ -60,7 +60,7 @@
android:layout_height="4dp"
android:progressTint="@color/yellow_50"
style="@android:style/Widget.ProgressBar.Horizontal"
android:progressBackgroundTint="@color/gray_600"
android:progressBackgroundTint="@color/offset_background"
tools:progress="2"
android:max="5"/>
</LinearLayout>

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

@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing"
app:barForegroundColor="@color/hpColor"
app:lightBackground="true"
app:barBackgroundColor="@color/window_background"
app:description="@string/HP_default"/>
<com.habitrpg.android.habitica.ui.views.ValueBar
@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing"
app:barForegroundColor="@color/xpColor"
app:lightBackground="true"
app:barBackgroundColor="@color/window_background"
app:description="@string/XP_default"/>
<com.habitrpg.android.habitica.ui.views.ValueBar
@ -54,7 +54,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:barForegroundColor="@color/mpColor"
app:lightBackground="true"
app:barBackgroundColor="@color/window_background"
app:description="@string/MP_default"/>
</LinearLayout>
@ -91,7 +91,6 @@
<com.habitrpg.android.habitica.ui.views.CurrencyViews
android:id="@+id/currencyView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:hasLightBackground="true"/>
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>

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

@ -61,7 +61,7 @@
android:id="@+id/challenge_shorttext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
android:textSize="12sp"
tools:text="Description"
android:layout_marginTop="@dimen/spacing_small"

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

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="#f9f9f9"
android:background="@color/window_background"
android:orientation="vertical"
android:gravity="center">

8
Habitica/res/layout/tavern_chat_new_entry_item.xml → Habitica/res/layout/chat_bar_view.xml
View file

@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:hint="@string/write_message"
android:textColor="@android:color/black"
android:textColor="@color/text_primary"
android:inputType="textCapSentences|textMultiLine"
android:lineSpacingExtra="2dp"
android:background="@drawable/rounded_border"
@ -61,7 +61,7 @@
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@color/transparent"
android:tint="@color/gray_400"
android:tint="@color/disabled_background"
android:src="@drawable/ic_send_grey_600_24dp"
android:contentDescription="@string/send"/>
</LinearLayout>
@ -71,7 +71,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/brand_300"
android:background="@color/brand_background"
android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large"
android:paddingTop="@dimen/spacing_large"
@ -89,7 +89,7 @@
android:id="@+id/communityGuidelinesAcceptButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/HabiticaButton.Blue"
style="@style/HabiticaButton.Primary"
android:text="@string/i_agree_to_follow_the_guidelines"/>
</LinearLayout>
</merge>

16
Habitica/res/layout/tavern_chat_item.xml → Habitica/res/layout/chat_item.xml
View file

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:background="@color/gray_700"
android:background="@color/window_background"
android:paddingLeft="@dimen/chat_horizontal_inset"
android:paddingRight="@dimen/chat_horizontal_inset"
android:paddingTop="@dimen/spacing_small"
@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/CardContent.Compact"
android:background="@drawable/layout_rounded_bg"
android:background="@drawable/layout_rounded_bg_content"
android:padding="@dimen/spacing_medium">
<TableLayout
android:layout_width="match_parent"
@ -92,7 +92,7 @@
android:ellipsize="end"
tools:text="2d ago"
android:textSize="12sp"
android:textColor="@color/gray_300"/>
android:textColor="@color/text_quad"/>
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/message_text"
android:layout_width="match_parent"
@ -101,7 +101,7 @@
android:layout_marginBottom="8dp"
android:lineSpacingMultiplier="1.0"
tools:text="This is the chat message"
android:textColor="@color/gray_10" />
android:textColor="@color/text_primary" />
<com.nex3z.flowlayout.FlowLayout
android:id="@+id/buttons_wrapper"
android:layout_width="match_parent"
@ -112,7 +112,7 @@
android:layout_height="36dp"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textSize="12sp"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:text="@string/reply"
android:gravity="center_vertical"
android:drawablePadding="@dimen/spacing_small"/>
@ -122,7 +122,7 @@
android:layout_height="36dp"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textSize="12sp"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:text="@string/copy"
android:gravity="center_vertical"
android:drawablePadding="@dimen/spacing_small" />
@ -132,7 +132,7 @@
android:layout_height="36dp"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textSize="12sp"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:text="@string/report"
android:gravity="center_vertical"
android:drawablePadding="@dimen/spacing_small" />
@ -142,7 +142,7 @@
android:layout_height="36dp"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textSize="12sp"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
android:text="@string/delete"
android:gravity="center_vertical"
android:drawablePadding="@dimen/spacing_small"/>

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

@ -11,7 +11,7 @@
android:id="@+id/wrapper"
android:layout_width="76dp"
android:layout_height="wrap_content"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:orientation="vertical"
android:layout_gravity="center">
@ -30,7 +30,7 @@
android:id="@+id/price_label"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:textColor="@color/gray_300"
android:textColor="@color/text_quad"
tools:text="150"
style="@style/Body1"
app:hasLightBackground="true"

8
Habitica/res/layout/customization_section_header.xml
View file

@ -14,13 +14,13 @@
android:layout_weight="1"
tools:text="Test header"
style="@style/Overline"
android:textColor="@color/gray_200"/>
android:textColor="@color/text_ternary"/>
<TextView
android:id="@+id/count_pill"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:visibility="gone"
style="@style/Pill.Gray700"
style="@style/Pill.Window"
android:textSize="10sp"
android:textAllCaps="true"
android:letterSpacing="0.15"
@ -36,13 +36,13 @@
tools:visibility="visible"
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"
android:background="@drawable/layout_rounded_bg_gray_700">
android:background="@drawable/layout_rounded_bg_window">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/buy_all"
android:textAllCaps="true"
android:textColor="@color/brand_300"
android:textColor="@color/text_brand_neon"
style="@style/Body1"
android:layout_marginEnd="@dimen/spacing_medium"/>
<com.habitrpg.android.habitica.ui.views.CurrencyView

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

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

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

@ -46,6 +46,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body2"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
android:gravity="center_horizontal"/>
</LinearLayout>

10
Habitica/res/layout/dialog_bulk_allocate.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/titleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_400"
android:background="@color/disabled_background"
android:orientation="vertical"
android:padding="18dp"
android:focusable="true"
@ -43,27 +43,27 @@
android:layout_height="wrap_content"
app:statsTitle="@string/str_abbrv"
app:statsColor="@color/red_100"
app:statsTextColor="@color/red_10"/>
app:statsTextColor="@color/text_red"/>
<com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
android:id="@+id/intelligenceSliderView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:statsTitle="@string/int_abbrv"
app:statsColor="@color/blue_100"
app:statsTextColor="@color/blue_10"/>
app:statsTextColor="@color/text_blue"/>
<com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
android:id="@+id/constitutionSliderView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:statsTitle="@string/con_abbrv"
app:statsColor="@color/yellow_100"
app:statsTextColor="@color/yellow_10"/>
app:statsTextColor="@color/text_yellow"/>
<com.habitrpg.android.habitica.ui.views.stats.StatsSliderView
android:id="@+id/perceptionSliderView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:statsTitle="@string/per_abbrv"
app:statsColor="@color/brand_300"
app:statsTextColor="@color/brand_300"/>
app:statsTextColor="@color/text_brand"/>
</LinearLayout>
</LinearLayout>

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

@ -13,7 +13,7 @@
android:id="@+id/lock_icon_background_plus"
android:layout_width="48dp"
android:layout_height="match_parent"
android:background="@color/gray_700"
android:background="@color/window_background"
android:layout_marginRight="@dimen/spacing_large"
android:layout_marginTop="0.5dp"
android:layout_marginBottom="0.5dp">
@ -48,7 +48,7 @@
android:id="@+id/lock_icon_background_minus"
android:layout_width="48dp"
android:layout_height="match_parent"
android:background="@color/gray_700"
android:background="@color/window_background"
android:layout_marginLeft="@dimen/spacing_large"
android:layout_marginTop="0.5dp"
android:layout_marginBottom="0.5dp">

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

@ -14,8 +14,6 @@
android:layout_height="16dp"
android:layout_marginBottom="18dp"
android:layout_marginEnd="15.5dp"
android:layout_marginLeft="14.5dp"
android:layout_marginRight="15.5dp"
android:layout_marginStart="14.5dp"
android:layout_marginTop="18dp" />
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView

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

@ -24,8 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/spacing_medium"
style="@style/Pill.White"
android:textColor="@color/gray_400"
style="@style/Pill.Content"
android:textColor="@color/text_dimmed"
tools:text="2"/>
</LinearLayout>

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

@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:text="@string/enter_recipient_username"
android:textSize="12sp"
android:textColor="@color/gray_200"/>
android:textColor="@color/text_ternary"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -14,7 +14,7 @@
<FrameLayout
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:layout_marginEnd="@dimen/spacing_large">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/egg_view"
@ -25,7 +25,7 @@
<FrameLayout
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/layout_rounded_bg_gray_700">
android:background="@drawable/layout_rounded_bg_window">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/hatchingPotion_view"
android:layout_width="@dimen/gear_image_size"
@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body2"
android:textColor="@color/gray_200"
android:textColor="@color/text_ternary"
android:gravity="center_horizontal"
android:text="@string/first_drop_explanation1"
android:layout_marginBottom="@dimen/spacing_medium"/>
@ -45,7 +45,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
android:text="@string/first_drop_explanation2"
android:gravity="center_horizontal"/>
</LinearLayout>

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

@ -14,7 +14,7 @@
android:orientation="vertical"
android:layout_width="320dp"
android:layout_height="wrap_content"
tools:background="@color/black"
tools:background="@android:color/black"
android:minWidth="300dp"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal"
@ -75,7 +75,7 @@
android:id="@+id/scrolling_separator"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/gray_600"
android:background="@color/offset_background"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/buttons_wrapper"
@ -98,11 +98,11 @@
android:paddingBottom="@dimen/spacing_medium"
android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large"
android:background="@drawable/layout_rounded_bg_gray_700"
android:background="@drawable/layout_rounded_bg_window"
android:visibility="gone"
android:gravity="center"
style="@style/Caption3"
android:textColor="@color/gray_100"
android:textColor="@color/text_secondary"
tools:text="This is a small label"
tools:visibility="visible"/>
</LinearLayout>

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

@ -25,5 +25,5 @@
android:text="@string/levelup_detail"
style="@style/Body2"
android:gravity="center_horizontal"
android:textColor="@color/gray_200"/>
android:textColor="@color/text_ternary"/>
</LinearLayout>

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

@ -37,7 +37,7 @@
android:text="@string/levelup_title_10"
style="@style/Subheader1"
android:gravity="center_horizontal"
android:textColor="@color/gray_50"
android:textColor="@color/text_primary"
android:layout_marginBottom="@dimen/spacing_medium"/>
<TextView
android:layout_width="wrap_content"
@ -45,5 +45,5 @@
android:text="@string/levelup_detail_10"
style="@style/Body2"
android:gravity="center_horizontal"
android:textColor="@color/gray_200"/>
android:textColor="@color/text_ternary"/>
</LinearLayout>

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