Code style cleanup.

Replaces Fragment with MCFragment.
This commit is contained in:
Tom Hicks
2021-06-25 14:31:49 -07:00
parent 03965f5ad7
commit 0d1ab5a6d5
5 changed files with 15 additions and 13 deletions

View File

@@ -8,7 +8,6 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry; import androidx.navigation.NavBackStackEntry;
import androidx.navigation.NavController; import androidx.navigation.NavController;
@@ -21,6 +20,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.majinnaibu.monstercards.R; import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback; import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
import com.majinnaibu.monstercards.utils.Logger; import com.majinnaibu.monstercards.utils.Logger;
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
/** /**
* A fragment representing a list of Items. * A fragment representing a list of Items.
*/ */
public class EditConditionImmunitiesFragment extends Fragment { public class EditConditionImmunitiesFragment extends MCFragment {
private EditMonsterViewModel mViewModel; private EditMonsterViewModel mViewModel;
private ViewHolder mHolder; private ViewHolder mHolder;
@@ -90,4 +90,4 @@ public class EditConditionImmunitiesFragment extends Fragment {
addConditionImmunity = root.findViewById(R.id.add_condition_immunity); addConditionImmunity = root.findViewById(R.id.add_condition_immunity);
} }
} }
} }

View File

@@ -9,17 +9,17 @@ import android.widget.EditText;
import androidx.activity.OnBackPressedCallback; import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry; import androidx.navigation.NavBackStackEntry;
import androidx.navigation.NavController; import androidx.navigation.NavController;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
import com.majinnaibu.monstercards.R; import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.utils.Logger; import com.majinnaibu.monstercards.utils.Logger;
import com.majinnaibu.monstercards.utils.TextChangedListener; import com.majinnaibu.monstercards.utils.TextChangedListener;
public class EditConditionImmunityFragment extends Fragment { public class EditConditionImmunityFragment extends MCFragment {
private EditMonsterViewModel mEditMonsterViewModel; private EditMonsterViewModel mEditMonsterViewModel;
private EditStringViewModel mViewModel; private EditStringViewModel mViewModel;
private ViewHolder mHolder; private ViewHolder mHolder;
@@ -71,4 +71,4 @@ public class EditConditionImmunityFragment extends Fragment {
description = root.findViewById(R.id.description); description = root.findViewById(R.id.description);
} }
} }
} }

View File

@@ -25,6 +25,7 @@ public class EditDamageImmunitiesRecyclerViewAdapter extends RecyclerView.Adapte
mOnClick = onClick; mOnClick = onClick;
} }
@NotNull @NotNull
@Override @Override
public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
@@ -60,10 +61,11 @@ public class EditDamageImmunitiesRecyclerViewAdapter extends RecyclerView.Adapte
mContentView = binding.content; mContentView = binding.content;
} }
@NotNull @NotNull
@Override @Override
public String toString() { public String toString() {
return super.toString() + " '" + mContentView.getText() + "'"; return super.toString() + " '" + mContentView.getText() + "'";
} }
} }
} }

View File

@@ -66,4 +66,4 @@ public class EditDamageResistancesRecyclerViewAdapter extends RecyclerView.Adapt
return super.toString() + " '" + mContentView.getText() + "'"; return super.toString() + " '" + mContentView.getText() + "'";
} }
} }
} }

View File

@@ -1,9 +1,9 @@
<resources> <resources>
<string name="action_add_condition_immunity">Add Condition</string>
<string name="action_add_language">Add Language</string>
<string name="action_add_monster">Add monster</string> <string name="action_add_monster">Add monster</string>
<string name="action_add_sense">Add Sense</string> <string name="action_add_sense">Add Sense</string>
<string name="action_add_skill">Add Skill</string> <string name="action_add_skill">Add Skill</string>
<string name="action_add_language">Add Language</string>
<string name="action_add_condition_immunity">Add Condition</string>
<string name="action_edit">Edit</string> <string name="action_edit">Edit</string>
<string name="actions_label">Actions</string> <string name="actions_label">Actions</string>
<string name="app_name">MonsterCards</string> <string name="app_name">MonsterCards</string>
@@ -26,6 +26,7 @@
<string name="label_basic_info">Basic Info</string> <string name="label_basic_info">Basic Info</string>
<string name="label_burrow_speed">Burrow Speed</string> <string name="label_burrow_speed">Burrow Speed</string>
<string name="label_can_hover">Can Hover</string> <string name="label_can_hover">Can Hover</string>
<string name="label_can_speak_language">Can Speak</string>
<string name="label_challenge_rating">Challenge Rating</string> <string name="label_challenge_rating">Challenge Rating</string>
<string name="label_charisma">Charisma</string> <string name="label_charisma">Charisma</string>
<string name="label_climb_speed">Climb Speed</string> <string name="label_climb_speed">Climb Speed</string>
@@ -38,8 +39,10 @@
<string name="label_custom_speed">Custom Speed</string> <string name="label_custom_speed">Custom Speed</string>
<string name="label_damage_immunities">Damage Immunities</string> <string name="label_damage_immunities">Damage Immunities</string>
<string name="label_damage_resistances">Damage Resistances</string> <string name="label_damage_resistances">Damage Resistances</string>
<string name="label_damage_type">Damage Type</string>
<string name="label_damage_vulnerabilities">Damage Vulnerabilities</string> <string name="label_damage_vulnerabilities">Damage Vulnerabilities</string>
<string name="label_decrement_field">-</string> <string name="label_decrement_field">-</string>
<string name="label_description">Description</string>
<string name="label_dexterity">Dexterity</string> <string name="label_dexterity">Dexterity</string>
<string name="label_fly_speed">Fly Speed</string> <string name="label_fly_speed">Fly Speed</string>
<string name="label_has_custom_hp">Has Custom HP</string> <string name="label_has_custom_hp">Has Custom HP</string>
@@ -83,8 +86,5 @@
<string name="title_library">Library</string> <string name="title_library">Library</string>
<string name="title_search">Search</string> <string name="title_search">Search</string>
<string name="wisdom_abbreviation">WIS</string> <string name="wisdom_abbreviation">WIS</string>
<string name="label_description">Description</string>
<string name="label_damage_type">Damage Type</string>
<string name="add_damage_type">Add Damage Type</string> <string name="add_damage_type">Add Damage Type</string>
<string name="label_can_speak_language">Can Speak</string>
</resources> </resources>