From 9062b039eaa5444e1066fcf94a957c38e40b61d9 Mon Sep 17 00:00:00 2001 From: Patti85 Date: Wed, 19 Aug 2020 11:53:58 +0200 Subject: [PATCH 01/25] no new guidelines hint when going to landscape --- Habitica/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 6bbf318fd..a36049ec9 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -32,7 +32,8 @@ android:name=".ui.activities.MainActivity" android:label="@string/app_name" android:theme="@style/LaunchAppTheme" - android:windowSoftInputMode="stateHidden|adjustResize"> + android:windowSoftInputMode="stateHidden|adjustResize" + android:configChanges="orientation|screenSize"> @@ -46,6 +47,7 @@ android:host="habitica.com" android:pathPattern="/"/> + Date: Tue, 25 Aug 2020 13:21:18 +0200 Subject: [PATCH 02/25] Improve status bar handling with drawer --- .../habitica/ui/activities/MainActivity.kt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 6afef229a..e06e2be3e 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -21,6 +21,7 @@ import android.widget.TextView import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.content.FileProvider import androidx.core.content.edit +import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProviders import androidx.navigation.NavController import androidx.navigation.NavDestination @@ -38,6 +39,7 @@ import com.habitrpg.android.habitica.databinding.ActivityMainBinding import com.habitrpg.android.habitica.events.* import com.habitrpg.android.habitica.events.commands.FeedCommand import com.habitrpg.android.habitica.extensions.dpToPx +import com.habitrpg.android.habitica.extensions.getThemeColor import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.helpers.* import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager @@ -208,6 +210,37 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { drawerToggle?.drawerArrowDrawable = drawerIcon // Set the drawer toggle as the DrawerListener drawerToggle?.let { drawerLayout.addDrawerListener(it) } + drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener { + private var isOpeningDrawer: Boolean? = null + + override fun onDrawerSlide(drawerView: View, slideOffset: Float) { + val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true) + if (modernHeaderStyle && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (slideOffset < 0.1f && isOpeningDrawer == null) { + window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark) + window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE + isOpeningDrawer = true + } else if (slideOffset > 0.9f && isOpeningDrawer == null) { + window.statusBarColor = getThemeColor(R.attr.headerBackgroundColor) + window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + isOpeningDrawer = false + } + } + } + + override fun onDrawerOpened(drawerView: View) { + isOpeningDrawer = null + } + + override fun onDrawerClosed(drawerView: View) { + isOpeningDrawer = null + } + + override fun onDrawerStateChanged(newState: Int) { + + } + + }) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setHomeButtonEnabled(true) From e19f7222c2f68e484ae5f825e4565e10e5ac66b8 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 25 Aug 2020 13:21:27 +0200 Subject: [PATCH 03/25] Begin implementing new task design --- Habitica/build.gradle | 4 +- Habitica/res/drawable-hdpi/habit_minus.webp | Bin 294 -> 0 bytes .../drawable-hdpi/habit_minus_disabled.webp | Bin 328 -> 0 bytes .../res/drawable-hdpi/habit_minus_yellow.webp | Bin 338 -> 0 bytes Habitica/res/drawable-hdpi/habit_plus.webp | Bin 312 -> 0 bytes .../drawable-hdpi/habit_plus_disabled.webp | Bin 342 -> 0 bytes .../res/drawable-hdpi/habit_plus_yellow.webp | Bin 358 -> 0 bytes Habitica/res/drawable-mdpi/habit_minus.png | Bin 0 -> 96 bytes Habitica/res/drawable-mdpi/habit_minus.webp | Bin 204 -> 0 bytes .../drawable-mdpi/habit_minus_disabled.webp | Bin 212 -> 0 bytes .../res/drawable-mdpi/habit_minus_yellow.webp | Bin 246 -> 0 bytes Habitica/res/drawable-mdpi/habit_plus.webp | Bin 206 -> 0 bytes .../drawable-mdpi/habit_plus_disabled.webp | Bin 214 -> 0 bytes .../res/drawable-mdpi/habit_plus_yellow.webp | Bin 248 -> 0 bytes Habitica/res/drawable-xhdpi/habit_minus.png | Bin 0 -> 127 bytes Habitica/res/drawable-xhdpi/habit_minus.webp | Bin 344 -> 0 bytes .../drawable-xhdpi/habit_minus_disabled.webp | Bin 426 -> 0 bytes .../drawable-xhdpi/habit_minus_yellow.webp | Bin 410 -> 0 bytes Habitica/res/drawable-xhdpi/habit_plus.png | Bin 0 -> 228 bytes Habitica/res/drawable-xhdpi/habit_plus.webp | Bin 372 -> 0 bytes .../drawable-xhdpi/habit_plus_disabled.webp | Bin 446 -> 0 bytes .../res/drawable-xhdpi/habit_plus_yellow.webp | Bin 432 -> 0 bytes Habitica/res/drawable-xxhdpi/habit_minus.png | Bin 0 -> 153 bytes Habitica/res/drawable-xxhdpi/habit_minus.webp | Bin 494 -> 0 bytes .../drawable-xxhdpi/habit_minus_disabled.webp | Bin 678 -> 0 bytes .../drawable-xxhdpi/habit_minus_yellow.webp | Bin 628 -> 0 bytes Habitica/res/drawable-xxhdpi/habit_plus.png | Bin 0 -> 304 bytes Habitica/res/drawable-xxhdpi/habit_plus.webp | Bin 530 -> 0 bytes .../drawable-xxhdpi/habit_plus_disabled.webp | Bin 710 -> 0 bytes .../drawable-xxhdpi/habit_plus_yellow.webp | Bin 668 -> 0 bytes Habitica/res/drawable/habit_circle.xml | 6 + .../res/drawable/habit_circle_disabled.xml | 6 + Habitica/res/drawable/task_background.xml | 5 + Habitica/res/layout/activity_main.xml | 14 +- Habitica/res/layout/avatar_with_bars.xml | 9 +- Habitica/res/layout/checklist_indicator.xml | 37 +++ Habitica/res/layout/daily_item_card.xml | 257 ++++-------------- .../res/layout/dialog_yesterdaily_task.xml | 15 +- Habitica/res/layout/habit_item_card.xml | 150 +--------- Habitica/res/layout/reward_item_card.xml | 72 +---- Habitica/res/layout/task_main_content.xml | 108 ++++++++ Habitica/res/layout/todo_item_card.xml | 254 ++++------------- Habitica/res/values/attrs.xml | 3 + Habitica/res/values/dimens.xml | 20 +- Habitica/res/values/styles.xml | 18 +- .../android/habitica/models/tasks/Task.kt | 4 +- .../habitica/ui/activities/BaseActivity.kt | 11 +- .../tasks/RewardsRecyclerViewAdapter.kt | 2 +- .../inventory/shops/ShopsFragment.kt | 4 +- .../ui/fragments/tasks/TasksFragment.kt | 6 + .../viewHolders/tasks/BaseTaskViewHolder.kt | 10 +- .../tasks/ChecklistedViewHolder.kt | 9 - .../ui/viewHolders/tasks/HabitViewHolder.kt | 40 ++- .../ui/viewHolders/tasks/RewardViewHolder.kt | 9 +- .../android/habitica/ui/views/CurrencyView.kt | 2 +- .../views/yesterdailies/YesterdailyDialog.kt | 4 +- build.gradle | 2 +- 57 files changed, 397 insertions(+), 684 deletions(-) delete mode 100644 Habitica/res/drawable-hdpi/habit_minus.webp delete mode 100644 Habitica/res/drawable-hdpi/habit_minus_disabled.webp delete mode 100644 Habitica/res/drawable-hdpi/habit_minus_yellow.webp delete mode 100644 Habitica/res/drawable-hdpi/habit_plus.webp delete mode 100644 Habitica/res/drawable-hdpi/habit_plus_disabled.webp delete mode 100644 Habitica/res/drawable-hdpi/habit_plus_yellow.webp create mode 100644 Habitica/res/drawable-mdpi/habit_minus.png delete mode 100644 Habitica/res/drawable-mdpi/habit_minus.webp delete mode 100644 Habitica/res/drawable-mdpi/habit_minus_disabled.webp delete mode 100644 Habitica/res/drawable-mdpi/habit_minus_yellow.webp delete mode 100644 Habitica/res/drawable-mdpi/habit_plus.webp delete mode 100644 Habitica/res/drawable-mdpi/habit_plus_disabled.webp delete mode 100644 Habitica/res/drawable-mdpi/habit_plus_yellow.webp create mode 100644 Habitica/res/drawable-xhdpi/habit_minus.png delete mode 100644 Habitica/res/drawable-xhdpi/habit_minus.webp delete mode 100644 Habitica/res/drawable-xhdpi/habit_minus_disabled.webp delete mode 100644 Habitica/res/drawable-xhdpi/habit_minus_yellow.webp create mode 100644 Habitica/res/drawable-xhdpi/habit_plus.png delete mode 100644 Habitica/res/drawable-xhdpi/habit_plus.webp delete mode 100644 Habitica/res/drawable-xhdpi/habit_plus_disabled.webp delete mode 100644 Habitica/res/drawable-xhdpi/habit_plus_yellow.webp create mode 100644 Habitica/res/drawable-xxhdpi/habit_minus.png delete mode 100644 Habitica/res/drawable-xxhdpi/habit_minus.webp delete mode 100644 Habitica/res/drawable-xxhdpi/habit_minus_disabled.webp delete mode 100644 Habitica/res/drawable-xxhdpi/habit_minus_yellow.webp create mode 100644 Habitica/res/drawable-xxhdpi/habit_plus.png delete mode 100644 Habitica/res/drawable-xxhdpi/habit_plus.webp delete mode 100644 Habitica/res/drawable-xxhdpi/habit_plus_disabled.webp delete mode 100644 Habitica/res/drawable-xxhdpi/habit_plus_yellow.webp create mode 100644 Habitica/res/drawable/habit_circle.xml create mode 100644 Habitica/res/drawable/habit_circle_disabled.xml create mode 100644 Habitica/res/drawable/task_background.xml create mode 100644 Habitica/res/layout/checklist_indicator.xml create mode 100644 Habitica/res/layout/task_main_content.xml diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 52c787764..d0a530e0d 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -18,7 +18,7 @@ buildscript { } dependencies { classpath 'io.fabric.tools:gradle:1.+' - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.0.1' classpath('com.noveogroup.android:check:1.2.5') { exclude module: 'checkstyle' exclude module: 'pmd-java' @@ -162,7 +162,7 @@ android { multiDexEnabled true resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2509 + versionCode 2514 versionName "2.8" } diff --git a/Habitica/res/drawable-hdpi/habit_minus.webp b/Habitica/res/drawable-hdpi/habit_minus.webp deleted file mode 100644 index c184aad6b8ed41aa2697c4a3434b848ba9bacae1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmV+>0ondiNk&E<0RRA3MM6+kP&iBy0RR9mFTe{BpFo&xRDZ|)&*C)5q;2BgWB<7r znY2y(d+a|KL(sNu<_!O6oymCw1^}=K0YX?n2mt>7ZC5=wY}?3@ygBd8-}hhbrCnbG z5&dW2wvnP__n2X3-hg*aC~b(Uj8=ldt~OTDN2Nx)HI+pdl)OA)($qy~T06Asx?y(< z-A~jZ#ahXA10Ij8$|6tYW@K>z>% diff --git a/Habitica/res/drawable-hdpi/habit_minus_disabled.webp b/Habitica/res/drawable-hdpi/habit_minus_disabled.webp deleted file mode 100644 index 3398ab376a086081c11edaeba06b0595ab0e3a07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmV-O0k{5ANk&FM0RRA3MM6+kP&iC80RR9mFTe{BuK*B)|85Zx0)i4r3NYCQFaU>< zZ8g;evjXDd-Tr(1!EkLLqW=usHc~WMX1JT#H{hBurQMu#+tU>Al(-b9Tg@ruYECap ze3aUpmd2CKgfSU?yPXJYW9hF~(-*e&-q78_I^Y&V<A--GH?SB zy+B6sPqeVtNzdie)F8wPf+wXU4--eFjGU4Or36pAL5l5GwNlOV=`zOc7U$=ho##C_ z-eNmlSfXC^8GRG|K>F`Q{~hYTbNzp${Z9ujctH>7^~?);Os^+j(8GE?54|0M-cCVp a2cfsK(A#n7-wA;H9Rfi9&iV5E9R&cmS)ITD diff --git a/Habitica/res/drawable-hdpi/habit_minus_yellow.webp b/Habitica/res/drawable-hdpi/habit_minus_yellow.webp deleted file mode 100644 index 40dbf6560a6c9d43c54d87b7aac6dfdf5a3f37fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmV-Y0j>U0Nk&FW0RRA3MM6+kP&iCJ0RR9mFTe{B*I=fNlzSX7;a>#Wn8?|fe+G>t zDe6Nx4DVmiYiKqB0Hnd;a+d(aq{t%fbqfIOznWD&PyO-RXNO712n6)di6M@#BWPg& zgA|BhLm+Z3%(9l2pYZ`Wh$Kmo`j~N!{X4z?g*pQf{b%GhlA>gm;neg7`OT}YpXPm^ zr@pIl#hNz5W=^-ENn_5kcCi4LHVZww&cgyd&MRmuMvHJP0=Dw7D38*+)vHCi*1pXE z-K$&)R@cMgFvR2kXV++uKI=q kKd8feofqFn#P=!jeNcR#72n6j&j}Jfhe*QboY(j{3UHUGK>z>% diff --git a/Habitica/res/drawable-hdpi/habit_plus.webp b/Habitica/res/drawable-hdpi/habit_plus.webp deleted file mode 100644 index af314d511593ca3efd4373fe56c691d2de782046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muGQNk&F60RRA3MM6+kP&iB^0RR9mFTe{Br$8nQvHlsQaQW0A6NXs-j8eFK z$b=!*Kcf^b9|UdNX3qH2`jDJQU;qG%5FmsFgaF|G-*#I}nnnv-tlHUvCnoDQd3+P7^_=JaEV zkB%0nZGAzR&~HXxZXbj>^JweRv+?vPryVD}PzUsN=7l<@ ouahs-VSSy4zK=lPr=ahH(DzyB`#AJ-0wAA50LbT@FQ3m*0L59Q0ssI2 diff --git a/Habitica/res/drawable-hdpi/habit_plus_yellow.webp b/Habitica/res/drawable-hdpi/habit_plus_yellow.webp deleted file mode 100644 index eb325b5019053f9840c25b93b544e3dcb789da06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#_%Nk&Fq0RRA3MM6+kP&iCc0RR9mFTe{B-=MZ_8%a)={inRQyzZbi=3hbE zHd4wTS$T}ayN;ccVX;#vChghTiU1!q{q zCBE=PqDX*424wIeR6d0p3>ryNG|$Yi2mXaV@68*C=syFujT9xj#|$&`27H@0!?>*0 zuFE(yIYKSF$;hi_>dKI*qTfW}))(5T%sWx)e5UHvECJ4yqSsD>boFO%cL{WFzq$~7 zZ}rY#e_L5Oq3E6m%Vr@tXLr2N^tWC(9&*R|N2>`tg0YI;FF2n06 E0JZ3-U;qFB diff --git a/Habitica/res/drawable-mdpi/habit_minus.png b/Habitica/res/drawable-mdpi/habit_minus.png new file mode 100644 index 0000000000000000000000000000000000000000..9bcc01f9798f768be527132c8c3c4a3c704e71d2 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CE!3HFA>TRb3DVB6cUq=Rpjs4tz5?O(KaZeY= s5DwYoAOHXV4^vPR%SlaA;QhnSFj>yPE_a&pFQ5_zPgg&ebxsLQ0IE0_oB#j- literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/habit_minus.webp b/Habitica/res/drawable-mdpi/habit_minus.webp deleted file mode 100644 index 00f38ae65fcc5ba89e685f5f4676159546b3da5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmV;-05ktmNk&G*00012MM6+kP&iDu0000lAHW9?Z!rJ!KmQ8SHemMso1BjTKnQ{{ z2mv7w1b;Zq_D?|$oxq*M5Hz}Xcg-a4Yygew(V}z52C&T8??#B|KLfXI8%f=}y?X@_ zCWohG+eK7slyR?dCFZ5bgIkKR7gJnV1#6};A@Yxo4bSFGtB;Voo&t$cJy&am0i8!g z@P;6K3siNSwF G^#2)OHeR3r diff --git a/Habitica/res/drawable-mdpi/habit_minus_disabled.webp b/Habitica/res/drawable-mdpi/habit_minus_disabled.webp deleted file mode 100644 index 74a4c05ba337992eaec8f62b963729fc2672a5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmV;_04x7eNk&G@00012MM6+kP&iD#0000lAHW9?p8ybq|7{Zy1d_J!?r9V_NJ0P@ zG?Jufj+yrTyQQ615Yc}HZrdmw?-(C}7c!~OEwX1%1`2XrW{KWfAIp^PzC6>Uxz|ZH zY34n<#^*%cSZ^~4r$RyXgy$SjhKlmJyJl4=sjgdtHlU`_061}4?@_lm5Y#%1I0jBk znxJT=UO1FKBZoM*=is+k-0Aut+{p?LKH#hH9r5SFpDTYaez;fsz5L-`^X~%uy8{0% O!M|&O{ucnK{}liUu3}sO diff --git a/Habitica/res/drawable-mdpi/habit_minus_yellow.webp b/Habitica/res/drawable-mdpi/habit_minus_yellow.webp deleted file mode 100644 index 50f9af409b8132b6d5ec091c827b35df4c913123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmVVaF7$1bcQ?$_L@tM=x zN>ngtBuUX8Gwhvzv-JP-3L^T?z-=Q%$ub{4f*u?-N3WERxeof^OokscX}*-M w`BK4Xyn+wG7pf=~f3Em@@xyzCzn4F}*Z6nw!*@macS-nnO$7fJmY@GC05gYqw*UYD diff --git a/Habitica/res/drawable-mdpi/habit_plus.webp b/Habitica/res/drawable-mdpi/habit_plus.webp deleted file mode 100644 index 0bcec4fa53c934aaf2711c9de530fda84163ccfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmV;<05ShkNk&G-00012MM6+kP&iDw0000lAHW9?Z!rJ!KmQ8SHemMso1BjTKnQ{{ z2mv7w1b;Zq_D?|$oxq*M5Hz}Xcg-a4Yygew(V}z52C&T8??#B|KLfXI8%f=}y?X@_ zCWohG+eK7slyR?dCFZ5bgIkKR7gJnV1#6};A@Yxo4bSFGtB;Voo&t$cJy&amN&dd_ z2F@cQctfNfh`|#vdLvd;wEQJS!xe)ocnDqyzXN_J{EqmY;dj8_34cd}?`-fN82l#& I{}IvuXW71D-H%ilX2$geaz>O7QSMxN)75H zt5m1w&i*;k(5E(&v@aOAc6!foA24z3XVlFLMy~m2P&>@@3Lr=@yJy{2p>p3)sSQp7 zqadyfFv2M9VaF7$1bcQ?$_L@tM=x zN>n(EB)4tAoN0sXzgYzc&k7>?&%kXXMaeQBK7s_->@_==YoCi0?iN@uwEb1GBl3rF zSh=;Z!Xh>P6RS+WclnCS@GRQGYKy%Y3^?w#h!8hXV_9QZw$Tb0VNJ&1*-?5$sTn0Z yVXmw&)xmhYf)BwL!k-KNT;cZuf3FU_mj~YK1K-7g?~3s6lJM`E2>vfzs{bo|+x9<(j9#r85lP9bN@+X1qz#ax;TbN zNGAXI|9`)_fIVAM7W0Ie^LiW}88S0B^9WpKvPoRjy7EL?la2@TBlQzaAxX_=e3%)+ XW~P>T-h5#LG=ag>)z4*}Q$iB}!QLfC literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/habit_minus.webp b/Habitica/res/drawable-xhdpi/habit_minus.webp deleted file mode 100644 index 6babc15b9260e15061dc1739b673a9b222307568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK^_Nk&Fc0RRA3MM6+kP&iCO0RR9mKfn(Vx1gYH8^-)ew>u!_fBp%wZQl87 z-Xk#p00amS03ZZE-{3HkWTnF0VSoO)>f`MTV2J2H1GkM7O|;B#cQf~dESRz#=Iyxj zaBTC?mRVftY1d!&iD)@RzblZPB1&w$bOXlQk-R%~6T1ACt5!vT>V|7hMS&*Rb&5t8 z7Rx6^WFo{ZiVFFEnG~7nuj>?>zYQ80_&rW_$^g|5m#>cna$lt{x-VCpGC}bvqil?y z;UyasZ|P-(x9l>q1GTJ>G0DngPCw61DKlj&GwmQV%rY}?GP4~rL&!t-x<$YwdED~& z1-Ia@;_t|RZ~f1W|GD+QH~jCd1m2tO_qPALk-&E=f$wGl-|YnS2EX2tfZpWS+wkj+ q`1Mx&dUFDLyWegAyWIkQy9vMDhTm=kyWI-d?PdVC-3~y+{{{f@b*mr% diff --git a/Habitica/res/drawable-xhdpi/habit_minus_disabled.webp b/Habitica/res/drawable-xhdpi/habit_minus_disabled.webp deleted file mode 100644 index d45440bb90b6cab3d8f95f5db43602aa1665bfb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmV;b0agA|Nk&GZ0RRA3MM6+kP&iDL0RR9mKfn(Vw*U}?|85Zx0)i4r3cvscY=*yqz$0{+Ig!?f<1%=jV^ z{y3B8v8#eJbD`?SIUgr_S7dL@WQw&t$+0>nGLNr!tV`t5*q@r3g-o5jN?{?F`i-vo z&=uauN=zMI(j}()e@*0Epk>@l{#iDQWPDSp@AcWKJcT&w=Z_efDiotijE_<}vS0$L z=Q^qnAw}uP`|pIKA_^0k?)slCoDGGsnahpTj>(}oF0p%(P@3Dqj$9yN;duIh%d8=x zW~g$ z>gR3!y77T^OTTXF*X{Wj?R UMnLYj0+9R72Wr3lM8W?C0J|2}L;wH) diff --git a/Habitica/res/drawable-xhdpi/habit_minus_yellow.webp b/Habitica/res/drawable-xhdpi/habit_minus_yellow.webp deleted file mode 100644 index e6cf2c554443785b3c10394a7aafa97afde96743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHMDNk&GJ0RRA3MM6+kP&iD60RR9mKfn(V|G=PaBuBpT{JA{49vbt{Fp{Jw z%}*kr`RAw0HUPjfu~|>Kx?l7-n*q>3e5co4K0#8t;BUeu5NYs5h=0()kQ_WX1*0B( z@Pr0Lk9)91yY22UrpKAVFp?xChr7eGc>ZZR+!8=U{~frEq)6>sX70Wx$ZKwp!lvI64p5-AR$cFG49 zRo*N*;kik-+bB&UK`q?gQDn!{7ni$d^lDb0)}3|g0@uIm;su7AayLG??f%&5{;OC2 baw{3lySooq|5=#{bS8tRtDnm{r-UW|poLp< literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/habit_plus.webp b/Habitica/res/drawable-xhdpi/habit_plus.webp deleted file mode 100644 index e4da25a8e44fc48ddb0dc5ee84a2c8385ddddc64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL`pNk&F&0RRA3MM6+kP&iCq0RR9mKfn(Vx1gYH8^-)ew>u!_fBp%wZQl87 z-Xk#p00amS03ZZE-vF^~BuCPE@Avxi&-KhtcWnTgi2gHh+elHPh2!O&xhE9K)cv#` z*UK{3u}*zm#L_OO{mZ!!cBUFnOXQ>q$;~fw!0gVH!);C&N>^xh3xLKEy4ymaOAdpD zF{I_n#R6GK37dsN`M(wmX8AV^(INl)KxYDef2X-k0L_n3?pXq*@TO0OuTb44g6dPV z$(TP=*Fy1^bM};q>aEdJFt;*qovwnpbpoxcTz+K=?}YPf@g4{0r1ljnK)LRn#R^bA zIg1q_R%fvSv>wi41?ae(#R?Fwl(Ht1SO>CNSufN=e~bP_`f;nDH~M+2UpMsY)&tf} z{kpB+Hy*HW>Gw_jzWo5ZL2tJ_z;4ppZRqVr^mZ$HyZHfjyWVdAx!(eMzX`qHhTd-k Sx!(%N{bm5Q-wr_Fe**xsZnv`l diff --git a/Habitica/res/drawable-xhdpi/habit_plus_disabled.webp b/Habitica/res/drawable-xhdpi/habit_plus_disabled.webp deleted file mode 100644 index 4f769a6ddd1dd233f12ae823fd43e46ebac29281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUy!Nk&Gt0RRA3MM6+kP&iDg0RR9mKfn(Vw*U}?|85Zx0)i4r3cvscY=*-~ za@z)=a!%y+U#pc2LIp(hpMl#(irS^)F3;Q(rOjUsY zHPxg`)|+x0WTijfw9^=*8PTx+o~wwKPZ*(*N@TJPStG9Z?v}g7jGA2vl4;0Wp^2hp zu?RCm7TST)B+QJFVK&YgGdkwYxL%o2u^p5qVP=#ZiSVw~#8-)d1nLO|fA}Bx-{Suw z|8eU-Z~W)2|GMG7Zuzg9A6U2j_l*ziTmJi||GxbJyTRXX`GDQzZ?}oR-6;NctN7c^ oAF$i~{RRKx?l7-n*q>3e5co4K0#8t;BUeu5NYs5h=0()kQ_WX1*0B( z@Pr0Lk9)91yY22UrpKA#Fp^}YI@}!|i|3!_SMHVoBKq&ZZ6rlXmiegRo*=gklcMgn z(YbN!>LLln)~M=d{BiE9$ZSin54h>D2Np|bzChuUpV}oaouG6|J=J)$Ft9xoW4yw| zHNHJ&4o14{-qKaV(DJ%7HZZlhF_bX2{5xha_umPzGauo8-{)9Ca6NvEUJHt?_e~0t z>DPEpAUU0%gcx=r|Xqwwoi;n&R%sN4B{g9yEE5#jeu a!tdLJ-#3cT`&JR5_swtFefx)o{~G|m#N2rR diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.png b/Habitica/res/drawable-xxhdpi/habit_minus.png new file mode 100644 index 0000000000000000000000000000000000000000..1c41037cbe61966c23c7d01cf1243ba8b78a40f6 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^DnQJ}!3HE(r`Rk7QY`6?zK#qG8~eHcB(ehe0iG_7 zAsV7*CmrNvP~c!*&0kg!6n?=}#_#xnZ-==qJQ1oWDGApUr+u@Pn@#4rddzlp;uO`O1ZxUMi&plkZ?slWUAkb_EPgg&ebxsLQ0Dc)U Avj6}9 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.webp b/Habitica/res/drawable-xxhdpi/habit_minus.webp deleted file mode 100644 index 0d9ff3d5a8e0e7dea1d655d184693ec51c42ed80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmV}V4dVv+f z57V-r@k&y<;<+!=;0=QhYt&!FH4tX``A`n3Gkjj&j9*t^hOdiwLa*z1gI<^N2E4B3gQ|5w038APcmMzZ diff --git a/Habitica/res/drawable-xxhdpi/habit_minus_disabled.webp b/Habitica/res/drawable-xxhdpi/habit_minus_disabled.webp deleted file mode 100644 index f726b7f92afaebba0fd31ce62c940f3e3127b25d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$Kf1Nk&GV0ssJ4MM6+kP&iDI0ssInU%(d-$Dkl>11A1;?^uWs5R^z#JYxc` zB-@Ib3#cK^3WT@+rRL#${g3Fs14)wFMkCu~A4nYGcmZz0Hto2Cn6gMtF)U--SkPeo z6y+3g@(fY7TjdgK_iTXi%T6OLWBaKqYmBYxPdhFB@cdP?l7Fj^UB9aeZp!r_{(@f-Fz;dh|Km0nNl2SSl~BFzn8lQ(KsPPCi| zTNFb|k+#vKv_z4n)$UEpBGQf`BWTe$jRGy2EQowS%SR+cRjRbqA~A`apNz_loEE$i zNm<15URFexVTSiIDii(1@8M6vUl4!4=GRO7dX;}%;2+oc$7TL`#S7*|{PQ~gc`5(A zntxsJf^`l5x{QBa`GR#Z|GNGK`x5;7Dlga<;@{T-|GwM{_7(Z}MZv$X`+|LG{(W`u z+XcXH*8sm=2K;s<@Y}_}Z`T9AT@w6uRe;_u4Dj2v0eZVUz<;g)pg$J@fc{*E!hSBL Mfc;#}h9}Pj0r@ga&Hw-a diff --git a/Habitica/res/drawable-xxhdpi/habit_minus_yellow.webp b/Habitica/res/drawable-xxhdpi/habit_minus_yellow.webp deleted file mode 100644 index cc74edb2a98bc25a4443c383918f4c32d7eba9cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n1pNk&F&0ssJ4MM6+kP&iCr0ssInU%(d-cflr-Bq6;|h<{mFKm{o^Hs+sE z+enf;2cg+r{;c*pVG!B2lJAO38cGnFAX>m3Zh$n3|M968_xn>SCOXQ*h~q#B8(N0Dzc2n9(v`TzCVx@!=T)BUVgTuG8_TIbpJ>&s{F ze}6pa``p z@alv83=Xs()J;g0_HhemTeT}Dkk=@ICy8DrfN~haBMtrEnWXS6o%p@?I8EW5P7jaS zT_T88*Vnz;8NsOLB^x;cQo}>G)(A>1=j<&I*rMl{;|+q_jNNhy0&=OYBp{XOGuoil{){7N=_Bh~(Aw%90}va$V-I3`NzWOG>1osfH5r{t zYBEYeEz^ApYPvT;uGt5<{uSh|N08I5BzL%hoFbS1RQ1T^ziZ|4pEyEum;b~O;t&1@ z{BPm^q65es_{Sywag~2w;Gfs{=Vgv@h|x6qGGG-o-MKfb!q;(y7>D7;_qvSzb_;H zzLNO+V&d=XiN7x?)dG$nmzq3b?+Z)(eQk-pFE8<*E0E~VMM$DQ*C9#l=Tam|dUnpK O-MO0deXfQ^$a6tLBSnJ% diff --git a/Habitica/res/drawable-xxhdpi/habit_plus.png b/Habitica/res/drawable-xxhdpi/habit_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..7d13f6010035c5046c241c66dfcc9d6b983b2df5 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCik{d%8G= zL~y<9Em>!*H|ZAxpYkU(v7mVIf}iE zzVA(+@MQ92{Nj6?Ve6D5{q$Y6=8tv4;a-#Ldi4U$IBN7+^Ly-76eY#;dinKa&0{~^ zS{}4Z{ek9#>9w&}KCD&s4vdbNkTYYye^1ZUs2i&Jk!$-`3muodlu-gP|9`ou$wd7$ x3B$(|rY>|jWYja`FN4$O___p~iz-$aukwo}4iq^VU{6o(Z>tb^~2&@Ldbw85MReFBNpyNrZk2a$c? zk2DEnQo|jqW;ifcMC&qK$Q^4eOmJi3?6ThA$W{}qIpE4sey}#fncNmy4*`00Ls8d4 zg#Q;d86xC=cUB*e;rQ>MVS^A`_(v0@nEtR1Vsx)oWr&fhH_eb^ez69EJRd3~2$I5+ z21qhI4R=Vghnq2fr@srlv+Ny~vz5ZdsK0Br&|b9=Pn53ZVv%^Bd?C{J%-3*gWu7Nr zD|^~Oh}^B=q1MR$%t4bG_m}FRL|)<{M6$>6P(uzCJ=Blfv-HroaL>|13pbi`(Z=1E zi&BwG{t+oT_dS=KlZJB1DLIIaiu5P+SJB^*{&%haU()}t>iY$Kzoze(_2Y^U#6|jX zoqk-ZA6I{%T%cdB(Jz;Mpj@e6F4iyCf1qAMzh317^+NjfTBctw_knsv{d!T;uh;!R zy|jM4y6NWyOh2z-`gs}C&nuaJUd;6KdZwS3H2u7)nS5T@Oh2z}CZCr#({EQ`Cf_c? U%;ej3oT#@;xuD*z=89{(AcRB`lK=n! diff --git a/Habitica/res/drawable-xxhdpi/habit_plus_disabled.webp b/Habitica/res/drawable-xxhdpi/habit_plus_disabled.webp deleted file mode 100644 index 2b49dc9393c24adb527b5de331b4f971435de6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmV;%0y+IsNk&G#0ssJ4MM6+kP&iDn0ssInU%(d-$Dkl>11A1;?^uWs5R^z#JYxc` zY};y@3zisrBi#8<6>QI&|A_uWaNEd{Wbf{EzUovRs$T#j`nnyLZ4Z%*Vc(XqtvzJu zn`!4Q?o*=><-3)SxOVRbxMn$Nq-AVBRq37cW%X&t<)kT>#^EKp_8|LqvjcoHZHGFy zuQ*&6@{qoGB3#ku0im;Z)LDu+RnG;irkEwDVaj68T!Yb|@k8dA3)t}+EnNT(j`+2b z(oNZLEMUqa8{m^ok>!>KN&|B?Aq~RPK)(8yLSLD!J_Y`s|Fb6bV2_vBry`yqG^t=lqz z1els~gLLbi*tlQ20ngYXFbYu6| z7CxTLgeB<_8`=WXaVmI{m652%s7R*XNF{Gpq8bC+q2QHv3e_4txdNHrY))IF$i0oF z-x}Dm%#&emm?O`-(@DyE z&ue|Xq_0=?*9HA`O@Ce1-&g4Gi}d$(f3Ppr-&gCO3;y6-qkk^bKUe<2xmf>P{|EOH z`u8e-a4)2PuLb>kxj(p9)V~*n{=M!W+)L}wbF+vNfMcLjj_y9faC?>Z9I-=$m3Zh$n3|M968_xn>SCOXQ*h~q#B8(N0Dzc2n9(v`TzCVx@!=T)BUVgTuHL6G;w!NUT}@> ze|tFGclbX<^xuKoNQzY19y(gQf$kUdg!oKWufTsluP0ug?=E<)CZ8S*zj$QaQvZ3wnx-H?pYi0-imcS<4 z5}=%Mum9ro3{grs*Zs2b4WlK4^?r2dptNML)&m|ZDB>Enz_Ntu|G@7BP1nkQ@enOf zV1?}ucw%`+_qXu!1go^G-Y7^|Vt)fuEXlTV`5=efUb0|)6IEtmz&DdS5#mWV%V&Yy ze#(nEjUKpq6{p^CR0MXsGZr5#382 z>Lx36tzPJQ1?ZxSp7?Lsz0@H-n;(S?P4=Bvbn%2P;tRim{}%i&@)fvz{Qo8V|5f~c z0l#0v@0WWvw(K^Hi}1&F_~TOiadivk1^DwC{CQam=9T#KV*Gi13)Us@*Hv1uE`-0X zMf`O+ey?a&y{?GAE=sg@-Ke_67OYF-ud5T^FF<_12J!te#P=%^-!Dddzg_~oUov5+ z(L)o<_*GNT{lY2me(e-=zkCXOTtQX + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/habit_circle_disabled.xml b/Habitica/res/drawable/habit_circle_disabled.xml new file mode 100644 index 000000000..a28001791 --- /dev/null +++ b/Habitica/res/drawable/habit_circle_disabled.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/task_background.xml b/Habitica/res/drawable/task_background.xml new file mode 100644 index 000000000..b803f0bfa --- /dev/null +++ b/Habitica/res/drawable/task_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml index 5af821060..b6f799d88 100644 --- a/Habitica/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -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/gray_700"> + android:background="@color/white"> @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:titleEnabled="false" - app:contentScrim="?attr/colorPrimaryDark" + app:contentScrim="?attr/headerBackgroundColor" app:expandedTitleMarginEnd="?attr/actionBarSize" app:expandedTitleMarginStart="0dp" app:layout_scrollFlags="scroll|exitUntilCollapsed"> @@ -50,8 +50,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="@style/Toolbar" - android:background="?attr/colorPrimaryDark" + android:theme="@style/Toolbar.Modern" + android:background="?attr/headerBackgroundColor" app:layout_collapseMode="pin" app:popupTheme="@style/Theme.AppCompat.Light"> @@ -75,7 +78,7 @@ android:layout_height="36dp" android:drawablePadding="6dp" android:gravity="center" - android:textColor="?textColorSecondaryDark" + android:textColor="?headerTextColor" android:textSize="14sp" tools:text="Lvl 12 Warrior"/> @@ -96,6 +99,6 @@ android:id="@+id/currencyView" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:hasLightBackground="false"/> + app:hasLightBackground="true"/> \ No newline at end of file diff --git a/Habitica/res/layout/checklist_indicator.xml b/Habitica/res/layout/checklist_indicator.xml new file mode 100644 index 000000000..eee81a585 --- /dev/null +++ b/Habitica/res/layout/checklist_indicator.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml index 3545c3151..0b58c3ff6 100644 --- a/Habitica/res/layout/daily_item_card.xml +++ b/Habitica/res/layout/daily_item_card.xml @@ -9,226 +9,63 @@ android:orientation="vertical"> - + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/task_spacing_horizontal" + android:layout_marginVertical="@dimen/task_spacing_vertical" + android:background="@drawable/task_background" + android:clipChildren="true" + android:minHeight="@dimen/task_min_height"> - - - - - - - - + android:orientation="vertical"> + android:orientation="horizontal" + android:baselineAligned="false" + android:minHeight="@dimen/task_min_height"> - + + + + + + - - -