From edc2a83a08ed77e65019a99a06226cbf9c39a932 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 18 Mar 2020 15:18:59 +0100 Subject: [PATCH] Implement improved help screen --- Habitica/res/drawable-hdpi/support_faq.png | Bin 0 -> 904 bytes Habitica/res/drawable-mdpi/support_faq.png | Bin 0 -> 638 bytes Habitica/res/drawable-xhdpi/support_faq.png | Bin 0 -> 1180 bytes Habitica/res/drawable-xxhdpi/support_faq.png | Bin 0 -> 1664 bytes Habitica/res/drawable-xxxhdpi/support_faq.png | Bin 0 -> 2184 bytes .../drawable/rounded_purple_dark_square.xml | 16 + .../res/drawable/support_info_lower_bg.xml | 15 + Habitica/res/layout/fragment_faq_detail.xml | 36 - Habitica/res/layout/fragment_faq_overview.xml | 120 +++ .../res/layout/fragment_support_bug_fix.xml | 115 +++ Habitica/res/layout/fragment_support_main.xml | 170 ++++ .../layout/support_collapsible_section.xml | 60 ++ Habitica/res/layout/support_faq_item.xml | 26 + Habitica/res/navigation/navigation.xml | 25 +- Habitica/res/values/attrs.xml | 10 +- Habitica/res/values/strings.xml | 39 + Habitica/res/values/styles.xml | 7 + .../habitica/components/UserComponent.java | 25 +- .../ui/adapter/FAQOverviewRecyclerAdapter.kt | 120 --- .../ui/fragments/NavigationDrawerFragment.kt | 2 +- .../ui/fragments/faq/FAQDetailFragment.kt | 52 -- .../ui/fragments/faq/FAQOverviewFragment.kt | 65 -- .../ui/fragments/support/BugFixFragment.kt | 109 +++ .../fragments/support/FAQOverviewFragment.kt | 84 ++ .../fragments/support/SupportMainFragment.kt | 126 +++ .../habitica/ui/views/HabiticaIcons.java | 827 +++++++++++++----- .../ui/views/HabiticaIconsHelper.java | 46 +- .../ui/views/SupportCollapsibleSection.kt | 52 ++ build.gradle | 2 +- 29 files changed, 1630 insertions(+), 519 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/support_faq.png create mode 100644 Habitica/res/drawable-mdpi/support_faq.png create mode 100644 Habitica/res/drawable-xhdpi/support_faq.png create mode 100644 Habitica/res/drawable-xxhdpi/support_faq.png create mode 100644 Habitica/res/drawable-xxxhdpi/support_faq.png create mode 100644 Habitica/res/drawable/rounded_purple_dark_square.xml create mode 100644 Habitica/res/drawable/support_info_lower_bg.xml delete mode 100644 Habitica/res/layout/fragment_faq_detail.xml create mode 100644 Habitica/res/layout/fragment_faq_overview.xml create mode 100644 Habitica/res/layout/fragment_support_bug_fix.xml create mode 100644 Habitica/res/layout/fragment_support_main.xml create mode 100644 Habitica/res/layout/support_collapsible_section.xml create mode 100644 Habitica/res/layout/support_faq_item.xml delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt diff --git a/Habitica/res/drawable-hdpi/support_faq.png b/Habitica/res/drawable-hdpi/support_faq.png new file mode 100644 index 0000000000000000000000000000000000000000..13c292aec03c2e4177addbb00755479f98af507d GIT binary patch literal 904 zcmV;319$w1P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR918lVFJ1ONa40RR91BLDyZ0O0s+{Qv+0@<~KNR7ef&R!wLVK@|QbNq>@B zTd?>8g^F0bv|4|P;>D9xdr=Qb@X(940gsg)tputb1W&z4Z7Yg`6r=~mo7R(JiT_p$ z6|Gvdr2eD_W1D0%zR9}ow%MJX4HP{1V98|W``$P6X5PGEBi%fhuf}Cx84far)o`&N z?_2;h%z#Yf%V|%nMuP>tdoN26Dv`7;ThRsFnlWE zGQggHIqDKIUM6@xFXXCPpgib>VPZWA?F|E4513>xEoGs`-9XJ+puP!Mx7mw?j#Uy8 z;cD7vI&WzQ=%jkGfD9d|02-Qs##VA%*is!GtO0f%2Hq!tZyy0IC-b6@6${ZC_mGn{ z^+4q+N)>FuvxwD^k5aO3qt0;>5%^*u z>U=Z`%qPXLn$5h@S0h8)3JJp46<{$fqv~U+FTj&q?l?!GTn2c2$KAox+q6##hrv-u zNHFQBJ_)D8vV4kCR}~7^jYt6%lM97R7vdNvr-8Q*fsAGE$|_BatW}&x7POe{&lK?C z1u#iDBE&@Do4BXvP(uq9G{qZ2D)jO$Aim|sDc3%~(ZA(mPXDE$b0U?}|6iz-s1-Q> zUg+os$mJJtj;0r*hg;#T=4E-(<83&il9b}V&=Ebu=w<^3kMrmBK)gw1fvT38xra`} zq(6u4;Xfk6ZRZdh_lK~9RyL+4<4}(bGS6X@X1(o5oJ|{j#_zFyHdot*{j}N(MxX50 zHgvQf87+<8=vj7NMvg=nT}tQ~=;Gtl8m1~<<%BN|9miLmMVp(5)nV)s8{vM?gA7yF zertP)5QXX)*U%h}v-?(%N}I$cY6EDcXxP@*+=>r|03y*zgIyiO2bp e?O7Qmi`U<~TffP_bQ2{20000Eak- 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 + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/support_info_lower_bg.xml b/Habitica/res/drawable/support_info_lower_bg.xml new file mode 100644 index 000000000..709e8e69d --- /dev/null +++ b/Habitica/res/drawable/support_info_lower_bg.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml deleted file mode 100644 index a322c7e9c..000000000 --- a/Habitica/res/layout/fragment_faq_detail.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml new file mode 100644 index 000000000..025f232fe --- /dev/null +++ b/Habitica/res/layout/fragment_faq_overview.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml new file mode 100644 index 000000000..8fe130ffc --- /dev/null +++ b/Habitica/res/layout/fragment_support_bug_fix.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + +