From 59bf5b10d677e30076535f0ca37ee07d39d27932 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 7 Aug 2019 10:29:58 +0200 Subject: [PATCH] Clean up themes --- .../drawable-hdpi/bottom_navigation_inset.png | Bin 2078 -> 2846 bytes Habitica/res/drawable-hdpi/fab_background.png | Bin 4434 -> 3323 bytes .../res/drawable-hdpi/ic_filters_active.png | Bin 0 -> 307 bytes .../res/drawable-hdpi/ic_filters_active.webp | Bin 142 -> 0 bytes .../drawable-mdpi/bottom_navigation_inset.png | Bin 1335 -> 2104 bytes Habitica/res/drawable-mdpi/fab_background.png | Bin 3137 -> 2444 bytes .../res/drawable-mdpi/ic_filters_active.png | Bin 0 -> 199 bytes .../res/drawable-mdpi/ic_filters_active.webp | Bin 108 -> 0 bytes .../res/drawable-v21/selection_highlight.xml | 4 +- .../bottom_navigation_inset.png | Bin 2922 -> 3594 bytes .../res/drawable-xhdpi/fab_background.png | Bin 6142 -> 5139 bytes .../res/drawable-xhdpi/ic_filters_active.png | Bin 0 -> 341 bytes .../res/drawable-xhdpi/ic_filters_active.webp | Bin 146 -> 0 bytes .../bottom_navigation_inset.png | Bin 4899 -> 5479 bytes .../res/drawable-xxhdpi/fab_background.png | Bin 9681 -> 7943 bytes .../res/drawable-xxhdpi/ic_filters_active.png | Bin 0 -> 472 bytes .../drawable-xxhdpi/ic_filters_active.webp | Bin 180 -> 0 bytes .../drawable-xxxhdpi/ic_filters_active.png | Bin 0 -> 794 bytes .../avatar_customization_category_bg.xml | 2 +- .../avatar_customization_subcategory_bg.xml | 2 +- Habitica/res/drawable/badge_bg.xml | 2 +- Habitica/res/drawable/badge_circle.xml | 6 +-- .../drawable/button_background_primary.xml | 2 +- .../challenge_gem_add_button_enabled.xml | 2 +- .../challenge_gem_remove_button_enabled.xml | 2 +- .../drawable/layout_rounded_bg_brand_100.xml | 6 --- .../res/drawable/nav_item_color_state.xml | 2 +- Habitica/res/drawable/pill_bg_purple.xml | 2 +- .../res/drawable/pill_bg_radio_selected.xml | 2 +- .../drawable/purchase_button_background.xml | 6 +-- .../res/drawable/subscription_unselected.xml | 2 +- .../res/layout/activity_challenge_detail.xml | 2 +- .../res/layout/activity_create_challenge.xml | 22 ++++------- Habitica/res/layout/activity_gem_purchase.xml | 2 +- Habitica/res/layout/activity_group_form.xml | 2 +- .../res/layout/activity_report_message.xml | 2 +- .../res/layout/activity_verify_username.xml | 2 +- Habitica/res/layout/avatar_category.xml | 2 +- Habitica/res/layout/avatar_setup_drawer.xml | 2 +- .../res/layout/bottom_navigation_item.xml | 4 +- .../res/layout/challenge_add_task_item.xml | 2 +- Habitica/res/layout/daily_item_card.xml | 2 +- Habitica/res/layout/dialog_habitica_base.xml | 2 +- .../dialog_habitica_secondary_button.xml | 2 +- .../res/layout/drawer_main_section_header.xml | 2 +- .../res/layout/empty_view_timetravelers.xml | 2 +- Habitica/res/layout/filter_menu_item.xml | 2 +- Habitica/res/layout/fragment_about.xml | 3 -- Habitica/res/layout/fragment_gem_purchase.xml | 2 +- Habitica/res/layout/fragment_group_info.xml | 2 +- Habitica/res/layout/fragment_items.xml | 2 +- Habitica/res/layout/fragment_shop.xml | 2 +- Habitica/res/layout/fragment_subscription.xml | 4 +- Habitica/res/layout/gear_list_item.xml | 2 +- Habitica/res/layout/habit_item_card.xml | 2 +- Habitica/res/layout/main_navigation_view.xml | 5 ++- Habitica/res/layout/notifications_header.xml | 2 +- .../res/layout/purchase_subscription_view.xml | 4 +- Habitica/res/layout/quest_menu_view.xml | 2 +- Habitica/res/layout/reward_item_card.xml | 2 +- .../res/layout/setup_customization_item.xml | 2 +- Habitica/res/layout/tavern_daniel_item.xml | 36 ------------------ Habitica/res/layout/todo_item_card.xml | 2 +- Habitica/res/values/styles.xml | 2 +- .../ui/activities/ChallengeFormActivity.kt | 4 +- .../ui/activities/ReportMessageActivity.kt | 3 +- .../ui/activities/TaskFormActivity.kt | 3 +- .../ui/fragments/NavigationDrawerFragment.kt | 8 +++- .../habitica/ui/fragments/StatsFragment.kt | 3 +- .../ui/fragments/tasks/TasksFragment.kt | 10 ++++- .../ui/views/CollapsibleSectionView.kt | 3 +- .../habitica/ui/views/social/ChatBarView.kt | 3 +- .../ui/views/stats/BulkAllocateStatsDialog.kt | 3 +- .../ui/views/tasks/TaskFilterDialog.kt | 3 +- 74 files changed, 90 insertions(+), 125 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/ic_filters_active.png delete mode 100644 Habitica/res/drawable-hdpi/ic_filters_active.webp create mode 100644 Habitica/res/drawable-mdpi/ic_filters_active.png delete mode 100644 Habitica/res/drawable-mdpi/ic_filters_active.webp create mode 100644 Habitica/res/drawable-xhdpi/ic_filters_active.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_filters_active.webp create mode 100644 Habitica/res/drawable-xxhdpi/ic_filters_active.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_filters_active.webp create mode 100644 Habitica/res/drawable-xxxhdpi/ic_filters_active.png delete mode 100644 Habitica/res/drawable/layout_rounded_bg_brand_100.xml delete mode 100644 Habitica/res/layout/tavern_daniel_item.xml diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png b/Habitica/res/drawable-hdpi/bottom_navigation_inset.png index 860db0a48543fbf999218edb82511251ea7304b2..40ed165027c65c3f0c47a83230c0633b11e2456b 100644 GIT binary patch literal 2846 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 C2z-_R literal 2078 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 FV1f)!e{lc+ literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.webp b/Habitica/res/drawable-hdpi/ic_filters_active.webp deleted file mode 100644 index 3a693b1b1b95f51124ca898bbdc74f1d29659603..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmV;90CE3PNk&G700012MM6+kP&iC_0000lBftm{KR_S|5x@O0nLrRC=e@FxfS~BK z{m29?eEPRgK>-B>T0q}~2yo}JwSsA6+fFXgXX^MJ5PkNqg|A-!f_I5NqW=?sD`h{- wQwro6=^z=Mwp=`O$?vH7N$i8Xo;J@SpXF7XH&|cOafC&ALc2=mEJKwcmMzZ diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png b/Habitica/res/drawable-mdpi/bottom_navigation_inset.png index 2e127891d7a7058082bb0cd64d3e9961b8e77456..a197240c435a760bcbd3d8961f417daac7eca9d1 100644 GIT binary patch literal 2104 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 YKW%ifVeTCXw*UYD07*qoM6N<$g1CRvL;wH) diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.png b/Habitica/res/drawable-mdpi/ic_filters_active.png new file mode 100644 index 0000000000000000000000000000000000000000..12b7bc722366055f85c4c843cec5dbb736634590 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|8a-VcLo5W} zPCCeWK!L~g@+Cv7iOCg(t98=9c?f4TiRwGqh=?qTSMjgpI5TI-s*o!IVOA-t7z(^y z`GO4Gg?dY)I^xW4^v2Coc{1nr+Y&dI_mR(j)Zc&m_y)__U3qtR literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.webp b/Habitica/res/drawable-mdpi/ic_filters_active.webp deleted file mode 100644 index c9d245b16be44fbfb9b4da24f4c1921c6034a495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(bxNk&Fw00012MM6+kP&iCi0000l7r+G&Cm;|YD7Pb7AV3f=%bS3p=(PO^ zvTbHN!WrG;0r;;5tb&37ARDK^NI(N2^iOs63PkjO0$>~}t+UCH)&zgZc5k?s<%#}8 O=BfIEO(?W;hA{xk$}1=U diff --git a/Habitica/res/drawable-v21/selection_highlight.xml b/Habitica/res/drawable-v21/selection_highlight.xml index 1a8620380..0f322185c 100644 --- a/Habitica/res/drawable-v21/selection_highlight.xml +++ b/Habitica/res/drawable-v21/selection_highlight.xml @@ -1,6 +1,6 @@ + android:color="?colorPrimaryDistinct"> + android:drawable="?colorPrimary" /> \ No newline at end of file diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png index 4e51dfca6c011ff97c1f440d68af333c883affd5..fb975edf0e8837f34f8b207ed81d2c5d88f5c045 100644 GIT binary patch literal 3594 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 X-`#||HK-mw&%orOg;A}c>!1GsR>n}l diff --git a/Habitica/res/drawable-xhdpi/fab_background.png b/Habitica/res/drawable-xhdpi/fab_background.png index 913c83f7fb7f64f57d9b8ee3117ed06218e1b2ba..52e62daa4274b436768976c28cf6483f6e63e84e 100644 GIT binary patch delta 4058 zcmZ9Oc{~){_s3^tY%`OL>@$-!lr>w7F}9S)k}Z-olAYwCh8YZ|vScZHwuEfilby0> zc~E-lVWzCv#y%o`^ZoaC|G4+O?)jYeIp_X!&xt~s%-bJegqEU)mZBO)iM4BJX_YKE=7p}0Eie913l|7;CkLzfQSjIzg6_x>hTTU9)z?+jv={0#$i1lFR|alqd|tS z2OCqJ<8{{JWHJ`IF3m?n?t%S&`8;paPx zPDSpYTKnrmnX#bv$`h_jmTXN$5i$w?ab6(*mmM-~4a^s@*86Uw5Bxq|B)1B5>U{s; zb{wilwB-m@w<^)%kOIyx&#+fpSOz5vHLUXWU}Sj5`KF!*lh}wiO53!r=cxIv7}@(T z;bLSyj_{7RYJqX(h$YWEiSIgiY!SzRL66ahw%BKe z9@w@-Nm`6;Wk%N0ij=Fq|BDIp&(Mx4ioDlLveVQ7c?^;`oGU34EYVXn(Vqt?(%n~GX6qxk1xv~ z*8G!8C?Gn&d*$x$~1*hjZb4V+h%vE|aNf_yZ_RPLHOGrqWK1DLHBxN;~ zXN9Y&SVz>`l&i26p&G_cgVEfd0mc;uYoBaiqiS)Sr}c&gV0SsYco|!g=eAns|2T%0 zhi3qr)cTmuhSrDBoXoj8mxgke zQ54cBcm}}CR5?pX-x(2x<*~ihV<>rXW8G#S5&T!7lu^(Oo+%*Tb+FSw)1jDwW?Yzj z1Y1nvD9{T?ByxsGN=W8{#?LeBFuU6uGlGDN6mx8d2ed%|w~1|tgoXfcHP{9rd^~N3 zpWp)wLE;p!4ZQex`VO413fKkUNHv%SPJA+LhmGI^*k!pf4Iq3n{k~XFAGnO66fM9PjX1*^_k;{#G8w8LgO8K;SNMn5Y zSmH~*;lh>iZgC9fiM|V=g0;MDVdS&M(;f1E3Ufs0CeE;I-ZrHL;!)mYip3 zeEg3P5B(~O9v9~|0~F$NU1ufjt+TQ}H6q;nAKimtec9qCrjmz+k@b{Cms%n}g9>`= zG)by9h#3Kx9IKp)?C1aX`9LVoL1m0-w(GaS$)Y_&Eaoq_SNlQzoUW2AW~2U%19%@B zeVk=Ks8_1n>Icy+ShjeKyY&?zO$wOxXo*iAr)=JRg@i*2$jQ^)dcDXJyS=KkLE3L+ zWvCIG>l{Fcp%iA(2QjA$3z8HX*RB$7epA=lgSx4S$ko3D*0Ww5x9|*eB=?XXJ73fCJqbi6xRdSI!TP)V|(Eg1b^C~2s zdnrp-XtYg4#f5BM7q!xV?vf*(dn{kq+~=l9YS5!8>5O5Cl|8r0NRp>j98wo}cMyfM z!m1B()BpC;()bcSs!jQF$&qVmanS+}`yi1m@A~YeXUJ8yLilmfq$r zd8~FQ7R=$we%7wqkz>x0sG|L6IYgM?ou7H<4HCa0;l@vyd$rD)j~t})EuB8tu1UKN z_;&ayM_pRXiS({_kR<5+T&O16(P)jMK;rqo%3;g>nm@SaJI_2wf1_Cq7(G%LFi&gl zF4iXQE?Y8ZADwc|*+)n_Iyu45ojdoaI$8(#3iwD64muG!G_8qy|H%XzI7+$(kK^UH zwY8O63>b}9_jiQnYlriWMruF(jnPPJ^X%B=!ss`v1R}MKi%A{nnsv6n3%WAyrH-YT zS5{Y>$;-=A?B?2q{C$0&p*iey>$5APZ@_kxzblY~~A+EpIGO>fGbM zpeRokIJMbMED~J_UE=f7i4gkZdoSoh=IIe}+`I9|;NT#nV`XLKHth5)#5hUh>qTMZ zbf^U!bD#Ube0wt`XK&{9;%iV4A5@_xp!#GLz1fMLb8`5leUQAOa8^Yn@4=V4SQ#!C z+kiFl-=uB+1zqGq<-WsG97toS#?%x-a&mA;+MGN6+jR5rN1{&JR^PmJo7!d38Z(`< z>}W{$$)BU2@$6#C;#u|R`EWcpMei_CGME`K`TnV!aEUkk0(mE)*)e0~QbuHQn;2=A zQ5-gABqs&>LBsdx_4HmNO5lWin@Vv9bYzH0iGGPgL!1$)unAL?g&hx*n4G{i4D@o+e6HL3GAe;hbhZ}^A^^-E3 zPNup3==1iOm{vzR#^2<`e~k(jQ{}>Qhy~-kV#krS-5=$d%(m^rHEKKpowUF9H4P7A zre2vl%)8>eW2dm_W*f%gS@_WLiQrWc39?aoUxrh=$aS0Stfg*tnpQ!vvc8Er=GK{l z;(kV2=Jzn_b%mNpDdMvNRkD{aoH;`Dt0w7N%Tsb_UOa8jK=M)h9d`HixmRa!cjz!nfCIZRUm5AFd!t{hrPYMu*YIo zU6^5ez3Gp-l<2RarYk zD;7jR(R>vUJU8hTk`UW>tC$w!@El0(W(AGktPttA)$H#&QjmW@e695yMD0cqtbQ1! z%f%v8-hglkR+?l1Yb=E`v37`FoW;|=U8~gy_@C%SSY<6glhHEP>lj*cz7a^xlcC)B zm9mr=k9ac0i3u%Wh-#hRO^HjUY!E$h>u+ zT|cn@HRc2D|5Dqsk9v0SS`I5`>C?c8lTlIz)T+cHWv4tpce6_xv9M(u1A+RDhcnqai&cNicD!-=()Q7xtQ`U-Y2<^TJR#Ao|8#z=u0R z@WP(>v^$wr05^Z0SR}(EVxgRv4b>z;qaTpW8}UbaBbop#0g80G_ObFuy;mJ;a2*){ z6p8(@cyUIvQdH?np6nIpJP5M12#W;4Teg(~+j<6ct)`=LISIVl9Iq%zSYLf(_iou!YD1nYseflE ze_H)zdvah6I1*QQoX`_6PIr>Xzo4lRWV-7y`8%%H94pq9K7GR5i$w10s zBX52+w~UNChG_bx9BUndG-**JB?DghxbXz9;q`au@;tSJSBlMy;6+-j(+SSpVYsH= zP)%>I=S334-%(OlH3;hSzJAoQXgVQXap>V!G50VaT1wVX|LgVPD5Qg;OZ)lew0}(s zM!rLmhnMpk9_+>GbAD(6Wy)HD2o0)w^Y25_t6h3NE+z7tDK`) zad?A=Q)XoMhK481K%Ora)N1H4iZ=|>r*A;HVU|AL9xoolSdW8IViT*$A?^uBV delta 5069 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 R(F7n5V|_Ed8XZ{N{{Z39gDL<3 diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.png b/Habitica/res/drawable-xhdpi/ic_filters_active.png new file mode 100644 index 0000000000000000000000000000000000000000..ef97e60759ed90c14f6d55014b377c1dd423b220 GIT binary patch literal 341 zcmV-b0jmCqP)Px$4@pEpR9Fe^nK25(FbqZO&5c5m2++-Mu|nj+5!{UTCk??<|+Fd1jFksY#o3{**pw`ZqX(HFQVMH zs^R?#;A|Lhht}*A<3a$ReL>-HI7|*iOOPSzsXK?SH4FN_uYLN9J`6+g9Cr=}aPb}$ z#rRuOG_zPLdbntdqF9~7e8$;xxi)v1BU*wT(azmD9CKK^1-PEOmT(7rcnB00000NkvXXu0mjf#F2~3 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.webp b/Habitica/res/drawable-xhdpi/ic_filters_active.webp deleted file mode 100644 index 81154be70320779bac1a6c9876d47a86a56ee61c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 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 RPZa<4NwIYyS6ln<{WmE!z#ISo literal 4899 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 diff --git a/Habitica/res/drawable-xxhdpi/fab_background.png b/Habitica/res/drawable-xxhdpi/fab_background.png index 05e7eb474f4c5ce7540a7cf79e254ad27ade0f13..06b3a327f14239a2087b80d1603f4120aa025e97 100644 GIT binary patch delta 6884 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 w0mD4AhYR#1W5oWPfqfYwg&@~ diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxhdpi/ic_filters_active.png new file mode 100644 index 0000000000000000000000000000000000000000..16f38de004510424c8ebe62954b11cc83039976f GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-D%zCwaO!hEy=V zo#W_t*g(Mbb(gC70~VPE(?>FQQ<>+iNSZAB+#%;7gDs=F!tW32n?m=6JY0}>pl;fl zBc4&Iar4z@t?<0{#O!?WrB{1@EvQ>txAI=nY>_LDwITIhnr8)5SoRCHXzR|qnxA|p zusU>&^}!z=H(SJWU+_Bp+{=6{wxQy}seL(bOMXfy+!OiZyPU!6#(Ty`!HdI$lR39+ zo5OTul4-X4wte-ts~WN&GrOpm;JId*MnQ>(ECz=vCny^n>fQ0- z;meB#Jj=`fOkVp~;(KO&o=@)?c7cWuE1Q7I+zLL6Dc|8JVsT4o5kA22eB-KXANpn7 z>({bH1_#TWzjxhZ+Dvu@hJ#lMm?R$BtS|){_+S;x{5hf7Kf<)lFUv93G7<$yDz-?sPPIK_-uY%YX;EBn|847Sx55I5O zE3Yh~{}aHQHDl8Xi=%Tgwc;2sy=rz~Y2^_Nx&RWL2c^#c``NpHe%g=E-tk)yehK#M iH*(jXNTTy#&;_vQA~3ybc7RD01DLT<6i4UeodN(iY*tSI diff --git a/Habitica/res/drawable-xxxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxxhdpi/ic_filters_active.png new file mode 100644 index 0000000000000000000000000000000000000000..caa6c3a8b1f0d104dc4db54367a42951466da55f GIT binary patch literal 794 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2bFkSI6h*o&o7(Q z{w#fAQqOUt{o}vfFV`>nKYP7r8q2%nFO^@+8EdCcwSHjxuKmX!BmGM`ji+ZkG@1B( z>MU*XnA=|s9HW-K%<8)O+a%83b^gZBR%gXe+& z$`JEt6+hb!pfm%>pqP97VfP=!-`8LF?zTd;yXf?=oO0j!L4dyt&=4N;M=4BQIlY{W7+ zYqXCE$m-$dic=qzq;Q8zRR{&CfvRnUHS)@*cm)s{an^LB{Ts5ct>BK literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml index 300ee34d1..2f30bb800 100644 --- a/Habitica/res/drawable/avatar_customization_category_bg.xml +++ b/Habitica/res/drawable/avatar_customization_category_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml index 4c115a7e4..3be259e51 100644 --- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml +++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/Habitica/res/drawable/badge_bg.xml b/Habitica/res/drawable/badge_bg.xml index c6f2317f4..0213c8e97 100644 --- a/Habitica/res/drawable/badge_bg.xml +++ b/Habitica/res/drawable/badge_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/badge_circle.xml b/Habitica/res/drawable/badge_circle.xml index 618daf35c..7e70e56da 100644 --- a/Habitica/res/drawable/badge_circle.xml +++ b/Habitica/res/drawable/badge_circle.xml @@ -1,8 +1,6 @@ - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/button_background_primary.xml b/Habitica/res/drawable/button_background_primary.xml index 609b534a1..ea1e79105 100644 --- a/Habitica/res/drawable/button_background_primary.xml +++ b/Habitica/res/drawable/button_background_primary.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml index 1c28c6c3d..3d41b91b5 100644 --- a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml +++ b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml @@ -3,6 +3,6 @@ + android:tint="?colorAccent" /> \ No newline at end of file diff --git a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml index 7bbf3519b..cd660f431 100644 --- a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml +++ b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml @@ -3,6 +3,6 @@ + android:tint="?colorAccent" /> \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml b/Habitica/res/drawable/layout_rounded_bg_brand_100.xml deleted file mode 100644 index cf946dc8e..000000000 --- a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml index 709a1af70..0f4955173 100644 --- a/Habitica/res/drawable/nav_item_color_state.xml +++ b/Habitica/res/drawable/nav_item_color_state.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_purple.xml b/Habitica/res/drawable/pill_bg_purple.xml index 9dea0a7a0..7a466382f 100644 --- a/Habitica/res/drawable/pill_bg_purple.xml +++ b/Habitica/res/drawable/pill_bg_purple.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_radio_selected.xml b/Habitica/res/drawable/pill_bg_radio_selected.xml index 6d8163ecf..7160d31ed 100644 --- a/Habitica/res/drawable/pill_bg_radio_selected.xml +++ b/Habitica/res/drawable/pill_bg_radio_selected.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml index 829c7542d..3f9430413 100644 --- a/Habitica/res/drawable/purchase_button_background.xml +++ b/Habitica/res/drawable/purchase_button_background.xml @@ -5,7 +5,7 @@ + android:color="?colorPrimaryDistinct" > @@ -16,7 +16,7 @@ + android:color="?colorAccent"> @@ -36,7 +36,7 @@ + android:color="?colorPrimaryOffset"> diff --git a/Habitica/res/drawable/subscription_unselected.xml b/Habitica/res/drawable/subscription_unselected.xml index c290a3fdd..ce7b3e2bf 100644 --- a/Habitica/res/drawable/subscription_unselected.xml +++ b/Habitica/res/drawable/subscription_unselected.xml @@ -2,7 +2,7 @@ - + diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml index 6917d816c..4470417ee 100644 --- a/Habitica/res/layout/activity_challenge_detail.xml +++ b/Habitica/res/layout/activity_challenge_detail.xml @@ -164,7 +164,7 @@ android:layout_width="match_parent" android:layout_height="54dp" android:layout_gravity="bottom" - android:background="@color/brand_200" + android:background="?colorPrimaryOffset" android:elevation="0dp" android:fillViewport="false" diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml index 3fc64b936..00e64ce85 100644 --- a/Habitica/res/layout/activity_create_challenge.xml +++ b/Habitica/res/layout/activity_create_challenge.xml @@ -18,7 +18,7 @@ @@ -39,8 +39,8 @@ android:hint="@string/new_challenge_title" android:id="@+id/create_challenge_title" android:textColor="@color/white" - android:textColorHighlight="@color/brand_500" - android:textColorHint="@color/brand_500" + android:textColorHighlight="?textColorPrimaryDark" + android:textColorHint="?textColorPrimaryDark" tools:text="Get in shape" android:inputType="text" /> @@ -49,7 +49,7 @@ @@ -64,17 +64,12 @@ android:maxLines="5" android:minLines="3" android:textColor="@color/white" - android:textColorHighlight="@color/brand_500" - android:textColorHint="@color/brand_500" /> + android:textColorHighlight="?textColorPrimaryDark" + android:textColorHint="?textColorPrimaryDark" /> - - diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml index 83b64c701..cd2961f30 100644 --- a/Habitica/res/layout/activity_gem_purchase.xml +++ b/Habitica/res/layout/activity_gem_purchase.xml @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="54dp" android:layout_gravity="bottom" - android:background="@color/brand_200" + android:background="?colorPrimaryOffset" android:elevation="0dp" android:fillViewport="false" diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml index b5975816f..9096e6b16 100644 --- a/Habitica/res/layout/activity_group_form.xml +++ b/Habitica/res/layout/activity_group_form.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:text="@string/create" style="@style/HabiticaButton.Borderless" - android:textColor="@color/brand_400" + android:textColor="?colorAccent" android:paddingEnd="@dimen/spacing_large" android:paddingStart="@dimen/spacing_large" android:minWidth="20dp"/> diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml index 4eafee561..32c259677 100644 --- a/Habitica/res/layout/activity_report_message.xml +++ b/Habitica/res/layout/activity_report_message.xml @@ -133,7 +133,7 @@ tools:text="@string/report_explanation" android:textColor="@color/gray_200" style="@style/Caption3" - android:textColorLink="@color/brand_400" + android:textColorLink="?colorAccent" /> diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml index 3208082fa..861aed5a5 100644 --- a/Habitica/res/layout/activity_verify_username.xml +++ b/Habitica/res/layout/activity_verify_username.xml @@ -27,7 +27,7 @@ diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml index 17c206b01..449b68542 100644 --- a/Habitica/res/layout/avatar_setup_drawer.xml +++ b/Habitica/res/layout/avatar_setup_drawer.xml @@ -17,7 +17,7 @@ android:id="@+id/subcategory_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" - app:tabIndicatorColor="@color/brand_400" + app:tabIndicatorColor="?colorAccent" app:tabIndicatorHeight="2dp" app:tabTextColor="@color/white_50_alpha" app:tabSelectedTextColor="@color/white" diff --git a/Habitica/res/layout/bottom_navigation_item.xml b/Habitica/res/layout/bottom_navigation_item.xml index ab9e92b15..118d1233e 100644 --- a/Habitica/res/layout/bottom_navigation_item.xml +++ b/Habitica/res/layout/bottom_navigation_item.xml @@ -4,7 +4,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" tools:parentTag="android.widget.RelativeLayout" - tools:background="@color/brand_100"> + tools:background="?colorPrimary"> diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml index 3f7ab165e..cff249bfa 100644 --- a/Habitica/res/layout/daily_item_card.xml +++ b/Habitica/res/layout/daily_item_card.xml @@ -76,7 +76,7 @@ style="@style/Base.Widget.AppCompat.Button.Borderless" android:text="@string/expand_notes" android:padding="0dp" - android:textColor="@color/brand_400"/> + android:textColor="?colorAccent"/> + android:textColor="?colorAccent"> \ No newline at end of file diff --git a/Habitica/res/layout/drawer_main_section_header.xml b/Habitica/res/layout/drawer_main_section_header.xml index e9f3ba3b0..cfcd03d51 100644 --- a/Habitica/res/layout/drawer_main_section_header.xml +++ b/Habitica/res/layout/drawer_main_section_header.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="22dp" xmlns:tools="http://schemas.android.com/tools" - android:background="@color/brand_100" + android:background="?colorPrimary" tools:text="Social" style="@style/Body1" android:textSize="12sp" diff --git a/Habitica/res/layout/empty_view_timetravelers.xml b/Habitica/res/layout/empty_view_timetravelers.xml index d8b011541..5c190cc3d 100644 --- a/Habitica/res/layout/empty_view_timetravelers.xml +++ b/Habitica/res/layout/empty_view_timetravelers.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="38dp" android:text="@string/want_to_subscribe" - android:textColor="@color/brand_400" + android:textColor="?colorAccent" android:background="@drawable/layout_rounded_bg_lighter_gray" android:layout_marginTop="18dp"/> \ No newline at end of file diff --git a/Habitica/res/layout/filter_menu_item.xml b/Habitica/res/layout/filter_menu_item.xml index f4c6346e1..2456ec557 100644 --- a/Habitica/res/layout/filter_menu_item.xml +++ b/Habitica/res/layout/filter_menu_item.xml @@ -4,7 +4,7 @@ android:layout_height="48dp" xmlns:tools="http://schemas.android.com/tools" android:layout_gravity="right|end" - tools:background="@color/brand_100" + tools:background="?colorPrimary" android:clickable="true"> diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml index 221de234d..5e2927df8 100644 --- a/Habitica/res/layout/gear_list_item.xml +++ b/Habitica/res/layout/gear_list_item.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/two_handed" - android:textColor="@color/brand_400" + android:textColor="?colorAccent" android:drawablePadding="@dimen/spacing_small" android:layout_marginBottom="@dimen/spacing_small"/> + android:textColor="?colorAccent"/> + android:background="?barColor" /> @@ -27,7 +28,7 @@ android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" - android:background="@color/brand_100" /> + android:background="?barColor" /> + android:textColor="?colorAccent" /> diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml index a80db4647..224b040ef 100644 --- a/Habitica/res/layout/purchase_subscription_view.xml +++ b/Habitica/res/layout/purchase_subscription_view.xml @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/priceLabel" - android:textColor="@color/brand_100" + android:textColor="?colorPrimary" android:textSize="24sp" android:fontFamily="@string/font_family_medium" tools:text="$ 21" /> @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/descriptionTextView" - android:textColor="@color/brand_100" + android:textColor="?colorPrimary" tools:text="recurring every month" /> + android:textColor="?colorAccent"/> + tools:background="?colorPrimaryOffset"> - - - - - - -