From 77ba41105c83637f05a5ffd8a3f46a270fafd530 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 22 Aug 2023 16:40:55 +0200 Subject: [PATCH] update description --- Habitica/build.gradle | 1 + build.gradle | 4 +- .../android/en-US/full_description.txt | 46 ++++++++++--------- version.properties | 2 +- wearos/build.gradle | 3 +- .../wearos/habitica/MainApplication.kt | 4 +- .../wearos/habitica/ui/views/AddTaskButton.kt | 4 +- .../habitica/ui/views/CircularProgressView.kt | 4 +- .../ui/views/HabitDirectionPickerButton.kt | 3 +- .../ui/views/IndeterminateProgressView.kt | 3 +- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index d3295a516..8caa59ce3 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -142,6 +142,7 @@ android { defaultConfig { minSdkVersion min_sdk + compileSdk 34 applicationId "com.habitrpg.android.habitica" vectorDrawables.useSupportLibrary = true buildConfigField "String", "STORE", "\"google\"" diff --git a/build.gradle b/build.gradle index 5c0337d41..a953ae0f5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { ext { min_sdk = 21 - target_sdk = 34 + target_sdk = 33 app_version_name = '' app_version_code = 0 @@ -24,7 +24,7 @@ buildscript { lifecycle_version = '2.6.1' markwon_version = '4.6.2' mockk_version = '1.13.4' - moshi_version = '1.14.0' + moshi_version = '1.15.0' navigation_version = '2.7.0' okhttp_version = '4.11.0' paging_version = '3.2.0' diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index f716419f5..017b52fe7 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -5,30 +5,34 @@ How it works: Create an avatar then add tasks, chores, or goals you’d like to work on. When you do something in real life, check it off in the app and receive gold, experience, and items that can be used in-game! Features: -• Automatically repeating tasks scheduled for your daily, weekly, or monthly routines -• Flexible habit tracker for tasks you want to do multiple times a day or only once in awhile -• Traditional to do list for tasks that only need to be done once -• Color coded tasks and streak counters help you see how you’re doing at a glance -• Leveling system to visualize your overall progress -• Tons of collectable gear and pets to suit your personal style -• Inclusive avatar customizations: wheelchairs, hair styles, skin tones, and more -• Regular content releases and seasonal events to keep things fresh -• Parties let you team up with friends for extra accountability and battle fierce foes by completing tasks -• Challenges offer shared task lists you can add to your personal tasks -• Guilds let you connect with others that share your interests and goals -• Reminders and widgets to help keep you on track -• Customizable color themes with dark and light mode -• Syncing across devices + • Automatically repeating tasks scheduled for your daily, weekly, or monthly routines + • Flexible habit tracker for tasks you want to do multiple times a day or only once in awhile + • Traditional to do list for tasks that only need to be done once + • Color coded tasks and streak counters help you see how you’re doing at a glance + • Leveling system to visualize your overall progress + • Tons of collectable gear and pets to suit your personal style + • Inclusive avatar customizations: wheelchairs, hair styles, skin tones, and more + • Regular content releases and seasonal events to keep things fresh + • Parties let you team up with friends for extra accountability and battle fierce foes by completing tasks + • Challenges offer shared task lists you can add to your personal tasks + • Reminders and widgets to help keep you on track + • Customizable color themes with dark and light mode + • Syncing across devices + Want even more flexibility to take your tasks on the go? We have a Wear OS app on the watch! + Wear OS features: -• View, create, and complete Habites, Dailies, and To do’s -• Receive rewards for your efforts with experience, food, eggs, and potions -• Track your stats with dynamic progress bars -• Show off your stunning pixel avatar on the watch face + • View, create, and complete Habits, Dailies, and To do’s + • Receive rewards for your efforts with experience, food, eggs, and potions + • Track your stats with dynamic progress bars + • Show off your stunning pixel avatar on the watch face + — -Habitica is an open-source app run by a small team that’s made better by the work of volunteers who contribute pixel art, translations, bug fixes, and more. If you’d like to contribute, reach out! -Community, privacy, and transparency are important to us. Your tasks are private and we don’t sell your personal data to third parties. -If you have any questions, feel free to send feedback to admin@habitica.com! And if you enjoy our app, we would really appreciate it if you would leave us a review. \ No newline at end of file + +Run by a small team, Habitica is an open-source app made better by contributors who create translations, bug fixes, and more. If you’d like to contribute, you can check out our GitHub or reach out for more information! +We highly value community, privacy, and transparency. Rest assured, your tasks remain private and we never sell your personal data to third parties. +Questions or feedback? Feel free to reach us at admin@habitica.com! If you’re enjoying Habitica, we’d be thrilled if you leave us a review. +Start your journey towards productivity, download Habitica now! diff --git a/version.properties b/version.properties index 64b8078eb..4d634d6de 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.2.5 -CODE=6341 \ No newline at end of file +CODE=6361 \ No newline at end of file diff --git a/wearos/build.gradle b/wearos/build.gradle index 00716c281..fd4ce7cae 100644 --- a/wearos/build.gradle +++ b/wearos/build.gradle @@ -22,6 +22,7 @@ android { applicationId "com.habitrpg.android.habitica" minSdk 26 targetSdk target_sdk + compileSdk 34 versionCode app_version_code + 1 versionName app_version_name buildConfigField "String", "TESTING_LEVEL", "\"production\"" @@ -113,7 +114,7 @@ dependencies { implementation "androidx.core:core-ktx:$core_ktx_version" implementation "com.google.android.gms:play-services-wearable:$play_wearables_version" implementation "androidx.recyclerview:recyclerview:$recyclerview_version" - implementation 'androidx.wear:wear:1.2.0' + implementation 'androidx.wear:wear:1.3.0' implementation "androidx.wear:wear-input:1.1.0" //Networking diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt index 2ffc9babf..5ff8c9f32 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt @@ -8,7 +8,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.habitrpg.android.habitica.BuildConfig import com.habitrpg.common.habitica.extensions.setupCoil -import com.habitrpg.android.habitica.helpers.MarkdownParser +import com.habitrpg.common.habitica.helpers.MarkdownParser import com.habitrpg.wearos.habitica.data.repositories.TaskRepository import com.habitrpg.wearos.habitica.data.repositories.UserRepository import com.habitrpg.wearos.habitica.ui.activities.BaseActivity @@ -36,7 +36,7 @@ class MainApplication : Application() { override fun onCreate() { super.onCreate() - com.habitrpg.android.habitica.helpers.MarkdownParser.setup(this) + MarkdownParser.setup(this) setupCoil() setupFirebase() diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt index 7c63f8adb..9b7114056 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt @@ -61,10 +61,8 @@ class AddTaskButton @JvmOverloads constructor( invalidate() } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - - if (canvas == null) return path.reset() path.addArc(rect, 180f, 360f) canvas.drawPath(path, fillPaint) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt index 4f79f3f64..df3df1872 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt @@ -51,9 +51,9 @@ class CircularProgressView( strokeCap = Paint.Cap.ROUND } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { setSpace() - canvas?.let { + canvas.let { drawBackgroundArc(it) drawInnerArc(it) } diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt index 4f796b7b5..387ecf469 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt @@ -68,10 +68,9 @@ class HabitDirectionPickerButton @JvmOverloads constructor( invalidate() } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - if (canvas == null) return path.reset() if (drawFromTop) { path.addArc(rect, 0f, 180f) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt index d8f8e16f6..444278237 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt @@ -86,9 +86,8 @@ class IndeterminateProgressView @JvmOverloads constructor( } } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - if (canvas == null) return val halfBar = paint.strokeWidth / 2f if (isCircular) { canvas.drawArc(halfBar, halfBar, width.toFloat() - halfBar, height.toFloat() - halfBar, currentAngle, 360f, false, paint)