diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java index 1b1eb5f..3a79f29 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModelProvider; @@ -13,15 +12,21 @@ import com.majinnaibu.monstercards.R; import com.majinnaibu.monstercards.ui.shared.MCFragment; public class DashboardFragment extends MCFragment { - + private ViewHolder mHolder; private DashboardViewModel dashboardViewModel; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { dashboardViewModel = new ViewModelProvider(this).get(DashboardViewModel.class); View root = inflater.inflate(R.layout.fragment_dashboard, container, false); - final TextView textView = root.findViewById(R.id.text_dashboard); - dashboardViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); + mHolder = new ViewHolder(root); + return root; } -} \ No newline at end of file + + private static class ViewHolder { + ViewHolder(View root) { + + } + } +} diff --git a/app/src/main/res/drawable/rectangle_background.xml b/app/src/main/res/drawable/rectangle_background.xml new file mode 100644 index 0000000..a013c9a --- /dev/null +++ b/app/src/main/res/drawable/rectangle_background.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/app/src/main/res/layout/card_ability_score.xml b/app/src/main/res/layout/card_ability_score.xml new file mode 100644 index 0000000..b58646d --- /dev/null +++ b/app/src/main/res/layout/card_ability_score.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_action.xml b/app/src/main/res/layout/card_action.xml new file mode 100644 index 0000000..d17fcc5 --- /dev/null +++ b/app/src/main/res/layout/card_action.xml @@ -0,0 +1,40 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/card_armor_class.xml b/app/src/main/res/layout/card_armor_class.xml new file mode 100644 index 0000000..a74960d --- /dev/null +++ b/app/src/main/res/layout/card_armor_class.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/app/src/main/res/layout/card_challenge_rating.xml b/app/src/main/res/layout/card_challenge_rating.xml new file mode 100644 index 0000000..86fc993 --- /dev/null +++ b/app/src/main/res/layout/card_challenge_rating.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/app/src/main/res/layout/card_hit_points.xml b/app/src/main/res/layout/card_hit_points.xml new file mode 100644 index 0000000..5a09c91 --- /dev/null +++ b/app/src/main/res/layout/card_hit_points.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/app/src/main/res/layout/card_initiative.xml b/app/src/main/res/layout/card_initiative.xml new file mode 100644 index 0000000..6140b73 --- /dev/null +++ b/app/src/main/res/layout/card_initiative.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/app/src/main/res/layout/card_monster.xml b/app/src/main/res/layout/card_monster.xml new file mode 100644 index 0000000..b9503f8 --- /dev/null +++ b/app/src/main/res/layout/card_monster.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_monster_short.xml b/app/src/main/res/layout/card_monster_short.xml new file mode 100644 index 0000000..1e5b9a2 --- /dev/null +++ b/app/src/main/res/layout/card_monster_short.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 166ab0e..fa21349 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -1,22 +1,175 @@ - - - \ No newline at end of file + android:layout_margin="8dp" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/tile_monster.xml b/app/src/main/res/layout/tile_monster.xml new file mode 100644 index 0000000..60d9b15 --- /dev/null +++ b/app/src/main/res/layout/tile_monster.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/tile_monster_short.xml b/app/src/main/res/layout/tile_monster_short.xml new file mode 100644 index 0000000..5ec17ce --- /dev/null +++ b/app/src/main/res/layout/tile_monster_short.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +