diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java index ef9b60a..ceb4b03 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java @@ -8,7 +8,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.NavBackStackEntry; import androidx.navigation.NavController; @@ -21,6 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.majinnaibu.monstercards.R; +import com.majinnaibu.monstercards.ui.shared.MCFragment; import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback; import com.majinnaibu.monstercards.utils.Logger; @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; /** * A fragment representing a list of Items. */ -public class EditConditionImmunitiesFragment extends Fragment { +public class EditConditionImmunitiesFragment extends MCFragment { private EditMonsterViewModel mViewModel; private ViewHolder mHolder; @@ -90,4 +90,4 @@ public class EditConditionImmunitiesFragment extends Fragment { addConditionImmunity = root.findViewById(R.id.add_condition_immunity); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunityFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunityFragment.java index 4a37439..7bbdc07 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunityFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunityFragment.java @@ -9,17 +9,17 @@ import android.widget.EditText; import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.NavBackStackEntry; import androidx.navigation.NavController; import androidx.navigation.Navigation; import com.majinnaibu.monstercards.R; +import com.majinnaibu.monstercards.ui.shared.MCFragment; import com.majinnaibu.monstercards.utils.Logger; import com.majinnaibu.monstercards.utils.TextChangedListener; -public class EditConditionImmunityFragment extends Fragment { +public class EditConditionImmunityFragment extends MCFragment { private EditMonsterViewModel mEditMonsterViewModel; private EditStringViewModel mViewModel; private ViewHolder mHolder; @@ -71,4 +71,4 @@ public class EditConditionImmunityFragment extends Fragment { description = root.findViewById(R.id.description); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesRecyclerViewAdapter.java index f70a6b8..018705c 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesRecyclerViewAdapter.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesRecyclerViewAdapter.java @@ -25,6 +25,7 @@ public class EditDamageImmunitiesRecyclerViewAdapter extends RecyclerView.Adapte mOnClick = onClick; } + @NotNull @Override public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) { @@ -60,10 +61,11 @@ public class EditDamageImmunitiesRecyclerViewAdapter extends RecyclerView.Adapte mContentView = binding.content; } + @NotNull @Override public String toString() { return super.toString() + " '" + mContentView.getText() + "'"; } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesRecyclerViewAdapter.java index fd05efb..c823d20 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesRecyclerViewAdapter.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesRecyclerViewAdapter.java @@ -66,4 +66,4 @@ public class EditDamageResistancesRecyclerViewAdapter extends RecyclerView.Adapt return super.toString() + " '" + mContentView.getText() + "'"; } } -} \ No newline at end of file +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9230d5e..a594101 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ + Add Condition + Add Language Add monster Add Sense Add Skill - Add Language - Add Condition Edit Actions MonsterCards @@ -26,6 +26,7 @@ Basic Info Burrow Speed Can Hover + Can Speak Challenge Rating Charisma Climb Speed @@ -38,8 +39,10 @@ Custom Speed Damage Immunities Damage Resistances + Damage Type Damage Vulnerabilities - + Description Dexterity Fly Speed Has Custom HP @@ -83,8 +86,5 @@ Library Search WIS - Description - Damage Type Add Damage Type - Can Speak \ No newline at end of file