maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames MonsterFragment to MonsterDetailFragment to better explain its use.

Browse Source
This commit is contained in:
Tom Hicks
2021-05-02 01:30:39 -07:00
parent 3a3cd04010
commit ff379521c0
5 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
View File

@@ -35,7 +35,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
public class LibraryFragment extends MCFragment { public class LibraryFragment extends MCFragment {
// TODO: TOM: rename MonsterFragment MonsterDetailFragment
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { ViewGroup container, Bundle savedInstanceState) {

55
app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java → app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java
View File

@@ -28,19 +28,18 @@ import java.util.UUID;
import io.reactivex.rxjava3.observers.DisposableSingleObserver; import io.reactivex.rxjava3.observers.DisposableSingleObserver;
@SuppressWarnings("FieldCanBeLocal") public class MonsterDetailFragment extends MCFragment {
public class MonsterFragment extends MCFragment {
private MonsterViewModel monsterViewModel; private MonsterDetailViewModel monsterDetailViewModel;
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { ViewGroup container, Bundle savedInstanceState) {
MonsterRepository repository = getMonsterRepository(); MonsterRepository repository = getMonsterRepository();
Bundle arguments = getArguments(); Bundle arguments = getArguments();
assert arguments != null; assert arguments != null;
UUID monsterId = UUID.fromString(MonsterFragmentArgs.fromBundle(arguments).getMonsterId()); UUID monsterId = UUID.fromString(MonsterDetailFragmentArgs.fromBundle(arguments).getMonsterId());
monsterViewModel = new ViewModelProvider(this).get(MonsterViewModel.class); monsterDetailViewModel = new ViewModelProvider(this).get(MonsterDetailViewModel.class);
View root = inflater.inflate(R.layout.fragment_monster, container, false); View root = inflater.inflate(R.layout.fragment_monster, container, false);
repository.getMonster(monsterId).toObservable() repository.getMonster(monsterId).toObservable()
@@ -48,7 +47,7 @@ public class MonsterFragment extends MCFragment {
.subscribe(new DisposableSingleObserver<Monster>() { .subscribe(new DisposableSingleObserver<Monster>() {
@Override @Override
public void onSuccess(@io.reactivex.rxjava3.annotations.NonNull Monster monster) { public void onSuccess(@io.reactivex.rxjava3.annotations.NonNull Monster monster) {
monsterViewModel.setMonster(monster); monsterDetailViewModel.setMonster(monster);
dispose(); dispose();
} }
@@ -60,40 +59,40 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterName = root.findViewById(R.id.name); final TextView monsterName = root.findViewById(R.id.name);
monsterViewModel.getName().observe(getViewLifecycleOwner(), monsterName::setText); monsterDetailViewModel.getName().observe(getViewLifecycleOwner(), monsterName::setText);
final TextView monsterMeta = root.findViewById(R.id.meta); final TextView monsterMeta = root.findViewById(R.id.meta);
monsterViewModel.getMeta().observe(getViewLifecycleOwner(), monsterMeta::setText); monsterDetailViewModel.getMeta().observe(getViewLifecycleOwner(), monsterMeta::setText);
final TextView monsterArmorClass = root.findViewById(R.id.armor_class); final TextView monsterArmorClass = root.findViewById(R.id.armor_class);
monsterViewModel.getArmorClass().observe(getViewLifecycleOwner(), armorText -> monsterArmorClass.setText(Html.fromHtml("<b>Armor Class</b> " + armorText))); monsterDetailViewModel.getArmorClass().observe(getViewLifecycleOwner(), armorText -> monsterArmorClass.setText(Html.fromHtml("<b>Armor Class</b> " + armorText)));
final TextView monsterHitPoints = root.findViewById(R.id.hit_points); final TextView monsterHitPoints = root.findViewById(R.id.hit_points);
monsterViewModel.getHitPoints().observe(getViewLifecycleOwner(), hitPoints -> monsterHitPoints.setText(Html.fromHtml("<b>Hit Points</b> " + hitPoints))); monsterDetailViewModel.getHitPoints().observe(getViewLifecycleOwner(), hitPoints -> monsterHitPoints.setText(Html.fromHtml("<b>Hit Points</b> " + hitPoints)));
final TextView monsterSpeed = root.findViewById(R.id.speed); final TextView monsterSpeed = root.findViewById(R.id.speed);
monsterViewModel.getSpeed().observe(getViewLifecycleOwner(), speed -> monsterSpeed.setText(Html.fromHtml("<b>Speed</b> " + speed))); monsterDetailViewModel.getSpeed().observe(getViewLifecycleOwner(), speed -> monsterSpeed.setText(Html.fromHtml("<b>Speed</b> " + speed)));
final TextView monsterStrength = root.findViewById(R.id.strength); final TextView monsterStrength = root.findViewById(R.id.strength);
monsterViewModel.getStrength().observe(getViewLifecycleOwner(), monsterStrength::setText); monsterDetailViewModel.getStrength().observe(getViewLifecycleOwner(), monsterStrength::setText);
final TextView monsterDexterity = root.findViewById(R.id.dexterity); final TextView monsterDexterity = root.findViewById(R.id.dexterity);
monsterViewModel.getDexterity().observe(getViewLifecycleOwner(), monsterDexterity::setText); monsterDetailViewModel.getDexterity().observe(getViewLifecycleOwner(), monsterDexterity::setText);
final TextView monsterConstitution = root.findViewById(R.id.constitution); final TextView monsterConstitution = root.findViewById(R.id.constitution);
monsterViewModel.getConstitution().observe(getViewLifecycleOwner(), monsterConstitution::setText); monsterDetailViewModel.getConstitution().observe(getViewLifecycleOwner(), monsterConstitution::setText);
final TextView monsterIntelligence = root.findViewById(R.id.intelligence); final TextView monsterIntelligence = root.findViewById(R.id.intelligence);
monsterViewModel.getIntelligence().observe(getViewLifecycleOwner(), monsterIntelligence::setText); monsterDetailViewModel.getIntelligence().observe(getViewLifecycleOwner(), monsterIntelligence::setText);
final TextView monsterWisdom = root.findViewById(R.id.wisdom); final TextView monsterWisdom = root.findViewById(R.id.wisdom);
monsterViewModel.getWisdom().observe(getViewLifecycleOwner(), monsterWisdom::setText); monsterDetailViewModel.getWisdom().observe(getViewLifecycleOwner(), monsterWisdom::setText);
final TextView monsterCharisma = root.findViewById(R.id.charisma); final TextView monsterCharisma = root.findViewById(R.id.charisma);
monsterViewModel.getCharisma().observe(getViewLifecycleOwner(), monsterCharisma::setText); monsterDetailViewModel.getCharisma().observe(getViewLifecycleOwner(), monsterCharisma::setText);
final TextView monsterSavingThrows = root.findViewById(R.id.saving_throws); final TextView monsterSavingThrows = root.findViewById(R.id.saving_throws);
monsterViewModel.getSavingThrows().observe(getViewLifecycleOwner(), savingThrows -> { monsterDetailViewModel.getSavingThrows().observe(getViewLifecycleOwner(), savingThrows -> {
if (StringHelper.isNullOrEmpty(savingThrows)) { if (StringHelper.isNullOrEmpty(savingThrows)) {
monsterSavingThrows.setVisibility(View.GONE); monsterSavingThrows.setVisibility(View.GONE);
} else { } else {
@@ -103,7 +102,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterSkills = root.findViewById(R.id.skills); final TextView monsterSkills = root.findViewById(R.id.skills);
monsterViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> { monsterDetailViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> {
if (StringHelper.isNullOrEmpty(skills)) { if (StringHelper.isNullOrEmpty(skills)) {
monsterSkills.setVisibility(View.GONE); monsterSkills.setVisibility(View.GONE);
} else { } else {
@@ -113,7 +112,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterDamageVulnerabilities = root.findViewById(R.id.damage_vulnerabilities); final TextView monsterDamageVulnerabilities = root.findViewById(R.id.damage_vulnerabilities);
monsterViewModel.getDamageVulnerabilities().observe(getViewLifecycleOwner(), damageType -> { monsterDetailViewModel.getDamageVulnerabilities().observe(getViewLifecycleOwner(), damageType -> {
if (StringHelper.isNullOrEmpty(damageType)) { if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageVulnerabilities.setVisibility(View.GONE); monsterDamageVulnerabilities.setVisibility(View.GONE);
} else { } else {
@@ -123,7 +122,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterDamageResistances = root.findViewById(R.id.damage_resistances); final TextView monsterDamageResistances = root.findViewById(R.id.damage_resistances);
monsterViewModel.getDamageResistances().observe(getViewLifecycleOwner(), damageType -> { monsterDetailViewModel.getDamageResistances().observe(getViewLifecycleOwner(), damageType -> {
if (StringHelper.isNullOrEmpty(damageType)) { if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageResistances.setVisibility(View.GONE); monsterDamageResistances.setVisibility(View.GONE);
} else { } else {
@@ -133,7 +132,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterDamageImmunities = root.findViewById(R.id.damage_immunities); final TextView monsterDamageImmunities = root.findViewById(R.id.damage_immunities);
monsterViewModel.getDamageImmunities().observe(getViewLifecycleOwner(), damageType -> { monsterDetailViewModel.getDamageImmunities().observe(getViewLifecycleOwner(), damageType -> {
if (StringHelper.isNullOrEmpty(damageType)) { if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageImmunities.setVisibility(View.GONE); monsterDamageImmunities.setVisibility(View.GONE);
} else { } else {
@@ -143,7 +142,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterConditionImmunities = root.findViewById(R.id.condition_immunities); final TextView monsterConditionImmunities = root.findViewById(R.id.condition_immunities);
monsterViewModel.getConditionImmunities().observe(getViewLifecycleOwner(), conditionImmunities -> { monsterDetailViewModel.getConditionImmunities().observe(getViewLifecycleOwner(), conditionImmunities -> {
if (StringHelper.isNullOrEmpty(conditionImmunities)) { if (StringHelper.isNullOrEmpty(conditionImmunities)) {
monsterConditionImmunities.setVisibility(View.GONE); monsterConditionImmunities.setVisibility(View.GONE);
} else { } else {
@@ -153,7 +152,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterSenses = root.findViewById(R.id.senses); final TextView monsterSenses = root.findViewById(R.id.senses);
monsterViewModel.getSenses().observe(getViewLifecycleOwner(), senses -> { monsterDetailViewModel.getSenses().observe(getViewLifecycleOwner(), senses -> {
if (StringHelper.isNullOrEmpty(senses)) { if (StringHelper.isNullOrEmpty(senses)) {
monsterSenses.setVisibility(View.GONE); monsterSenses.setVisibility(View.GONE);
} else { } else {
@@ -163,7 +162,7 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterLanguages = root.findViewById(R.id.languages); final TextView monsterLanguages = root.findViewById(R.id.languages);
monsterViewModel.getLanguages().observe(getViewLifecycleOwner(), languages -> { monsterDetailViewModel.getLanguages().observe(getViewLifecycleOwner(), languages -> {
if (StringHelper.isNullOrEmpty(languages)) { if (StringHelper.isNullOrEmpty(languages)) {
monsterLanguages.setVisibility(View.GONE); monsterLanguages.setVisibility(View.GONE);
} else { } else {
@@ -173,10 +172,10 @@ public class MonsterFragment extends MCFragment {
}); });
final TextView monsterChallenge = root.findViewById(R.id.challenge); final TextView monsterChallenge = root.findViewById(R.id.challenge);
monsterViewModel.getChallenge().observe(getViewLifecycleOwner(), challengeRating -> monsterChallenge.setText(Html.fromHtml("<b>Challenge</b> " + challengeRating))); monsterDetailViewModel.getChallenge().observe(getViewLifecycleOwner(), challengeRating -> monsterChallenge.setText(Html.fromHtml("<b>Challenge</b> " + challengeRating)));
final LinearLayout monsterAbilities = root.findViewById(R.id.abilities); final LinearLayout monsterAbilities = root.findViewById(R.id.abilities);
monsterViewModel.getAbilities().observe(getViewLifecycleOwner(), abilities -> { monsterDetailViewModel.getAbilities().observe(getViewLifecycleOwner(), abilities -> {
Context context = getContext(); Context context = getContext();
DisplayMetrics displayMetrics = null; DisplayMetrics displayMetrics = null;
if (context != null) { if (context != null) {
@@ -202,7 +201,7 @@ public class MonsterFragment extends MCFragment {
}); });
final LinearLayout monsterActions = root.findViewById(R.id.actions); final LinearLayout monsterActions = root.findViewById(R.id.actions);
monsterViewModel.getActions().observe(getViewLifecycleOwner(), actions -> { monsterDetailViewModel.getActions().observe(getViewLifecycleOwner(), actions -> {
Context context = getContext(); Context context = getContext();
DisplayMetrics displayMetrics = null; DisplayMetrics displayMetrics = null;
if (context != null) { if (context != null) {

4
app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java → app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailViewModel.java
View File

@@ -9,9 +9,9 @@ import com.majinnaibu.monstercards.models.Monster;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class MonsterViewModel extends ViewModel { public class MonsterDetailViewModel extends ViewModel {
public MonsterViewModel() { public MonsterDetailViewModel() {
mMonster = null; mMonster = null;
mAbilities = new MutableLiveData<>(); mAbilities = new MutableLiveData<>();
mAbilities.setValue(new ArrayList<>()); mAbilities.setValue(new ArrayList<>());

2
app/src/main/res/layout/fragment_monster.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.monster.MonsterFragment"> tools:context=".ui.monster.MonsterDetailFragment">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

10
app/src/main/res/navigation/mobile_navigation.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/navigation_search" android:id="@+id/navigation_search"
android:name="com.majinnaibu.monstercards.ui.search.SearchFragment" android:name="com.majinnaibu.monstercards.ui.search.SearchFragment"
android:label="@string/title_search" android:label="@string/title_search"
tools:layout="@layout/fragment_search" > tools:layout="@layout/fragment_search">
<action <action
android:id="@+id/action_navigation_search_to_navigation_monster" android:id="@+id/action_navigation_search_to_navigation_monster"
app:destination="@id/navigation_monster" /> app:destination="@id/navigation_monster" />
@@ -19,7 +19,7 @@
android:id="@+id/navigation_dashboard" android:id="@+id/navigation_dashboard"
android:name="com.majinnaibu.monstercards.ui.dashboard.DashboardFragment" android:name="com.majinnaibu.monstercards.ui.dashboard.DashboardFragment"
android:label="@string/title_dashboard" android:label="@string/title_dashboard"
tools:layout="@layout/fragment_dashboard" > tools:layout="@layout/fragment_dashboard">
<action <action
android:id="@+id/action_navigation_dashboard_to_navigation_monster" android:id="@+id/action_navigation_dashboard_to_navigation_monster"
app:destination="@id/navigation_monster" /> app:destination="@id/navigation_monster" />
@@ -29,7 +29,7 @@
android:id="@+id/navigation_collections" android:id="@+id/navigation_collections"
android:name="com.majinnaibu.monstercards.ui.collections.CollectionsFragment" android:name="com.majinnaibu.monstercards.ui.collections.CollectionsFragment"
android:label="@string/title_collections" android:label="@string/title_collections"
tools:layout="@layout/fragment_collections" > tools:layout="@layout/fragment_collections">
<action <action
android:id="@+id/action_navigation_collections_to_navigation_monster" android:id="@+id/action_navigation_collections_to_navigation_monster"
app:destination="@id/navigation_monster" /> app:destination="@id/navigation_monster" />
@@ -39,7 +39,7 @@
android:id="@+id/navigation_library" android:id="@+id/navigation_library"
android:name="com.majinnaibu.monstercards.ui.library.LibraryFragment" android:name="com.majinnaibu.monstercards.ui.library.LibraryFragment"
android:label="@string/title_library" android:label="@string/title_library"
tools:layout="@layout/fragment_library" > tools:layout="@layout/fragment_library">
<action <action
android:id="@+id/action_navigation_library_to_navigation_monster" android:id="@+id/action_navigation_library_to_navigation_monster"
app:destination="@id/navigation_monster" /> app:destination="@id/navigation_monster" />
@@ -47,7 +47,7 @@
<fragment <fragment
android:id="@+id/navigation_monster" android:id="@+id/navigation_monster"
android:name="com.majinnaibu.monstercards.ui.monster.MonsterFragment" android:name="com.majinnaibu.monstercards.ui.monster.MonsterDetailFragment"
android:label="Monster" android:label="Monster"
tools:layout="@layout/fragment_monster"> tools:layout="@layout/fragment_monster">
<argument <argument