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

Merge branch 'version/4.1' into Hafiz/task-link-updates

Browse source
This commit is contained in:
Phillip Thelen 2022-12-05 17:49:25 +01:00 committed by GitHub
commit 31330b8f1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
354 changed files with 7394 additions and 6357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -83,7 +83,7 @@ GEM
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-properties (1.1.2)
java-properties
fastlane-plugin-semantic_release (1.14.1)
fastlane-plugin-semantic_release (1.18.0)
fastlane-plugin-versioning_android (0.1.0)
gh_inspector (1.1.3)
google-api-client (0.38.0)

20
Habitica/AndroidManifest.xml
View file

@ -30,7 +30,6 @@
android:value="@string/application_ad_id"/>
<activity
android:name=".ui.activities.MainActivity"
android:label="@string/app_name"
android:theme="@style/LaunchAppTheme"
android:windowSoftInputMode="stateHidden|adjustResize"
android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
@ -149,6 +148,16 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.activities.MainActivity" />
</activity>
<activity
android:name=".ui.activities.TaskSummaryActivity"
android:parentActivityName=".ui.activities.MainActivity"
tools:ignore="UnusedAttribute"
android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
android:windowSoftInputMode="stateVisible|adjustResize">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.activities.MainActivity" />
</activity>
<activity
android:name=".ui.activities.GroupFormActivity"
android:parentActivityName=".ui.activities.MainActivity"
@ -205,9 +214,6 @@
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity android:name=".ui.activities.GemPurchaseActivity"
android:screenOrientation="unspecified" />
<activity android:name=".ui.activities.VerifyUsernameActivity"
android:screenOrientation="unspecified"
android:windowSoftInputMode="stateHidden" />
<receiver android:name=".receivers.NotificationPublisher" />
<receiver android:name=".receivers.TaskReceiver" android:enabled="true" android:exported="true">
@ -257,6 +263,12 @@
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/ic_gryphon_white" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/brand_300" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="@string/content_provider"

35
Habitica/build.gradle
View file

