From 5626b769561e7a33bd624f5af1119e6c1f5b6621 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 23 Jul 2018 18:03:58 +0200 Subject: [PATCH] Begin implementing new challenge design and layout --- .../res/drawable/border_1f000000_white.xml | 10 + Habitica/res/drawable/circle_white.xml | 6 + Habitica/res/drawable/pill_bg_white.xml | 6 + .../layout/dialog_challenge_detail_daily.xml | 44 +- .../layout/dialog_challenge_detail_habit.xml | 101 +- .../layout/dialog_challenge_detail_reward.xml | 15 +- .../dialog_challenge_detail_task_group.xml | 29 +- .../layout/dialog_challenge_detail_todo.xml | 44 +- .../res/layout/fragment_challenge_detail.xml | 210 + Habitica/res/values/strings.xml | 3 + Habitica/res/values/styles.xml | 4 + Habitica/src/main/assets/HelveticaNeue.ttc | Bin 0 -> 6625220 bytes .../habitica/components/AppComponent.java | 12 +- .../habitica/data/ChallengeRepository.java | 41 - .../habitica/data/ChallengeRepository.kt | 48 + .../android/habitica/data/SocialRepository.kt | 4 + .../implementation/ChallengeRepositoryImpl.kt | 54 +- .../implementation/SocialRepositoryImpl.kt | 30 +- .../data/local/ChallengeLocalRepository.kt | 10 +- .../data/local/SocialLocalRepository.kt | 7 +- .../RealmChallengeLocalRepository.kt | 77 +- .../RealmSocialLocalRepository.kt | 53 +- .../RealmUserLocalRepository.kt | 14 +- .../ShowChallengeDetailActivityCommand.java | 9 - .../ShowChallengeDetailDialogCommand.java | 11 - .../habitica/models/members/Member.java | 12 + .../habitica/models/social/Challenge.java | 76 - .../habitica/models/social/Challenge.kt | 73 + .../models/social/ChallengeMembership.kt | 40 + .../android/habitica/models/social/Group.kt | 2 - .../habitica/models/social/GroupMembership.kt | 27 + .../android/habitica/models/tasks/Task.kt | 13 + .../android/habitica/models/user/User.java | 7 +- .../habitica/modules/RepositoryModule.java | 4 +- .../ui/activities/ChallengeDetailActivity.kt | 397 -- .../ui/activities/CreateChallengeActivity.kt | 10 +- .../ui/activities/FullProfileActivity.kt | 4 + .../social/ChallengesListViewAdapter.kt | 42 +- .../social/PartyMemberRecyclerViewAdapter.kt | 2 +- .../habitica/ui/fragments/StatsFragment.kt | 9 +- .../challenges/ChallengeDetailDialogHolder.kt | 307 -- .../challenges/ChallengeDetailFragment.kt | 299 ++ .../challenges/ChallengeFilterDialogHolder.kt | 8 +- .../challenges/ChallengeListFragment.kt | 50 +- .../ChallengeTasksRecyclerViewFragment.java | 108 - .../challenges/ChallengesOverviewFragment.kt | 47 +- .../ui/views/CollapsibleSectionView.kt | 6 +- .../habitica/ui/views/HabiticaIcons.java | 3437 +++++++++++++++-- .../ui/views/HabiticaIconsHelper.java | 37 +- .../habitica/utils/ChallengeDeserializer.java | 125 - .../habitica/utils/ChallengeDeserializer.kt | 124 + .../utils/ChallengeListDeserializer.java | 57 - .../utils/ChallengeListDeserializer.kt | 37 + .../habitica/utils/UserDeserializer.kt | 7 +- 54 files changed, 4538 insertions(+), 1671 deletions(-) create mode 100644 Habitica/res/drawable/border_1f000000_white.xml create mode 100644 Habitica/res/drawable/circle_white.xml create mode 100644 Habitica/res/drawable/pill_bg_white.xml create mode 100644 Habitica/res/layout/fragment_challenge_detail.xml create mode 100644 Habitica/src/main/assets/HelveticaNeue.ttc delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.kt create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml new file mode 100644 index 000000000..d873a2142 --- /dev/null +++ b/Habitica/res/drawable/border_1f000000_white.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Habitica/res/drawable/circle_white.xml b/Habitica/res/drawable/circle_white.xml new file mode 100644 index 000000000..94367b567 --- /dev/null +++ b/Habitica/res/drawable/circle_white.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/Habitica/res/drawable/pill_bg_white.xml b/Habitica/res/drawable/pill_bg_white.xml new file mode 100644 index 000000000..f90c324d3 --- /dev/null +++ b/Habitica/res/drawable/pill_bg_white.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml index fe8705b6c..18b0b5459 100644 --- a/Habitica/res/layout/dialog_challenge_detail_daily.xml +++ b/Habitica/res/layout/dialog_challenge_detail_daily.xml @@ -1,30 +1,28 @@ - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/border_1f000000_white" + android:orientation="horizontal" + android:weightSum="3" + android:baselineAligned="false" + android:minHeight="60dp"> + - - - + android:id="@+id/lock_icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_gravity="center" + android:scaleType="center"/> + - - + android:baselineAligned="false" + android:minHeight="60dp"> + - - - - + android:id="@+id/lock_icon_plus" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_gravity="center" + android:scaleType="center"/> + - - + - - - - + android:id="@+id/lock_icon_minus" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_gravity="center" + android:scaleType="center"/> + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml index 83e57dfe1..fdf376c03 100644 --- a/Habitica/res/layout/dialog_challenge_detail_reward.xml +++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml @@ -1,12 +1,13 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:background="@drawable/border_1f000000_white" + android:weightSum="3" + android:baselineAligned="false" + android:minHeight="60dp"> - - + android:gravity="center_vertical" + android:layout_marginLeft="@dimen/spacing_large" + android:layout_marginTop="24dp" + android:layout_marginBottom="@dimen/spacing_large" + > + + + diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml index 402ded014..86ca6f1ba 100644 --- a/Habitica/res/layout/dialog_challenge_detail_todo.xml +++ b/Habitica/res/layout/dialog_challenge_detail_todo.xml @@ -1,30 +1,28 @@ - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/border_1f000000_white" + android:orientation="horizontal" + android:weightSum="3" + android:baselineAligned="false" + android:minHeight="60dp"> + - - - + android:id="@+id/lock_icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_gravity="center" + android:scaleType="center"/> + + + + + + + + + + + + + + + + + + + + + + + +