ViewModel cleanup
Removes unused view models. Fixes warnings int MonsterViewModel.
This commit is contained in:
@@ -37,8 +37,6 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
|
|||||||
public class LibraryFragment extends MCFragment {
|
public class LibraryFragment extends MCFragment {
|
||||||
// TODO: TOM: rename MonsterFragment MonsterDetailFragment
|
// TODO: TOM: rename MonsterFragment MonsterDetailFragment
|
||||||
|
|
||||||
private LibraryViewModel libraryViewModel;
|
|
||||||
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater,
|
public View onCreateView(@NonNull LayoutInflater inflater,
|
||||||
ViewGroup container, Bundle savedInstanceState) {
|
ViewGroup container, Bundle savedInstanceState) {
|
||||||
View root = inflater.inflate(R.layout.fragment_library, container, false);
|
View root = inflater.inflate(R.layout.fragment_library, container, false);
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package com.majinnaibu.monstercards.ui.library;
|
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
|
||||||
import androidx.lifecycle.MutableLiveData;
|
|
||||||
import androidx.lifecycle.ViewModel;
|
|
||||||
|
|
||||||
public class LibraryViewModel extends ViewModel {
|
|
||||||
|
|
||||||
private MutableLiveData<String> mText;
|
|
||||||
|
|
||||||
public LibraryViewModel() {
|
|
||||||
mText = new MutableLiveData<>();
|
|
||||||
mText.setValue("This is library fragment");
|
|
||||||
}
|
|
||||||
|
|
||||||
public LiveData<String> getText() {
|
|
||||||
return mText;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -14,9 +14,9 @@ public class MonsterViewModel extends ViewModel {
|
|||||||
public MonsterViewModel() {
|
public MonsterViewModel() {
|
||||||
mMonster = null;
|
mMonster = null;
|
||||||
mAbilities = new MutableLiveData<>();
|
mAbilities = new MutableLiveData<>();
|
||||||
mAbilities.setValue(new ArrayList<String>());
|
mAbilities.setValue(new ArrayList<>());
|
||||||
mActions = new MutableLiveData<>();
|
mActions = new MutableLiveData<>();
|
||||||
mActions.setValue(new ArrayList<String>());
|
mActions.setValue(new ArrayList<>());
|
||||||
mArmorClass = new MutableLiveData<>();
|
mArmorClass = new MutableLiveData<>();
|
||||||
mArmorClass.setValue("");
|
mArmorClass.setValue("");
|
||||||
mChallenge = new MutableLiveData<>();
|
mChallenge = new MutableLiveData<>();
|
||||||
@@ -59,96 +59,140 @@ public class MonsterViewModel extends ViewModel {
|
|||||||
mWisdom.setValue("");
|
mWisdom.setValue("");
|
||||||
}
|
}
|
||||||
|
|
||||||
private MutableLiveData<List<String>> mAbilities;
|
private final MutableLiveData<List<String>> mAbilities;
|
||||||
|
|
||||||
public LiveData<List<String>> getAbilities() {
|
public LiveData<List<String>> getAbilities() {
|
||||||
return mAbilities;
|
return mAbilities;
|
||||||
}
|
}
|
||||||
private MutableLiveData<List<String>> mActions;
|
|
||||||
|
private final MutableLiveData<List<String>> mActions;
|
||||||
|
|
||||||
public LiveData<List<String>> getActions() {
|
public LiveData<List<String>> getActions() {
|
||||||
return mActions;
|
return mActions;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mArmorClass;
|
|
||||||
|
private final MutableLiveData<String> mArmorClass;
|
||||||
|
|
||||||
public LiveData<String> getArmorClass() {
|
public LiveData<String> getArmorClass() {
|
||||||
return mArmorClass;
|
return mArmorClass;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mChallenge;
|
|
||||||
|
private final MutableLiveData<String> mChallenge;
|
||||||
|
|
||||||
public LiveData<String> getChallenge() {
|
public LiveData<String> getChallenge() {
|
||||||
return mChallenge;
|
return mChallenge;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mCharisma;
|
|
||||||
|
private final MutableLiveData<String> mCharisma;
|
||||||
|
|
||||||
public LiveData<String> getCharisma() {
|
public LiveData<String> getCharisma() {
|
||||||
return mCharisma;
|
return mCharisma;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mConditionImmunities;
|
|
||||||
|
private final MutableLiveData<String> mConditionImmunities;
|
||||||
|
|
||||||
public LiveData<String> getConditionImmunities() {
|
public LiveData<String> getConditionImmunities() {
|
||||||
return mConditionImmunities;
|
return mConditionImmunities;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mConstitution;
|
|
||||||
|
private final MutableLiveData<String> mConstitution;
|
||||||
|
|
||||||
public LiveData<String> getConstitution() {
|
public LiveData<String> getConstitution() {
|
||||||
return mConstitution;
|
return mConstitution;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mDamageResistances;
|
|
||||||
|
private final MutableLiveData<String> mDamageResistances;
|
||||||
|
|
||||||
public LiveData<String> getDamageResistances() {
|
public LiveData<String> getDamageResistances() {
|
||||||
return mDamageResistances;
|
return mDamageResistances;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mDamageImmunities;
|
|
||||||
|
private final MutableLiveData<String> mDamageImmunities;
|
||||||
|
|
||||||
public LiveData<String> getDamageImmunities() {
|
public LiveData<String> getDamageImmunities() {
|
||||||
return mDamageImmunities;
|
return mDamageImmunities;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mDamageVulnerabilities;
|
|
||||||
|
private final MutableLiveData<String> mDamageVulnerabilities;
|
||||||
|
|
||||||
public LiveData<String> getDamageVulnerabilities() {
|
public LiveData<String> getDamageVulnerabilities() {
|
||||||
return mDamageVulnerabilities;
|
return mDamageVulnerabilities;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mDexterity;
|
|
||||||
|
private final MutableLiveData<String> mDexterity;
|
||||||
|
|
||||||
public LiveData<String> getDexterity() {
|
public LiveData<String> getDexterity() {
|
||||||
return mDexterity;
|
return mDexterity;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mHitPoints;
|
|
||||||
|
private final MutableLiveData<String> mHitPoints;
|
||||||
|
|
||||||
public LiveData<String> getHitPoints() {
|
public LiveData<String> getHitPoints() {
|
||||||
return mHitPoints;
|
return mHitPoints;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mIntelligence;
|
|
||||||
|
private final MutableLiveData<String> mIntelligence;
|
||||||
|
|
||||||
public LiveData<String> getIntelligence() {
|
public LiveData<String> getIntelligence() {
|
||||||
return mIntelligence;
|
return mIntelligence;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mLanguages;
|
|
||||||
|
private final MutableLiveData<String> mLanguages;
|
||||||
|
|
||||||
public LiveData<String> getLanguages() {
|
public LiveData<String> getLanguages() {
|
||||||
return mLanguages;
|
return mLanguages;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mMeta;
|
|
||||||
|
private final MutableLiveData<String> mMeta;
|
||||||
|
|
||||||
public LiveData<String> getMeta() {
|
public LiveData<String> getMeta() {
|
||||||
return mMeta;
|
return mMeta;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mName;
|
|
||||||
|
private final MutableLiveData<String> mName;
|
||||||
|
|
||||||
public LiveData<String> getName() {
|
public LiveData<String> getName() {
|
||||||
return mName;
|
return mName;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mSavingThrows;
|
|
||||||
|
private final MutableLiveData<String> mSavingThrows;
|
||||||
|
|
||||||
public LiveData<String> getSavingThrows() {
|
public LiveData<String> getSavingThrows() {
|
||||||
return mSavingThrows;
|
return mSavingThrows;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mSenses;
|
|
||||||
|
private final MutableLiveData<String> mSenses;
|
||||||
|
|
||||||
public LiveData<String> getSenses() {
|
public LiveData<String> getSenses() {
|
||||||
return mSenses;
|
return mSenses;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mSkills;
|
|
||||||
|
private final MutableLiveData<String> mSkills;
|
||||||
|
|
||||||
public LiveData<String> getSkills() {
|
public LiveData<String> getSkills() {
|
||||||
return mSkills;
|
return mSkills;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mSpeed;
|
|
||||||
|
private final MutableLiveData<String> mSpeed;
|
||||||
|
|
||||||
public LiveData<String> getSpeed() {
|
public LiveData<String> getSpeed() {
|
||||||
return mSpeed;
|
return mSpeed;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mStrength;
|
|
||||||
|
private final MutableLiveData<String> mStrength;
|
||||||
|
|
||||||
public LiveData<String> getStrength() {
|
public LiveData<String> getStrength() {
|
||||||
return mStrength;
|
return mStrength;
|
||||||
}
|
}
|
||||||
private MutableLiveData<String> mWisdom;
|
|
||||||
|
private final MutableLiveData<String> mWisdom;
|
||||||
|
|
||||||
public LiveData<String> getWisdom() {
|
public LiveData<String> getWisdom() {
|
||||||
return mWisdom;
|
return mWisdom;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Monster mMonster;
|
private Monster mMonster;
|
||||||
|
|
||||||
public void setMonster(Monster monster) {
|
public void setMonster(Monster monster) {
|
||||||
mMonster = monster;
|
mMonster = monster;
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ import com.majinnaibu.monstercards.ui.MCFragment;
|
|||||||
|
|
||||||
public class SearchFragment extends MCFragment {
|
public class SearchFragment extends MCFragment {
|
||||||
|
|
||||||
private SearchViewModel searchViewModel;
|
|
||||||
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater,
|
public View onCreateView(@NonNull LayoutInflater inflater,
|
||||||
ViewGroup container, Bundle savedInstanceState) {
|
ViewGroup container, Bundle savedInstanceState) {
|
||||||
View root = inflater.inflate(R.layout.fragment_search, container, false);
|
View root = inflater.inflate(R.layout.fragment_search, container, false);
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package com.majinnaibu.monstercards.ui.search;
|
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
|
||||||
import androidx.lifecycle.MutableLiveData;
|
|
||||||
import androidx.lifecycle.ViewModel;
|
|
||||||
|
|
||||||
public class SearchViewModel extends ViewModel {
|
|
||||||
|
|
||||||
private MutableLiveData<String> mSearchQuery;
|
|
||||||
|
|
||||||
public SearchViewModel() {
|
|
||||||
mSearchQuery = new MutableLiveData<>();
|
|
||||||
mSearchQuery.setValue("");
|
|
||||||
}
|
|
||||||
|
|
||||||
public LiveData<String> getSearchQuery() {
|
|
||||||
return mSearchQuery;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user