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

Adds icon/logo images and a splash screen.

Browse Source
This commit is contained in:
Tom Hicks
2026-09-20 15:12:42 -07:00
parent 2d043320e0
commit c06b53ed6b
47 changed files with 475 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Android/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsFragment.java
View File

@@ -31,10 +31,12 @@ import com.majinnaibu.monstercards.utils.Logger;
import java.util.UUID;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
import io.reactivex.rxjava3.schedulers.Schedulers;
public class CollectionsFragment extends MCFragment {
private final CompositeDisposable mDisposables = new CompositeDisposable();
@Nullable
@Override
@@ -48,18 +50,35 @@ public class CollectionsFragment extends MCFragment {
fab.setOnClickListener(v -> showCreateCollectionDialog());
}
View emptyState = root.findViewById(R.id.empty_state);
View emptyStateButton = root.findViewById(R.id.empty_state_button);
if (emptyStateButton != null) {
emptyStateButton.setOnClickListener(v -> showCreateCollectionDialog());
}
RecyclerView recyclerView = root.findViewById(R.id.collection_list);
if (recyclerView != null) {
setupRecyclerView(recyclerView);
setupRecyclerView(recyclerView, emptyState);
}
return root;
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
private void setupRecyclerView(@NonNull RecyclerView recyclerView, @Nullable View emptyState) {
Context context = requireContext();
MonsterRepository repository = getMonsterRepository();
mDisposables.add(repository.getCollectionsWithCount()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(collections -> {
boolean isEmpty = (collections == null || collections.isEmpty());
if (emptyState != null) {
emptyState.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
}
recyclerView.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
}, Logger::logError));
CollectionsRecyclerViewAdapter adapter = new CollectionsRecyclerViewAdapter(
context,
repository.getCollectionsWithCount(),
@@ -155,4 +174,10 @@ public class CollectionsFragment extends MCFragment {
NavDirections action = CollectionsFragmentDirections.actionNavigationCollectionsToCollectionDetailFragment(collectionId.toString());
Navigation.findNavController(requireView()).navigate(action);
}
@Override
public void onDestroyView() {
super.onDestroyView();
mDisposables.clear();
}
}

18
Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java
View File

@@ -57,6 +57,9 @@ public class DashboardFragment extends MCFragment {
if (fab != null) {
fab.setOnClickListener(v -> showAddToDashboardOptionsDialog());
}
if (mHolder.emptyStateButton != null) {
mHolder.emptyStateButton.setOnClickListener(v -> showAddToDashboardOptionsDialog());
}
setupRecyclerView(mHolder.list);
loadDashboardMonsters();
@@ -88,7 +91,16 @@ public class DashboardFragment extends MCFragment {
}
});
if (monsterData != null) {
monsterData.observe(getViewLifecycleOwner(), monsters -> mAdapter.submitList(monsters));
monsterData.observe(getViewLifecycleOwner(), monsters -> {
mAdapter.submitList(monsters);
boolean isEmpty = (monsters == null || monsters.isEmpty());
if (mHolder.emptyState != null) {
mHolder.emptyState.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
}
if (mHolder.list != null) {
mHolder.list.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
}
});
}
recyclerView.setAdapter(mAdapter);
@@ -301,9 +313,13 @@ public class DashboardFragment extends MCFragment {
private static class ViewHolder {
final RecyclerView list;
final View emptyState;
final View emptyStateButton;
ViewHolder(View root) {
list = root.findViewById(R.id.list);
emptyState = root.findViewById(R.id.empty_state);
emptyStateButton = root.findViewById(R.id.empty_state_button);
}
}
}

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

@@ -13,6 +13,7 @@ import android.view.ViewGroup;
import android.widget.EditText;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.navigation.NavController;
import androidx.navigation.NavDirections;
@@ -38,10 +39,12 @@ import com.majinnaibu.monstercards.utils.Logger;
import java.util.UUID;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
import io.reactivex.rxjava3.schedulers.Schedulers;
public class LibraryFragment extends MCFragment {
private final CompositeDisposable mDisposables = new CompositeDisposable();
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
@@ -52,9 +55,15 @@ public class LibraryFragment extends MCFragment {
assert fab != null;
setupAddMonsterButton(fab);
View emptyState = root.findViewById(R.id.empty_state);
View emptyStateButton = root.findViewById(R.id.empty_state_button);
if (emptyStateButton != null) {
emptyStateButton.setOnClickListener(v -> createNewMonster());
}
final RecyclerView recyclerView = root.findViewById(R.id.monster_list);
assert recyclerView != null;
setupRecyclerView(recyclerView);
setupRecyclerView(recyclerView, emptyState);
return root;
}
@@ -130,10 +139,21 @@ public class LibraryFragment extends MCFragment {
builder.show();
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
private void setupRecyclerView(@NonNull RecyclerView recyclerView, @Nullable View emptyState) {
Context context = requireContext();
MonsterRepository repository = this.getMonsterRepository();
mDisposables.add(repository.getMonsters()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(monsters -> {
boolean isEmpty = (monsters == null || monsters.isEmpty());
if (emptyState != null) {
emptyState.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
}
recyclerView.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
}, Logger::logError));
LibraryRecyclerViewAdapter adapter = new LibraryRecyclerViewAdapter(
context,
repository.getMonsters(),
@@ -165,30 +185,31 @@ public class LibraryFragment extends MCFragment {
}
private void setupAddMonsterButton(@NonNull FloatingActionButton fab) {
fab.setOnClickListener(view -> {
Monster monster = new Monster();
monster.name = getString(R.string.default_monster_name);
MonsterRepository repository = this.getMonsterRepository();
repository.addMonster(monster)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
new DisposableCompletableObserver() {
@Override
public void onComplete() {
navigateToEditMonster(monster.id);
}
fab.setOnClickListener(view -> createNewMonster());
}
@Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
Logger.logError("Error creating monster", e);
View view = getView();
if (view != null) {
Snackbar.make(view, getString(R.string.snackbar_failed_to_create_monster), Snackbar.LENGTH_LONG).show();
}
}
});
});
private void createNewMonster() {
Monster monster = new Monster();
monster.name = getString(R.string.default_monster_name);
MonsterRepository repository = this.getMonsterRepository();
mDisposables.add(repository.addMonster(monster)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribeWith(new DisposableCompletableObserver() {
@Override
public void onComplete() {
navigateToEditMonster(monster.id);
}
@Override
public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
Logger.logError("Error creating monster", e);
View view = getView();
if (view != null) {
Snackbar.make(view, getString(R.string.snackbar_failed_to_create_monster), Snackbar.LENGTH_LONG).show();
}
}
}));
}
protected void navigateToMonsterDetail(@NonNull UUID monsterId) {
@@ -203,4 +224,10 @@ public class LibraryFragment extends MCFragment {
action = MonsterDetailFragmentDirections.actionNavigationMonsterToEditMonsterFragment(monsterId.toString());
navController.navigate(action);
}
@Override
public void onDestroyView() {
super.onDestroyView();
mDisposables.clear();
}
}