front-end changes

This commit is contained in:
Zoe Abrams 2020-03-13 12:27:11 -07:00
parent 9d93b12788
commit 5243f694b4
13 changed files with 81 additions and 24 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!--Infrastructure for animated button-->
<!--item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/picture" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/picture_pressed" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/picture_pressed" /-->
<item android:drawable="@drawable/party_invite_accept" />
</selector>

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!--Infrastructure for animated button-->
<!--item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/picture" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/picture_pressed" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/picture_pressed" /-->
<item android:drawable="@drawable/party_invite_reject" />
</selector>

View file

@ -1,32 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/text_view"
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/invited_to_party" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="end">
style="@style/CardView.Default"
android:id="@+id/party_invitation_wrapper">
<LinearLayout
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/CardContent">
<Button
android:id="@+id/accept_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/quest_accept"
android:textColor="@color/btn_success"
style="?android:buttonBarButtonStyle" />
<com.habitrpg.android.habitica.ui.AvatarView
android:id="@+id/groupleader_avatar_view"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
app:showMount="false"
app:showPet="false" />
<Button
android:id="@+id/reject_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/quest_reject"
android:textColor="@color/btn_danger"
style="?android:buttonBarButtonStyle" />
</LinearLayout>
<TextView
android:id="@+id/groupleader_text_view"
android:layout_width="@dimen/party_invite_text_width"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/party_invite_separator"
android:text="@string/invitation_title" />
<Space
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginEnd="@dimen/party_invite_separator"
android:layout_gravity="end|center_vertical|fill_horizontal">
<Button
android:id="@+id/accept_button"
android:layout_width="@dimen/party_invite_button"
android:layout_height="@dimen/party_invite_button"
android:layout_marginEnd="@dimen/party_accept_button_start_margin"
android:background="@drawable/party_invite_accept" />
<Button
android:id="@+id/reject_button"
android:layout_width="@dimen/party_invite_button"
android:layout_height="@dimen/party_invite_button"
android:layout_marginStart="@dimen/party_accept_button_start_margin"
android:background="@drawable/party_invite_reject" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

View file

@ -13,6 +13,12 @@
<dimen name="section_top_padding">16dp</dimen>
<dimen name="card_margin">6dp</dimen>
<dimen name="party_invite_button">31dp</dimen>
<dimen name="party_accept_button_start_margin">5dp</dimen>
<dimen name="party_invite_avatar">46dp</dimen>
<dimen name="party_invite_separator">4dp</dimen>
<dimen name="party_invite_text_width">140dp</dimen>
<dimen name="bar_size">15dp</dimen>
<dimen name="bar_padding">5dp</dimen>
<dimen name="bar_padding_small">2dp</dimen>

View file

@ -888,7 +888,7 @@
<string name="id_copied">Copied User ID to clipboard</string>
<string name="copy_username">Copy Username</string>
<string name="password_too_short">Your password has to be at least %d characters long</string>
<string name="invitation_title">%s invited you to %s</string>
<string name="invitation_title">%s invited you to join their group %s</string>
<string name="someone">Someone</string>
<string name="authentication_methods">Authentication Methods</string>
<string name="local">local</string>