diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java index 3344972..f679c12 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java @@ -33,7 +33,9 @@ public class BinanceFragment extends Fragment { workerCardAdapter = new WorkerCardAdapter(binding.binanceCardsContainer); binanceViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { - workerCardAdapter.updateData(workerDataList); + if (workerDataList != null) { + workerCardAdapter.updateData(workerDataList); + } }); return root; diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceViewModel.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceViewModel.java index b597d0b..52d2b47 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceViewModel.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceViewModel.java @@ -1,5 +1,7 @@ package com.example.dcav2gui.ui.exchanges; import android.app.Application; +import android.util.Log; + import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java index 5b8594f..6d5e5e4 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java @@ -29,7 +29,9 @@ public class WorkerCardAdapter{ public void updateData(List workerDataList) { container.removeAllViews(); // Clear existing views for (WorkerData worker : workerDataList) { - addCard(worker); + //addCard(worker); + View cardView = LayoutInflater.from(container.getContext()).inflate(R.layout.worker_card, container, false); + container.addView(cardView); } } diff --git a/app/src/main/res/layout/fragment_binance.xml b/app/src/main/res/layout/fragment_binance.xml index 93bd7a2..f1039d3 100644 --- a/app/src/main/res/layout/fragment_binance.xml +++ b/app/src/main/res/layout/fragment_binance.xml @@ -5,8 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="#FF0000" - android:visibility="visible"> + android:visibility="visible" + android:scrollbars="vertical">