Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tag category titles to filters #2015

Closed
wants to merge 26 commits into from
Closed

Add tag category titles to filters #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
60e6cb0
Choose class flow update
Hafizzle Jun 28, 2023
7f94f41
String resources for changing/setting class
Hafizzle Jun 28, 2023
b74ead1
Class change dialog updates
Hafizzle Jun 28, 2023
eb5328b
Base Dialog updates
Hafizzle Jun 29, 2023
6abb79e
Revert Insufficient gem button color change
Hafizzle Jun 29, 2023
e139b37
Match web implementation for tags / order tags
Hafizzle Jun 30, 2023
0e59520
Updated regex to allow uppercase
Hafizzle Jul 5, 2023
7bc1a21
Add isUserSupport permission check
Hafizzle Jul 5, 2023
43a14f4
Handle non-HTTPExceptions & continue flow if consume fails & no error
Hafizzle Jul 5, 2023
b10aab0
Merge pull request #2005 from Hafizzle/Fiz/class-selection-flow-update
phillipthelen Jul 7, 2023
fd8e014
Merge pull request #2008 from Hafizzle/Fiz/username-case-sensitivity
phillipthelen Jul 7, 2023
bfcd425
Merge pull request #2009 from Hafizzle/Fiz/support_priviledges
phillipthelen Jul 7, 2023
057ecd7
Merge pull request #2010 from Hafizzle/Fiz/gem-package-purchase-fix
phillipthelen Jul 7, 2023
c93fbca
Merge pull request #2007 from Hafizzle/Fiz/tags-order-update
phillipthelen Jul 7, 2023
ca13016
fix mod oprations
phillipthelen Jun 23, 2023
41b4639
adjust wording
phillipthelen Jun 23, 2023
80a4bc2
optimize number abbreviation
phillipthelen Jun 23, 2023
fc97342
bump build number
phillipthelen Jun 27, 2023
cb07544
wearos adjustments
phillipthelen Jul 7, 2023
c9e9d46
Navigate to party chat when tapping party chat notification
Hafizzle Jul 10, 2023
53f9d88
Remove dismissible in-app notification immediately
Hafizzle Jul 10, 2023
f5159e1
Revert activity_death layout changes and add a scrollview
Hafizzle Jul 10, 2023
6f40e63
Update question form
Hafizzle Jul 11, 2023
870c97a
Change class flow fixes
Hafizzle Jul 12, 2023
fa668a7
Add tag titles to task filter and change tag title strings
Hafizzle Jul 12, 2023
ef6943f
Merge branch 'version/4.3.0' into Fiz/tag-filter-update
phillipthelen Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Habitica/res/layout/activity_class_selection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
android:layout_height="wrap_content"
tools:text="@string/healer_description"
android:gravity="center_horizontal"
style="@style/Body2"
style="@style/Body4"
android:lineSpacingExtra="4sp"/>
</ScrollView>
<TextView
Expand Down
167 changes: 79 additions & 88 deletions Habitica/res/layout/activity_death.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,111 +9,102 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />

<RelativeLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingHorizontal="23dp">
android:fillViewport="true">

<RelativeLayout
android:id="@+id/ghost_container"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="157dp"
android:layout_above="@id/loss_health_title"
android:layout_marginTop="@dimen/spacing_xlarge"
android:layout_marginBottom="@dimen/spacing_xlarge">
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingHorizontal="23dp">

<ImageView
android:id="@+id/ghost_view"
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/death_ghost" />

<ImageView
android:id="@+id/heart_view"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_broken_heart" />
</RelativeLayout>

<TextView
android:id="@+id/loss_health_title"
style="@style/Title2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/loss_description"
android:layout_marginHorizontal="@dimen/spacing_xlarge"
android:gravity="center"
android:text="@string/you_ran_out_of_health"
android:textStyle="bold" />
android:layout_height="0dp"
android:layout_weight="1" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="157dp">

<ImageView
android:id="@+id/ghost_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/death_ghost" />

<ImageView
android:id="@+id/heart_view"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_broken_heart" />
</RelativeLayout>

<TextView
android:id="@+id/loss_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginHorizontal="@dimen/spacing_xlarge"
android:layout_marginVertical="@dimen/spacing_medium"
android:gravity="center"
android:lineSpacingExtra="4dp"
android:textColor="@color/text_primary"
android:textSize="20sp" />

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/restart_button"
android:layout_below="@id/loss_description"
android:layout_marginTop="@dimen/spacing_medium">
<TextView
style="@style/Title2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacing_xlarge"
android:gravity="center"
android:text="@string/you_ran_out_of_health"
android:textStyle="bold" />

<TextView
android:id="@+id/loss_sub_description"
android:id="@+id/loss_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacing_large"
android:layout_marginHorizontal="@dimen/spacing_xlarge"
android:layout_marginVertical="@dimen/spacing_medium"
android:gravity="center"
android:lineSpacingExtra="4dp"
android:textColor="@color/text_primary"
android:textSize="20sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacing_xlarge"
android:gravity="center"
android:lineSpacingExtra="4dp"
android:text="@string/death_description"
android:textColor="@color/text_secondary"
android:textSize="20sp" />

<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />

<Button
android:id="@+id/restart_button"
style="@style/HabiticaButton.Maroon"
android:layout_width="match_parent"
android:layout_height="69dp"
android:layout_marginBottom="6dp"
android:text="@string/faint_button"
android:textStyle="bold" />

<com.habitrpg.android.habitica.ui.views.ads.AdButton
android:id="@+id/ad_button"
android:layout_width="match_parent"
android:layout_height="60dp"
app:activeBackground="@drawable/ad_button_background_content"
app:text="@string/watch_ad_to_open"
app:textColor="@color/text_primary" />

</androidx.core.widget.NestedScrollView>


<Button
android:id="@+id/restart_button"
style="@style/HabiticaButton.Maroon"
android:layout_width="match_parent"
android:layout_height="69dp"
android:layout_above="@id/ad_button"
android:layout_marginBottom="6dp"
android:text="@string/faint_button"
android:textStyle="bold" />

<com.habitrpg.android.habitica.ui.views.ads.AdButton
android:id="@+id/ad_button"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_above="@id/broken_equipment_text"
app:activeBackground="@drawable/ad_button_background_content"
app:text="@string/watch_ad_to_open"
app:textColor="@color/text_primary" />

<TextView
android:id="@+id/broken_equipment_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/spacing_large"
android:gravity="center"
android:text="@string/faint_broken_equipment"
android:textColor="@color/text_quad" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_large"
android:gravity="center"
android:text="@string/faint_broken_equipment"
android:textColor="@color/text_quad" />
</LinearLayout>
</ScrollView>
</FrameLayout>
3 changes: 1 addition & 2 deletions Habitica/res/layout/dialog_habitica_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@
android:paddingBottom="@dimen/spacing_medium"
android:paddingStart="@dimen/alert_side_padding"
android:paddingEnd="@dimen/alert_side_padding"
android:textColor="?textColorSecondary"
android:scrollbars = "vertical"
style="@style/Body2"
style="@style/Body4"
/>
<com.habitrpg.android.habitica.ui.views.login.LockableScrollView
android:id="@+id/main_scroll_view"
Expand Down
2 changes: 1 addition & 1 deletion Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="48dp"
style="@style/HabiticaButton.Red">
style="@style/HabiticaButton.Maroon">
</Button>
Loading
Loading