Replaces condition immunities, damage immunities, damage resistances, damage vulnerabilities, and senses with a unified list of strings editor.
This commit is contained in:
		| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditConditionImmunitiesFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:divider="?android:attr/dividerVertical" | ||||
|         android:dividerPadding="@dimen/text_margin" | ||||
|         app:layoutManager="LinearLayoutManager" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_condition_immunities_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_condition_immunity" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="bottom|end" | ||||
|         android:layout_margin="@dimen/fab_margin" | ||||
|         android:contentDescription="@string/action_add_condition_immunity" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:srcCompat="@android:drawable/ic_input_add" | ||||
|         app:tint="@android:color/white" /> | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,13 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="horizontal"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
| </LinearLayout> | ||||
| @@ -1,18 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditConditionImmunityFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/description" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:hint="@string/label_description" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="blinded" /> | ||||
|  | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditDamageResistancesFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:divider="?android:attr/dividerVertical" | ||||
|         android:dividerPadding="@dimen/text_margin" | ||||
|         app:layoutManager="LinearLayoutManager" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_damage_resistances_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_damage_type" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="bottom|end" | ||||
|         android:layout_margin="@dimen/fab_margin" | ||||
|         android:contentDescription="@string/action_add_damage_type" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:srcCompat="@android:drawable/ic_input_add" | ||||
|         app:tint="@android:color/white" /> | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,13 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="horizontal"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
| </LinearLayout> | ||||
| @@ -1,17 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditDamageResistanceFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/value" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:hint="@string/label_damage_type" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="bludgeoning" /> | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
| @@ -1,17 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditDamageResistanceFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/value" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:hint="@string/label_damage_type" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="bludgeoning" /> | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditDamageResistancesFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:divider="?android:attr/dividerVertical" | ||||
|         android:dividerPadding="@dimen/text_margin" | ||||
|         app:layoutManager="LinearLayoutManager" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_damage_resistances_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_damage_type" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="bottom|end" | ||||
|         android:layout_margin="@dimen/fab_margin" | ||||
|         android:contentDescription="@string/action_add_damage_type" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:srcCompat="@android:drawable/ic_input_add" | ||||
|         app:tint="@android:color/white" /> | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,13 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="horizontal"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
| </LinearLayout> | ||||
| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditDamageResistancesFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:divider="?android:attr/dividerVertical" | ||||
|         android:dividerPadding="@dimen/text_margin" | ||||
|         app:layoutManager="LinearLayoutManager" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_damage_resistances_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_damage_type" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="bottom|end" | ||||
|         android:layout_margin="@dimen/fab_margin" | ||||
|         android:contentDescription="@string/action_add_damage_type" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:srcCompat="@android:drawable/ic_input_add" | ||||
|         app:tint="@android:color/white" /> | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,13 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="horizontal"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
| </LinearLayout> | ||||
| @@ -1,17 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditDamageResistanceFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/value" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:hint="@string/label_damage_type" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="bludgeoning" /> | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
| @@ -1,17 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditSenseFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/name" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:hint="@string/label_description" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="darkvision 60 ft." /> | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditSensesFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:divider="?android:attr/dividerVertical" | ||||
|         android:dividerPadding="@dimen/text_margin" | ||||
|         app:layoutManager="LinearLayoutManager" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_senses_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_sense" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="bottom|end" | ||||
|         android:layout_margin="@dimen/fab_margin" | ||||
|         android:contentDescription="@string/action_add_sense" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:srcCompat="@android:drawable/ic_input_add" | ||||
|         app:tint="@android:color/white" /> | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,13 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="horizontal"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
| </LinearLayout> | ||||
| @@ -1,22 +1,18 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | ||||
| <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:layout_margin="@dimen/text_margin" | ||||
|     tools:context=".ui.editmonster.EditStringFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputLayout | ||||
|     <com.google.android.material.textfield.TextInputEditText | ||||
|         android:id="@+id/description" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin"> | ||||
|         android:hint="@string/label_description" | ||||
|         android:importantForAutofill="no" | ||||
|         android:inputType="text" | ||||
|         tools:text="blinded" /> | ||||
|  | ||||
|         <com.google.android.material.textfield.TextInputEditText | ||||
|             android:id="@+id/description" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:hint="@string/label_description" | ||||
|             android:importantForAutofill="no" | ||||
|             android:inputType="text" | ||||
|             tools:text="blinded" /> | ||||
|     </com.google.android.material.textfield.TextInputLayout> | ||||
| </ScrollView> | ||||
| </com.google.android.material.textfield.TextInputLayout> | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/content" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_margin="@dimen/text_margin" | ||||
|         android:textAppearance="?attr/textAppearanceListItem" /> | ||||
|   | ||||
| @@ -3,7 +3,8 @@ | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:orientation="vertical"> | ||||
|     android:orientation="vertical" | ||||
|     tools:context=".ui.editmonster.EditTraitFragment"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputLayout | ||||
|         android:layout_width="match_parent" | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     tools:context=".ui.editmonster.EditAbilitiesFragment"> | ||||
|     tools:context=".ui.editmonster.EditTraitListFragment"> | ||||
|  | ||||
|     <androidx.recyclerview.widget.RecyclerView | ||||
|         android:id="@+id/list" | ||||
| @@ -17,7 +17,7 @@ | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:listitem="@layout/fragment_edit_abilities_list_item" /> | ||||
|         tools:listitem="@layout/fragment_edit_traits_list_item" /> | ||||
|  | ||||
|     <com.google.android.material.floatingactionbutton.FloatingActionButton | ||||
|         android:id="@+id/add_trait" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tom Hicks
					Tom Hicks