diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java b/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java new file mode 100644 index 0000000..6756766 --- /dev/null +++ b/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java @@ -0,0 +1,13 @@ +package com.majinnaibu.monstercards.models; + +public class Monster { + + private String mName; + public String getName() { + return mName; + } + public void setName(String value) { + mName = value; + } + +} diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java index d296d2e..0d4c7f7 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java @@ -13,6 +13,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import com.majinnaibu.monstercards.R; +import com.majinnaibu.monstercards.models.Monster; public class MonsterFragment extends Fragment { @@ -20,15 +21,23 @@ public class MonsterFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + // TODO: remove this block make the monster ID a parameter to the view and get the monster from saved data (sqlite) + Monster monster = new Monster(); + monster.setName("Pixie"); + // END remove block monsterViewModel = new ViewModelProvider(this).get(MonsterViewModel.class); View root = inflater.inflate(R.layout.fragment_monster, container, false); - final TextView textView = root.findViewById(R.id.text_monster); - monsterViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + monsterViewModel.setMonster(monster); + + final TextView monsterName = root.findViewById(R.id.name); + monsterViewModel.getName().observe(getViewLifecycleOwner(), new Observer() { @Override - public void onChanged(@Nullable String s) { - textView.setText(s); + public void onChanged(@Nullable String name) { + monsterName.setText(name); } }); + return root; } } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java index b4c14c3..71c0969 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java @@ -4,16 +4,25 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import com.majinnaibu.monstercards.models.Monster; + public class MonsterViewModel extends ViewModel { - private MutableLiveData mText; - public MonsterViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is monster fragment"); + mMonster = null; + mName = new MutableLiveData<>(); + mName.setValue(""); + } - public LiveData getText() { - return mText; + private MutableLiveData mName; + public LiveData getName() { + return mName; + } + + private Monster mMonster; + public void setMonster(Monster monster) { + mMonster = monster; + mName.setValue(mMonster.getName()); } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_monster.xml b/app/src/main/res/layout/fragment_monster.xml index 9400058..f3d4e06 100644 --- a/app/src/main/res/layout/fragment_monster.xml +++ b/app/src/main/res/layout/fragment_monster.xml @@ -1,22 +1,30 @@ - - - \ No newline at end of file + android:layout_height="wrap_content"> + + + + + \ No newline at end of file