@ -35,7 +35,6 @@ dependencies {
exclude module: 'okhttp'
}
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
//Dependency Injection
implementation "com.google.dagger:dagger:$daggerhilt_version"
@ -43,7 +42,7 @@ dependencies {
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
//App Compatibility and Material Design
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.7.0'
implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
implementation "androidx.preference:preference-ktx:$preferences_version"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@ -54,17 +53,11 @@ dependencies {
implementation('com.jaredrummler:android-device-names:2.1.0')
// IAP Handling / Verification
implementation "com.android.billingclient:billing-ktx:5.0.0"
implementation "com.android.billingclient:billing-ktx:5.1.0"
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
//RxJava
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation "com.github.akarnokd:rxjava3-bridge:3.0.2"
//Analytics
implementation "com.amplitude:android-sdk:$amplitude_version"
implementation "com.amplitude:analytics-android:$amplitude_version"
//Tests
testImplementation 'io.kotest:kotest-runner-junit5:5.3.0'
@ -79,10 +72,10 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
debugImplementation 'androidx.fragment:fragment-testing:1.5.4'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test:core-ktx:1.4.0'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.4'
androidTestImplementation 'io.mockk:mockk-android:1.12.3'
androidTestImplementation 'io.kotest:kotest-assertions-core:5.3.0'
androidTestUtil("androidx.test:orchestrator:1.4.1")
@ -98,7 +91,7 @@ dependencies {
implementation 'com.google.firebase:firebase-messaging-ktx'
implementation 'com.google.firebase:firebase-config-ktx'
implementation 'com.google.firebase:firebase-perf-ktx'
implementation 'com.google.android.gms:play-services-ads:21.2.0'
implementation 'com.google.android.gms:play-services-ads:21.3.0'
implementation "com.google.android.gms:play-services-auth:$play_auth_version"
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
@ -109,18 +102,20 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
implementation "androidx.fragment:fragment-ktx:1.5.2"
implementation "androidx.fragment:fragment-ktx:1.5.4"
implementation "androidx.paging:paging-runtime-ktx:3.1.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
implementation "com.google.android.material:compose-theme-adapter:1.1.18"
implementation "com.google.android.material:compose-theme-adapter:1.1.21"
implementation "androidx.compose.material3:material3:1.0.1"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.1"
implementation 'androidx.activity:activity-compose:1.5.1'
implementation 'androidx.activity:activity-compose:1.6.1'
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
@ -147,7 +142,7 @@ android {
}
defaultConfig {
minSdkVersion 21
minSdkVersion min_sdk
applicationId "com.habitrpg.android.habitica"
vectorDrawables.useSupportLibrary = true
buildConfigField "String", "STORE", "\"google\""
@ -172,7 +167,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.3.1"
kotlinCompilerExtensionVersion = "1.4.0-alpha02"
}
signingConfigs {

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 184 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 396 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 214 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 509 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 283 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 661 B

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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:radius="12dp" />
</shape>

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

@ -19,7 +19,7 @@
android:shape="rectangle"
android:layout_width="match_parent"
android:layout_height="match_parent">
<solid android:color="@color/content_background" />
<solid android:color="?attr/colorContentBackground" />
<corners android:radius="6dp" />
</shape>
<ripple android:color="@color/white" />

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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
</shape>

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/content_background" />
<solid android:color="?attr/colorContentBackground" />
<stroke
android:width="0.5dip"

2
Habitica/res/drawable/bottom_sheet_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
</shape>

2
Habitica/res/drawable/bottom_sheet_title.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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
</shape>

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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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

@ -6,6 +6,6 @@
android:viewportHeight="24.0">
<path
android:pathData="M0,12l0,12 11.5,-5.7c6.3,-3.2 11.5,-6 11.5,-6.3 0,-0.3 -5.2,-3.1 -11.5,-6.3l-11.5,-5.7 0,12z"
android:strokeColor="@color/content_background"
android:fillColor="@color/content_background"/>
android:strokeColor="?attr/colorContentBackground"
android:fillColor="?attr/colorContentBackground"/>
</vector>

10
Habitica/res/drawable/edit.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M16.188,7.542 L12.458,3.812 13.479,2.792Q14,2.271 14.719,2.271Q15.438,2.271 15.958,2.792L17.208,4.042Q17.708,4.542 17.708,5.281Q17.708,6.021 17.208,6.521ZM14.958,8.771 L6.229,17.5H2.5V13.771L11.229,5.042Z"/>
</vector>

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

@ -3,6 +3,6 @@
<gradient
android:angle="90"
android:endColor="@color/content_80_alpha"
android:startColor="@color/content_background"
android:startColor="?attr/colorContentBackground"
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/content_background_offset" android:width="2dp" />
<stroke android:color="?attr/colorContentBackgroundOffset" 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/content_background_offset" />
<stroke android:width="2dp" android:color="?colorTintedBackgroundOffset" />
</shape>

2
Habitica/res/drawable/layout_rounded_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/content_background" />
<solid android:color="?attr/colorContentBackground" />
<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/content_background_offset" />
<solid android:color="?attr/colorContentBackgroundOffset" />
<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_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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_task_form.xml
View file

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="4dp" />
<corners android:radius="8dp" />
</shape>

6
Habitica/res/drawable/layout_rounded_bg_tinted.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorTintedBackgroundOffset" />
<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_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="@color/content_background" />
<solid android:color="?attr/colorContentBackground" />
<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_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:radius="@dimen/bar_radius"/>
<stroke android:width="2dp" android:color="@color/background_brand" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

2
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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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" />

2
Habitica/res/drawable/layout_rounded_bg_window_tint_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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" />

2
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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<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" />

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

@ -4,8 +4,8 @@
<gradient
android:angle="90"
android:centerColor="@color/transparent_white"
android:endColor="@color/content_background"
android:startColor="@color/content_background"
android:endColor="?attr/colorContentBackground"
android:startColor="?attr/colorContentBackground"
android:type="linear"
android:centerX="0.6"/>

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

@ -5,6 +5,6 @@
android:viewportHeight="16">
<path
android:pathData="M0,15v-3l0.7,-0.34 1.05,-0.49 0.95,-0.43 0.84,-0.36 1.27,-0.54 1.07,-0.44 1.57,-0.63 1.28,-0.5 1.37,-0.51 0.96,-0.35 0.99,-0.35 1.03,-0.36 1.06,-0.36L15.25,6l1.7,-0.54 1.17,-0.36 1.2,-0.35 0.61,-0.18 1.24,-0.35 0.63,-0.17 1.28,-0.34c0.43,-0.11 0.87,-0.22 1.3,-0.33l1.33,-0.32a124.57,124.57 0,0 1,4.81 -1.05l1.42,-0.27C37.64,0.69 43.76,0 50,0c4.42,0 9.12,0.33 14.19,0.89l1.8,0.2 1.84,0.22 0.93,0.12 1.88,0.25 1.92,0.26 1.95,0.27 1.99,0.29 3.05,0.45 5.26,0.8 6.63,1.02 4.63,0.7 3.58,0.53 2.44,0.35 2.49,0.35 2.53,0.35 2.58,0.35 1.31,0.17 2.65,0.34c0.89,0.11 1.79,0.22 2.7,0.33l2.74,0.33 2.09,0.24 2.12,0.23 2.15,0.23 1.09,0.11 2.19,0.22 2.22,0.21 2.25,0.21 2.28,0.2 2.31,0.19c0.39,0.03 0.78,0.06 1.17,0.09l2.36,0.18 2.39,0.17 1.21,0.08 2.44,0.15 2.47,0.14 1.25,0.07 2.52,0.13 2.55,0.12c0.43,0.02 0.86,0.04 1.29,0.05l2.6,0.1 2.63,0.09 1.33,0.04 2.69,0.07c1.8,0.04 3.63,0.07 5.48,0.09l2.03,0.02h7.81c12.46,-0.09 24.81,-0.58 36.7,-1.3l3.39,-0.21 1.68,-0.11 3.35,-0.23 3.32,-0.24 1.65,-0.12 3.27,-0.25 4.04,-0.33 5.57,-0.48 3.13,-0.28 4.62,-0.43 4.52,-0.44 2.96,-0.29 4.35,-0.44 4.24,-0.44 5.46,-0.58 17.28,-1.87 3.29,-0.35 3.13,-0.32 2,-0.2 1.92,-0.19 1.84,-0.17 1.77,-0.16 2.09,-0.17 1.97,-0.14 1.48,-0.09c0.64,-0.04 1.25,-0.07 1.84,-0.1l1.14,-0.04 1.07,-0.03A57.3,57.3 0,0 1,316 2c7.31,0 12.87,1.52 16.94,3.38l0.61,0.29 0.59,0.29c0.19,0.1 0.38,0.2 0.57,0.29l0.54,0.3 0.52,0.3 0.5,0.3 0.71,0.45 0.44,0.3 0.42,0.29 0.4,0.29 0.38,0.28 0.53,0.42 0.33,0.27 0.3,0.26 0.28,0.25 0.26,0.24 0.24,0.23 0.33,0.32 0.37,0.38 0.29,0.32 0.33,0.39 0.11,0.14v3.68L174.15,15H0z"
android:fillColor="@color/content_background"
android:fillColor="?attr/colorContentBackground"
android:fillType="evenOdd"/>
</vector>

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/window_background"/>
<solid android:color="?attr/colorWindowBackground"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
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/content_background"/>
<solid android:color="?attr/colorContentBackground"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
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/window_background"/>
<solid android:color="?attr/colorWindowBackground"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
</shape>

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

@ -1,6 +1,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/content_background" />
<solid android:color="?attr/colorContentBackground" />
<stroke
android:width="1dp"
android:color="@color/offset_background"/>

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

@ -10,10 +10,10 @@
<size
android:width="10dp"
android:height="10dp" />
<solid android:color="@color/content_background" />
<solid android:color="?attr/colorContentBackground" />
<stroke
android:width="1dp"
android:color="@color/content_background_offset" />
android:color="?attr/colorContentBackgroundOffset" />
</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/window_background"/>
<solid android:color="?attr/colorWindowBackground"/>
<corners android:radius="8dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/subscription_box_bg_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/window_background"/>
<solid android:color="?attr/colorWindowBackground"/>
<corners android:radius="8dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<stroke android:color="@color/text_brand_neon" android:width="3dp" />

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/content_background_offset" android:width="1dp" />
<stroke android:color="?attr/colorContentBackgroundOffset" android:width="1dp" />
<corners android:radius="4dp" />
</shape>

6
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/content_background_offset" />
<solid android:color="?colorPrimaryDark" />
<corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
</shape>
</item>
<item android:bottom="4dp">
<item android:bottom="2dp">
<shape android:shape="rectangle">
<solid android:color="@color/window_background" />
<solid android:color="?colorTintedBackgroundOffset" />
<corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
</shape>
</item>

2
Habitica/res/drawable/teams_title_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/window_background" />
<solid android:color="?attr/colorWindowBackground" />
<corners android:radius="20dp" />
<stroke android:color="?colorAccent" android:width="2dp" />
</shape>

4
Habitica/res/layout-w600dp/activity_main.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<LinearLayout
android:layout_width="match_parent"
@ -22,7 +22,7 @@
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/window_background"/>
android:background="?attr/colorWindowBackground"/>
<include layout="@layout/activity_main_content" android:id="@+id/content" />
</LinearLayout>
</androidx.drawerlayout.widget.DrawerLayout>

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

@ -4,7 +4,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<FrameLayout
android:id="@+id/confetti_anchor"
android:layout_width="match_parent"

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

@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
app:layout_scrollFlags="scroll|enterAlways"
app:title="@string/choose_class"
app:titleTextColor="@color/text_primary"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -221,7 +221,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
android:id="@+id/create_challenge_task_list">
</androidx.recyclerview.widget.RecyclerView>

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

@ -4,7 +4,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<FrameLayout
android:id="@+id/confetti_container"
android:layout_width="match_parent"

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

@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/outer_inset"
android:text="@string/fix_character_description"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:layout_marginBottom="16dp"
/>
<FrameLayout
@ -73,7 +73,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -115,7 +115,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -157,7 +157,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -199,7 +199,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -241,7 +241,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
<FrameLayout
@ -284,7 +284,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</FrameLayout>
</LinearLayout>

2
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="@color/content_background"
android:background="?attr/colorContentBackground"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.appbar.AppBarLayout

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

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

2
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/content_background">
android:background="?attr/colorContentBackground">
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->

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

@ -8,7 +8,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:elevation="0dp"
android:fillViewport="false"
@ -48,7 +48,7 @@
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@color/content_background" />
android:background="?attr/colorContentBackground" />
</LinearLayout>

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

@ -28,7 +28,7 @@
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
app:title=""
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
app:layout_scrollFlags="scroll|enterAlways"
app:titleTextColor="@color/text_primary"
app:theme="@style/ReportMessageToolbar"

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

@ -43,6 +43,6 @@
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@color/content_background" />
android:background="?attr/colorContentBackground" />
</LinearLayout>

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

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?attr/colorTintedBackground"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@ -29,7 +30,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorContentBackground"
android:paddingBottom="@dimen/spacing_large">
<LinearLayout
android:id="@+id/upper_text_wrapper"
@ -96,10 +96,11 @@
android:orientation="vertical"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large">
<com.habitrpg.android.habitica.ui.views.tasks.form.HabitScoringButtonsView
<androidx.compose.ui.platform.ComposeView
android:id="@+id/habit_scoring_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="20dp" />
<TextView
android:id="@+id/reward_value_title_view"
android:layout_width="match_parent"
@ -126,17 +127,27 @@
android:layout_height="wrap_content"
android:text="@string/difficulty"
style="@style/TaskFormSectionheader"/>
<com.habitrpg.android.habitica.ui.views.tasks.form.TaskDifficultyButtons
<androidx.compose.ui.platform.ComposeView
android:id="@+id/task_difficulty_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/assign_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/assign"
style="@style/TaskFormSectionheader" />
<androidx.compose.ui.platform.ComposeView
android:id="@+id/assign_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/habit_reset_streak_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reset_counter"
style="@style/TaskFormSectionheader"/>
<com.habitrpg.android.habitica.ui.views.tasks.form.HabitResetStreakButtons
<androidx.compose.ui.platform.ComposeView
android:id="@+id/habit_reset_streak_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -165,6 +176,7 @@
android:id="@+id/habit_adjust_positive_input_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:boxBackgroundColor="?attr/colorTintedBackgroundOffset"
android:hint="@string/positive_habit_form"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
@ -181,6 +193,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/negative_habit_form"
app:boxBackgroundColor="?attr/colorTintedBackgroundOffset"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/habit_adjust_negative_streak_view"
@ -211,45 +224,10 @@
android:layout_height="wrap_content"
android:text="@string/assigned_stat"
style="@style/TaskFormSectionheader"/>
<LinearLayout
<androidx.compose.ui.platform.ComposeView
android:id="@+id/stats_selector"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_large">
<TextView
android:id="@+id/stat_strength_button"
style="@style/TaskFormToggle"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/strength"
android:layout_marginEnd="@dimen/spacing_large"/>
<TextView
android:id="@+id/stat_constitution_button"
style="@style/TaskFormToggle"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/constitution"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/stat_intelligence_button"
style="@style/TaskFormToggle"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/intelligence"
android:layout_marginEnd="@dimen/spacing_large"/>
<TextView
android:id="@+id/stat_perception_button"
style="@style/TaskFormToggle"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/perception"/>
</LinearLayout>
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/tags_title_view"

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

@ -61,7 +61,7 @@
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"
android:layout_marginStart="1dp"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:gravity="center_vertical"
/>
<View android:background="@color/gray_600"
@ -81,7 +81,7 @@
</TableRow>
<TableRow>
<TextView android:text="@string/username"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:layout_height="41dp"
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"

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

@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing"
app:barForegroundColor="@color/background_red"
app:barBackgroundColor="@color/window_background"
app:barBackgroundColor="?attr/colorWindowBackground"
app:description="@string/HP_default"/>
<com.habitrpg.common.habitica.views.ValueBar
@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing"
app:barForegroundColor="@color/background_yellow"
app:barBackgroundColor="@color/window_background"
app:barBackgroundColor="?attr/colorWindowBackground"
app:description="@string/XP_default"/>
<com.habitrpg.common.habitica.views.ValueBar
@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:barForegroundColor="@color/background_blue"
app:barBackgroundColor="@color/window_background"
app:barBackgroundColor="?attr/colorWindowBackground"
app:description="@string/MP_default"/>
</LinearLayout>

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:orientation="vertical"
android:gravity="center">

2
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/content_background"
android:background="?attr/colorContentBackground"
android:paddingStart="@dimen/chat_horizontal_inset"
android:paddingEnd="@dimen/chat_horizontal_inset"
android:paddingTop="@dimen/spacing_small"

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

@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:text="@string/close"
android:background="@drawable/alert_dialog_background"
android:backgroundTint="@color/content_background"
android:backgroundTint="?attr/colorContentBackground"
android:layout_marginTop="@dimen/spacing_large"
android:visibility="gone"
tools:visibility="visible"

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

@ -55,8 +55,8 @@
app:shimmer_repeat_delay="4000"
app:shimmer_duration="200"
app:shimmer_base_color="@color/text_dimmed"
app:shimmer_highlight_color="@color/content_background"
app:shimmer_highlight_alpha="0.8">
app:shimmer_highlight_color="?attr/colorContentBackground"
app:shimmer_highlight_alpha="0.4">
<com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/pet_view"
android:layout_width="@dimen/gear_image_size"

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

@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:gravity="center_vertical">
<LinearLayout
android:id="@+id/pin_button"

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

@ -6,4 +6,4 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp"
android:background="@color/content_background"/>
android:background="?attr/colorContentBackground"/>

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

@ -41,6 +41,6 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/content_background_offset"
android:background="?attr/colorContentBackgroundOffset"
android:layout_marginEnd="56dp"/>
</merge>

18
Habitica/res/layout/form_stepper_value.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
@ -7,39 +8,36 @@
tools:parentTag="android.widget.RelativeLayout">
<View android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"/>
<View android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/content_background_offset"
android:background="@drawable/layout_rounded_bg_task_form"
android:backgroundTint="?colorTintedBackgroundOffset"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"/>
<ImageButton
android:id="@+id/down_button"
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="@color/offset_background"
android:background="@color/transparent"
android:src="@drawable/ic_arrow_drop_down_gray_48dp_states"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
app:tint="?colorPrimaryDark"
/>
<ImageButton
android:id="@+id/up_button"
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="@color/offset_background"
android:background="@color/transparent"
android:src="@drawable/ic_arrow_drop_up_gray_48dp_states"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
/>
app:tint="?colorPrimaryDark" />
<EditText
android:id="@+id/edit_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:background="@color/transparent"
android:textColor="@color/text_secondary"
android:textColor="?colorPrimaryDark"
android:textSize="16sp"
tools:text="100.0"
android:inputType="numberDecimal"

4
Habitica/res/layout/fragment_compose.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.compose.ui.platform.ComposeView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" />

10
Habitica/res/layout/fragment_compose_scrolling.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.compose.ui.platform.ComposeView
android:id="@+id/compose_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</androidx.core.widget.NestedScrollView>

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

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -115,7 +115,7 @@
android:paddingEnd="32dp"
android:paddingBottom="32dp"
android:orientation="vertical"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:layout_marginTop="@dimen/spacing_large"
android:gravity="center">
<TextView

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

@ -5,7 +5,7 @@
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/refreshLayout"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">

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/window_background"
android:background="?attr/colorWindowBackground"
android:textColor="@color/text_primary" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"

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

@ -13,7 +13,7 @@
android:layout_height="wrap_content"
style="@style/FragmentDialogTitle"
android:id="@+id/titleTextView"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:textColor="@color/text_primary" />
<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
android:id="@+id/recyclerView"

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

@ -23,7 +23,7 @@
android:layout_height="63dp"
android:scaleType="fitCenter"
android:padding="6dp"
android:background="@color/window_background"/>
android:background="?attr/colorWindowBackground"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/content_border"
android:paddingEnd="@dimen/content_border"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:orientation="vertical">

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

@ -387,7 +387,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/window_background">
android:background="?attr/colorWindowBackground">
<TextView android:id="@+id/supportTextView"
android:layout_height="wrap_content"
android:layout_width="wrap_content"

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

@ -6,7 +6,7 @@
<LinearLayout
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
android:layout_marginBottom="@dimen/spacing_large">
<TextView
android:layout_width="match_parent"

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

@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
android:paddingTop="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large">
<LinearLayout
@ -166,7 +166,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/content_background_offset"/>
android:background="?attr/colorContentBackgroundOffset"/>
<Button
android:id="@+id/reset_tutorial_button"
android:layout_width="match_parent"

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

@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/window_background"
android:background="?attr/colorWindowBackground"
android:paddingTop="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large"
android:paddingStart="@dimen/spacing_large"

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

@ -4,7 +4,7 @@
android:id="@+id/notification_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/content_background"
android:background="?attr/colorContentBackground"
android:orientation="vertical"
android:paddingStart="20dp"
android:paddingTop="10dp"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:parentTag="android.widget.RelativeLayout"
android:background="@color/window_background">
android:background="?attr/colorWindowBackground">
<LinearLayout
android:id="@+id/contentWrapper"
android:layout_width="wrap_content"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:parentTag="android.widget.RelativeLayout"
android:background="@color/window_background">
android:background="?attr/colorWindowBackground">
<LinearLayout
android:id="@+id/contentWrapper"
android:layout_width="wrap_content"

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

@ -180,7 +180,7 @@
android:layout_height="wrap_content"
app:title="@string/world_boss_description"
app:identifier="questDescription"
app:color="@color/content_background">
app:color="?attr/colorContentBackground">
<TextView
android:id="@+id/questDescription"
android:layout_width="match_parent"

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

@ -50,7 +50,7 @@
android:gravity="center_horizontal"
android:textColor="@color/text_secondary"
style="@style/Body1"
app:backgroundTint="@color/content_background_offset"
app:backgroundTint="?attr/colorContentBackgroundOffset"
android:textSize="16sp"
android:inputType="number"/>
</merge>

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

@ -5,7 +5,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/content_background">
tools:background="?attr/colorContentBackground">
<ImageView
android:id="@+id/heart_icon"
android:layout_width="20dp"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/layout_rounded_bg_task_form"
android:minHeight="38dp"
android:minHeight="40dp"
android:gravity="center_vertical"
android:paddingStart="@dimen/spacing_medium"
android:paddingEnd="@dimen/spacing_medium"

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

@ -7,7 +7,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<FrameLayout
android:id="@+id/checkbox_background"

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

@ -8,7 +8,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/content_background">
android:background="?attr/colorContentBackground">
<FrameLayout
android:id="@+id/checkbox_background"

35
Habitica/res/navigation/navigation.xml
View file

@ -4,16 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_nav"
app:startDestination="@id/tasksFragment">
<fragment
android:id="@+id/equipmentOverviewFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment"
android:label="@string/sidebar_equipment" >
<deepLink app:uri="habitica.com/inventory/equipment" />
<action
android:id="@+id/openEquipmentDetail"
app:destination="@id/equipmentDetailFragment" />
</fragment>
<fragment
android:id="@+id/equipmentDetailFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment"
@ -44,6 +34,16 @@
<deepLink app:uri="habitica.com/tasks" />
<deepLink app:uri="habitica.com" />
</fragment>
<activity
android:id="@+id/taskFormActivity"
android:name="com.habitrpg.android.habitica.ui.activities.TaskFormActivity">
</activity>
<activity
android:id="@+id/taskSummaryActivity"
android:name="com.habitrpg.android.habitica.ui.activities.TaskSummaryActivity">
</activity>
<fragment
android:id="@+id/partyFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment"
@ -121,8 +121,8 @@
android:id="@+id/openAvatarDetail"
app:destination="@id/avatarCustomizationFragment" />
<action
android:id="@+id/openAvatarEquipment"
app:destination="@id/avatarEquipmentFragment" />
android:id="@+id/openEquipmentDetail"
app:destination="@id/equipmentDetailFragment" />
</fragment>
<fragment
android:id="@+id/itemsFragment"
@ -298,17 +298,6 @@
android:name="category"
app:argType="string" />
</fragment>
<fragment
android:id="@+id/avatarEquipmentFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment"
android:label="@string/sidebar_avatar" >
<argument
android:name="type"
app:argType="string" />
<argument
android:name="category"
app:argType="string" />
</fragment>
<activity
android:id="@+id/prefsActivity"
android:name="com.habitrpg.android.habitica.ui.activities.PrefsActivity"

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

@ -3,6 +3,8 @@
<attr name="colorPrimaryDistinct" format="color" />
<attr name="colorBadgeBackground" format="color" />
<attr name="colorContentBackground" format="color" />
<attr name="colorTintedBackground" format="color" />
<attr name="colorTintedBackgroundOffset" format="color" />
<attr name="colorContentBackgroundOffset" format="color" />
<attr name="colorWindowBackground" format="color" />
<attr name="textColorPrimary" format="color" />

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

@ -19,7 +19,7 @@
<color name="checkbox_checked_fill">#c8ffffff</color>
<color name="checkbox_checklist_fill">#23000000</color>
<color name="habit_inactive_gray">#F9F9F9</color>
<color name="habit_inactive_gray">@color/window_background</color>
<!-- buttons -->
<color name="btn_success">@color/green_10</color>

1
Habitica/res/values/strings.sidebar.xml
View file

@ -12,6 +12,7 @@
<string name="sidebar_challenges">Challenges</string>
<string name="sidebar_section_inventory">Inventory</string>
<string name="sidebar_avatar">Avatar Customization</string>
<string name="sidebar_avatar_equipment">Avatar &amp; Equipment</string>
<string name="sidebar_equipment">Equipment</string>
<string name="sidebar_stable">Pets &amp; Mounts</string>
<string name="sidebar_news">News</string>

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

@ -53,6 +53,7 @@
<string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
<string name="save_changes">Save</string>
<string name="copy">Copy</string>
<string name="title">Title</string>
<string name="notes">Notes</string>
<string name="difficulty">Difficulty</string>
<string name="tags">Tags</string>
@ -1255,6 +1256,17 @@
<string name="copy_tasks_description">Show assigned and open tasks on your personal task lists</string>
<string name="copy_shared_tasks">Copy shared tasks</string>
<string name="group_plan_settings">Group Plan Settings</string>
<string name="task_summary">Task Summary</string>
<string name="habit_summary_description">This is a **%s** Habit that is **%s**.</string>
<string name="todo_summary_description_duedate">This is a **%s** Task that is due **%s**.</string>
<string name="todo_summary_description">This is a **%s** Task that does not have a due date.</string>
<string name="daily_summary_description">This is a **%s** Task that repeats **%s**.</string>
<string name="positive_and_negative">positive and negative</string>
<string name="assigned_to">Assigned to</string>
<string name="completed_at">Completed at %s</string>
<string name="assign">Assign</string>
<string name="edit_assignees">Edit assignees</string>
<string name="assign_to">Assign to...</string>
<plurals name="you_x_others">
<item quantity="zero">You</item>
<item quantity="one">You, %d other</item>

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

@ -4,7 +4,7 @@
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
<item name="android:elevation" tools:targetApi="21">0dp</item>
<item name="android:elevation">0dp</item>
<item name="elevation">0dp</item>
<item name="android:windowContentOverlay">@null</item>
@ -26,6 +26,7 @@
<item name="colorPrimaryDistinct">@color/brand_500</item>
<item name="colorBadgeBackground">@color/brand_400</item>
<item name="taskFormTint">@color/brand_300</item>
<item name="colorSecondaryVariant">@color/brand</item>
<item name="textColorPrimary">@color/text_primary</item>
<item name="textColorSecondary">@color/text_secondary</item>
@ -36,7 +37,10 @@
<item name="barColor">@color/brand_300</item>
<item name="colorContentBackground">@color/content_background</item>
<item name="colorContentBackgroundOffset">@color/content_background_offset</item>
<item name="colorWindowBackground">@color/window_background</item>
<item name="colorTintedBackground">@color/brand_800</item>
<item name="colorTintedBackgroundOffset">@color/brand_700</item>
<item name="popupMenuStyle">@style/PopupTheme</item>
<item name="actionOverflowMenuStyle">@style/PopupTheme</item>
@ -52,8 +56,8 @@
<item name="toolbarContentColor">@color/text_primary</item>
<item name="colorPrimaryText">@color/brand_50</item>
<item name="colorBoxStroke">@color/brand_50</item>
<item name="headerBackgroundColor">@color/content_background</item>
<item name="headerOffsetColor">@color/window_background</item>
<item name="headerBackgroundColor">?attr/colorContentBackground</item>
<item name="headerOffsetColor">?attr/colorWindowBackground</item>
<item name="headerTextColor">@color/text_primary</item>
</style>
@ -92,6 +96,8 @@
<item name="taskFormTint">@color/red_50</item>
<item name="toolbarContentColor">@color/red_1</item>
<item name="colorPrimaryText">@color/red_1</item>
<item name="colorTintedBackground">@color/red_700</item>
<item name="colorTintedBackgroundOffset">@color/red_600</item>
</style>
<style name="MainAppTheme.Red.Dark">
@ -100,6 +106,8 @@
<item name="colorBoxStroke">@color/red_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/red_100</item>
<item name="colorTintedBackground">@color/red_1</item>
<item name="colorTintedBackgroundOffset">@color/red_5</item>
</style>
<style name="MainAppTheme.Maroon">
@ -119,6 +127,8 @@
<item name="barColor">@color/red_1</item>
<item name="taskFormTint">@color/maroon_50</item>
<item name="colorPrimaryText">@color/maroon_1</item>
<item name="colorTintedBackground">@color/maroon_700</item>
<item name="colorTintedBackgroundOffset">@color/maroon_600</item>
</style>
<style name="MainAppTheme.Maroon.Dark">
@ -126,6 +136,8 @@
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/maroon_100</item>
<item name="colorTintedBackground">@color/maroon_1</item>
<item name="colorTintedBackgroundOffset">@color/maroon_5</item>
</style>
<style name="MainAppTheme.Orange">
@ -146,6 +158,8 @@
<item name="taskFormTint">@color/orange_50</item>
<item name="toolbarContentColor">@color/orange_1</item>
<item name="colorPrimaryText">@color/orange_1</item>
<item name="colorTintedBackground">@color/orange_700</item>
<item name="colorTintedBackgroundOffset">@color/orange_600</item>
</style>
<style name="MainAppTheme.Orange.Dark">
@ -154,6 +168,8 @@
<item name="colorBoxStroke">@color/orange_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/orange_100</item>
<item name="colorTintedBackground">@color/orange_1</item>
<item name="colorTintedBackgroundOffset">@color/orange_5</item>
</style>
<style name="MainAppTheme.Yellow">
@ -174,6 +190,8 @@
<item name="taskFormTint">@color/yellow_10</item>
<item name="toolbarContentColor">@color/yellow_1</item>
<item name="colorPrimaryText">@color/yellow_1</item>
<item name="colorTintedBackground">@color/yellow_700</item>
<item name="colorTintedBackgroundOffset">@color/yellow_600</item>
</style>
<style name="MainAppTheme.Yellow.Dark">
@ -182,6 +200,7 @@
<item name="colorBoxStroke">@color/yellow_5</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/yellow_100</item>
<item name="colorTintedBackground">@color/yellow_5</item>
</style>
<style name="MainAppTheme.Green">
@ -202,6 +221,8 @@
<item name="taskFormTint">@color/green_50</item>
<item name="toolbarContentColor">@color/green_1</item>
<item name="colorPrimaryText">@color/green_1</item>
<item name="colorTintedBackground">@color/green_700</item>
<item name="colorTintedBackgroundOffset">@color/green_600</item>
</style>
<style name="MainAppTheme.Green.Dark">
@ -210,6 +231,8 @@
<item name="colorBoxStroke">@color/green_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/green_100</item>
<item name="colorTintedBackground">@color/green_1</item>
<item name="colorTintedBackgroundOffset">@color/green_5</item>
</style>
<style name="MainAppTheme.Teal">
@ -230,6 +253,8 @@
<item name="taskFormTint">@color/teal_50</item>
<item name="toolbarContentColor">@color/teal_1</item>
<item name="colorPrimaryText">@color/teal_1</item>
<item name="colorTintedBackground">@color/teal_700</item>
<item name="colorTintedBackgroundOffset">@color/teal_600</item>
</style>
<style name="MainAppTheme.Teal.Dark">
@ -238,6 +263,8 @@
<item name="colorBoxStroke">@color/teal_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/teal_100</item>
<item name="colorTintedBackground">@color/teal_1</item>
<item name="colorTintedBackgroundOffset">@color/teal_5</item>
</style>
<style name="MainAppTheme.Blue">
@ -258,6 +285,8 @@
<item name="taskFormTint">@color/blue_50</item>
<item name="toolbarContentColor">@color/blue_1</item>
<item name="colorPrimaryText">@color/blue_1</item>
<item name="colorTintedBackground">@color/blue_700</item>
<item name="colorTintedBackgroundOffset">@color/blue_600</item>
</style>
<style name="MainAppTheme.Blue.Dark">
@ -266,6 +295,8 @@
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="colorBoxStroke">@color/blue_10</item>
<item name="toolbarContentColor">@color/blue_100</item>
<item name="colorTintedBackground">@color/blue_1</item>
<item name="colorTintedBackgroundOffset">@color/blue_5</item>
</style>
<style name="MyWidgetTheme">
@ -281,7 +312,7 @@
<style name="PopupTheme" parent="Widget.AppCompat.PopupMenu.Overflow">
<item name="android:popupBackground">@color/content_background</item>
<item name="android:popupBackground">?attr/colorContentBackground</item>
</style>
<style name="CardText">
@ -565,7 +596,7 @@
</style>
<style name="HabiticaButton.Content" parent="HabiticaButton">
<item name="android:backgroundTint">@color/content_background</item>
<item name="android:backgroundTint">?attr/colorContentBackground</item>
<item name="android:textColor">@color/text_primary</item>
</style>
@ -678,7 +709,7 @@
</style>
<style name="HabiticaButton.Gray" parent="HabiticaButton">
<item name="android:backgroundTint">@color/window_background</item>
<item name="android:backgroundTint">?attr/colorWindowBackground</item>
<item name="android:textColor">@color/text_brand_neon</item>
</style>
@ -851,18 +882,18 @@
<style name="TaskFormSectionheader">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textColor">?colorPrimaryDark</item>
<item name="android:layout_marginTop">@dimen/spacing_large</item>
<item name="android:layout_marginBottom">@dimen/spacing_medium</item>
<item name="android:accessibilityHeading">true</item>
</style>
<style name="TaskFormToggle">
<item name="android:background">@drawable/layout_rounded_bg_content</item>
<item name="android:background">@drawable/layout_rounded_bg_tinted</item>
<item name="android:gravity">center</item>
<item name="android:paddingTop">@dimen/spacing_small</item>
<item name="android:paddingBottom">@dimen/spacing_small</item>
<item name="android:height">28dp</item>
<item name="android:height">48dp</item>
</style>
<style name="TaskFormWeekdayButton">
@ -945,8 +976,8 @@
</style>
<style name="Widget.App.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
<item name="android:backgroundTint">@color/window_background</item>
<item name="backgroundTint">@color/window_background</item>
<item name="android:backgroundTint">?attr/colorWindowBackground</item>
<item name="backgroundTint">?attr/colorWindowBackground</item>
<item name="android:background">@drawable/bottom_sheet_background</item>
<item name="shapeAppearanceOverlay">@null</item>
<item name="shapeAppearance">@null</item>

8
Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
View file

@ -162,7 +162,7 @@ class TaskFormActivityTest : ActivityTestCase() {
device.activities.isCurrent(TaskFormActivity::class.java)
textEditText.typeText("New Habit")
KButton { withId(R.id.action_save) }.click()
verify(exactly = 1) { taskRepository.createTaskInBackground(any()) }
verify(exactly = 1) { taskRepository.createTaskInBackground(any(), assignChanges) }
}
}
@ -184,7 +184,7 @@ class TaskFormActivityTest : ActivityTestCase() {
screen {
toolbar {
KView { withId(R.id.action_save) }.click()
verify(exactly = 1) { taskRepository.updateTaskInBackground(any()) }
verify(exactly = 1) { taskRepository.updateTaskInBackground(any(), assignChanges) }
}
}
}
@ -288,7 +288,7 @@ class TaskFormActivityTest : ActivityTestCase() {
bundle.putString(TaskFormActivity.TASK_TYPE_KEY, TaskType.DAILY.value)
bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id!!)
every { taskRepository.getUnmanagedTask(any()) } returns Flowable.just(task)
justRun { taskRepository.updateTaskInBackground(capture(taskSlot)) }
justRun { taskRepository.updateTaskInBackground(capture(taskSlot), assignChanges) }
val intent = Intent(ApplicationProvider.getApplicationContext(), TaskFormActivity::class.java)
intent.putExtras(bundle)
@ -313,7 +313,7 @@ class TaskFormActivityTest : ActivityTestCase() {
typeText("3")
}
KButton { withId(R.id.action_save) }.click()
verify { taskRepository.updateTaskInBackground(any()) }
verify { taskRepository.updateTaskInBackground(any(), assignChanges) }
assert(taskSlot.captured.everyX == 3)
assert(taskSlot.captured.frequency == Frequency.WEEKLY)
}

8
Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
View file

@ -134,7 +134,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
@Test
fun canHatchPetWithEggs() {
val slot = CapturingSlot<HatchPetUseCase.RequestValues>()
every { hatchPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
every { hatchPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
fragment.itemType = "eggs"
launchFragment()
screen {
@ -142,7 +142,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
childWith<ItemItem> { withDescendant { withText("Wolf") } }.click()
KView { withText(R.string.hatch_with_potion) }.click()
KView { withText("Shade") }.click()
verify { hatchPetUseCase.observable(any()) }
verify { hatchPetUseCase.callInteractor(any()) }
slot.captured.egg.key shouldBe "Wolf"
slot.captured.potion.key shouldBe "Shade"
}
@ -152,7 +152,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
@Test
fun canHatchPetWithPotions() {
val slot = CapturingSlot<HatchPetUseCase.RequestValues>()
every { hatchPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
every { hatchPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
fragment.itemType = "hatchingPotions"
launchFragment()
screen {
@ -160,7 +160,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
childWith<ItemItem> { withDescendant { withText("Shade") } }.click()
KView { withText(R.string.hatch_egg) }.click()
KView { withText("Wolf") }.click()
verify { hatchPetUseCase.observable(any()) }
verify { hatchPetUseCase.callInteractor(any()) }
slot.captured.egg.key shouldBe "Wolf"
slot.captured.potion.key shouldBe "Shade"
}

8
Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
View file

@ -69,7 +69,7 @@ internal class PetDetailRecyclerFragmentTest :
@Test
fun canFeedPet() {
val slot = CapturingSlot<FeedPetUseCase.RequestValues>()
every { feedPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
every { feedPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
every {
inventoryRepository.getPets(
any(),
@ -92,7 +92,7 @@ internal class PetDetailRecyclerFragmentTest :
childWith<PetItem> { withContentDescription("Skeleton Cactus") }.click()
KView { withText(R.string.feed) }.click()
KView { withText("Meat") }.click()
verify { feedPetUseCase.observable(any()) }
verify { feedPetUseCase.callInteractor(any()) }
slot.captured.pet.key shouldBe "Cactus-Skeleton"
slot.captured.food.key shouldBe "Meat"
}
@ -102,7 +102,7 @@ internal class PetDetailRecyclerFragmentTest :
@Test
fun canUseSaddle() {
val slot = CapturingSlot<FeedPetUseCase.RequestValues>()
every { feedPetUseCase.observable(capture(slot)) } returns mockk(relaxed = true)
every { feedPetUseCase.callInteractor(capture(slot)) } returns mockk(relaxed = true)
every {
inventoryRepository.getPets(
any(),
@ -122,7 +122,7 @@ internal class PetDetailRecyclerFragmentTest :
recycler {
childWith<PetItem> { withContentDescription("Shade Fox") }.click()
KView { withText(R.string.use_saddle) }.click()
verify { feedPetUseCase.observable(any()) }
verify { feedPetUseCase.callInteractor(any()) }
slot.captured.pet.key shouldBe "Fox-Shade"
slot.captured.food.key shouldBe "Saddle"
}

9
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
View file

@ -18,8 +18,6 @@ import android.util.Log
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import com.amplitude.api.Amplitude
import com.amplitude.api.Identify
import com.google.android.gms.wearable.Wearable
import com.google.firebase.analytics.FirebaseAnalytics
import com.google.firebase.installations.FirebaseInstallations
@ -29,6 +27,7 @@ import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.helpers.AdHandler
import com.habitrpg.android.habitica.helpers.AmplitudeManager
import com.habitrpg.android.habitica.helpers.ExceptionHandler
import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
import com.habitrpg.android.habitica.modules.UserModule
@ -76,11 +75,7 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
if (!BuildConfig.DEBUG) {
try {
Amplitude.getInstance().initialize(this, getString(R.string.amplitude_app_id)).enableForegroundTracking(this)
val identify = Identify()
.setOnce("androidStore", BuildConfig.STORE)
.set("launch_screen", sharedPrefs.getString("launch_screen", ""))
Amplitude.getInstance().identify(identify)
AmplitudeManager.initialize(this, sharedPrefs)
} catch (ignored: Resources.NotFoundException) {
}
}

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