sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-16 11:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix issues with challenge form

Browse source
This commit is contained in:
Phillip Thelen 2020-11-16 13:04:54 +01:00
parent 21b42b4f3c
commit a849140012
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Habitica/res/layout/activity_create_challenge.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Toolbar"
android:theme="@style/Toolbar.Modern"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
@ -49,6 +49,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="?textColorPrimaryDark"
app:boxBackgroundColor="@color/brand_background"
app:hintTextAppearance="@style/TextAppearance.AppCompat"
android:id="@+id/create_challenge_title_input_layout">
@ -70,8 +71,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="?textColorPrimaryDark"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
app:boxBackgroundColor="@color/brand_background"
app:hintTextAppearance="@style/TextAppearance.AppCompat"
android:layout_marginBottom="12dp"
android:layout_marginTop="12dp">
<EditText
android:layout_width="match_parent"
@ -125,13 +128,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="28dp">
<Button
<ImageButton
android:id="@+id/challenge_add_gem_btn"
style="@style/Body1_Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableStart="@drawable/challenge_gem_add_button"/>
android:tint="@color/brand_background"
android:src="@drawable/challenge_gem_add_button"/>
<ImageView
android:id="@+id/gem_icon_view"
@ -151,13 +155,14 @@
android:id="@+id/create_challenge_prize"
android:textAlignment="center" />
<Button
<ImageButton
android:id="@+id/challenge_remove_gem_btn"
style="@style/Body1_Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableEnd="@drawable/challenge_gem_remove_button"/>
android:tint="@color/brand_background"
android:src="@drawable/challenge_gem_remove_button"/>
</LinearLayout>
@ -191,7 +196,7 @@
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:id="@+id/create_challenge_tag_input_layout"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -211,6 +216,7 @@
style="@style/Subheader2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/tasks" />
<TextView

12
Habitica/res/layout/challenge_add_task_item.xml
View file

@ -4,12 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#FFF"
android:orientation="vertical"
android:gravity="center">
<Button
<com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
@ -17,12 +16,9 @@
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:textAllCaps="false"
style="@style/Subheader2"
android:textColor="?colorAccent"
android:background="#f9f9f9"
style="@style/HabiticaButton.Gray"
android:id="@+id/btn_add_task"
tools:text="Add habit">
</Button>
</com.google.android.material.button.MaterialButton>
</LinearLayout>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -324,7 +324,7 @@ class ChallengeFormActivity : BaseActivity() {
locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
compositeSubscription.add(socialRepository.getUserGroups("guild").zipWith(userRepository.getUser()
.map { "" }
.map { it.party?.id ?: "" }
.distinctUntilChanged()
.flatMap {
if (it.isBlank()) {