From 3836a966044a494d268cbe2ab298ddcbaff54d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= Date: Wed, 25 Dec 2024 16:20:51 -0300 Subject: [PATCH] minor refactor --- .../dcav2gui/ui/exchanges/BinanceFragment.java | 12 ++---------- .../dcav2gui/ui/exchanges/GateioFragment.java | 8 +++----- .../dcav2gui/ui/exchanges/KucoinFragment.java | 8 +++----- .../example/dcav2gui/ui/exchanges/OkxFragment.java | 8 +++----- 4 files changed, 11 insertions(+), 25 deletions(-) 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 8dc071b..6a14d84 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 @@ -1,18 +1,13 @@ // BinanceFragment.java package com.example.dcav2gui.ui.exchanges; -import android.app.AlertDialog; -import android.content.Context; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import android.widget.PopupMenu; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; @@ -25,14 +20,11 @@ import com.example.dcav2gui.WorkerInterface; import com.example.dcav2gui.databinding.FragmentBinanceBinding; import com.example.dcav2gui.ui.exchanges.adapters.WorkerCardAdapter; -import java.io.IOException; import java.util.List; public class BinanceFragment extends Fragment implements WorkerCardAdapter.OnCardLongClickListener { - private FragmentBinanceBinding binding; - private BinanceViewModel binanceViewModel; private WorkerCardAdapter workerCardAdapter; private TextView statusBar; @@ -40,13 +32,13 @@ public class BinanceFragment extends Fragment implements WorkerCardAdapter.OnCar @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentBinanceBinding.inflate(inflater, container, false); + com.example.dcav2gui.databinding.FragmentBinanceBinding binding = FragmentBinanceBinding.inflate(inflater, container, false); View root = binding.getRoot(); //Initialize status bar statusBar = root.findViewById(R.id.binance_status_bar); - binanceViewModel = new ViewModelProvider(this).get(BinanceViewModel.class); + BinanceViewModel binanceViewModel = new ViewModelProvider(this).get(BinanceViewModel.class); workerCardAdapter = new WorkerCardAdapter(binding.binanceCardsContainer); workerCardAdapter.setOnCardLongClickListener(this); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java index 32ecb50..ce38f84 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java @@ -24,21 +24,19 @@ import java.util.List; public class GateioFragment extends Fragment implements WorkerCardAdapter.OnCardLongClickListener { - private FragmentGateioBinding binding; - private GateioViewModel GateioViewModel; private WorkerCardAdapter workerCardAdapter; private TextView statusBar; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentGateioBinding.inflate(inflater, container, false); + com.example.dcav2gui.databinding.FragmentGateioBinding binding = FragmentGateioBinding.inflate(inflater, container, false); View root = binding.getRoot(); //Initialize status bar statusBar = root.findViewById(R.id.gateio_status_bar); - GateioViewModel = new ViewModelProvider(this).get(GateioViewModel.class); + com.example.dcav2gui.ui.exchanges.GateioViewModel gateioViewModel = new ViewModelProvider(this).get(GateioViewModel.class); workerCardAdapter = new WorkerCardAdapter(binding.gateioCardsContainer); workerCardAdapter.setOnCardLongClickListener(this); @@ -47,7 +45,7 @@ public class GateioFragment extends Fragment implements WorkerCardAdapter.OnCard WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("gateio")); workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); - GateioViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { + gateioViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("gateio")); workerCardAdapter.updateData(workerDataList); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java index 5d3eb30..b9047c7 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java @@ -24,21 +24,19 @@ import java.util.List; public class KucoinFragment extends Fragment implements WorkerCardAdapter.OnCardLongClickListener { - private FragmentKucoinBinding binding; - private KucoinViewModel KucoinViewModel; private WorkerCardAdapter workerCardAdapter; private TextView statusBar; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentKucoinBinding.inflate(inflater, container, false); + com.example.dcav2gui.databinding.FragmentKucoinBinding binding = FragmentKucoinBinding.inflate(inflater, container, false); View root = binding.getRoot(); //Initialize status bar statusBar = root.findViewById(R.id.kucoin_status_bar); - KucoinViewModel = new ViewModelProvider(this).get(KucoinViewModel.class); + com.example.dcav2gui.ui.exchanges.KucoinViewModel kucoinViewModel = new ViewModelProvider(this).get(KucoinViewModel.class); workerCardAdapter = new WorkerCardAdapter(binding.kucoinCardsContainer); workerCardAdapter.setOnCardLongClickListener(this); @@ -47,7 +45,7 @@ public class KucoinFragment extends Fragment implements WorkerCardAdapter.OnCard WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("kucoin")); workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); - KucoinViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { + kucoinViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("kucoin")); workerCardAdapter.updateData(workerDataList); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java index b4aafeb..4e09510 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java @@ -24,21 +24,19 @@ import java.util.List; public class OkxFragment extends Fragment implements WorkerCardAdapter.OnCardLongClickListener { - private FragmentOkxBinding binding; - private OkxViewModel OkxViewModel; private WorkerCardAdapter workerCardAdapter; private TextView statusBar; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentOkxBinding.inflate(inflater, container, false); + com.example.dcav2gui.databinding.FragmentOkxBinding binding = FragmentOkxBinding.inflate(inflater, container, false); View root = binding.getRoot(); //Initialize status bar statusBar = root.findViewById(R.id.okex_status_bar); - OkxViewModel = new ViewModelProvider(this).get(OkxViewModel.class); + com.example.dcav2gui.ui.exchanges.OkxViewModel okxViewModel = new ViewModelProvider(this).get(OkxViewModel.class); workerCardAdapter = new WorkerCardAdapter(binding.okexCardsContainer); workerCardAdapter.setOnCardLongClickListener(this); @@ -47,7 +45,7 @@ public class OkxFragment extends Fragment implements WorkerCardAdapter.OnCardLon WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("okx")); workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); - OkxViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { + okxViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("okx")); workerCardAdapter.updateData(workerDataList);