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 fbad620..35a2fd9 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 @@ -36,8 +36,6 @@ public class WorkerCardAdapter{ } private void addCard(WorkerData worker, View view) { - //TODO: progress bar color - //View view = LayoutInflater.from(container.getContext()).inflate(R.layout.worker_card, container, false); TextView pair = view.findViewById(R.id.workerCardPair); TextView safetyOrders = view.findViewById(R.id.workerCardSafetyOrders); TextView uptime = view.findViewById(R.id.workerCardUptime); @@ -128,7 +126,7 @@ public class WorkerCardAdapter{ long minutes = TimeUnit.SECONDS.toMinutes((long) seconds) % 60; long secs = (long) (seconds % 60); - return String.format(Locale.ROOT,"%03d:%02d:%02d:%02d", days, hours, minutes, secs);//.replaceFirst("^0+(?!$)", ""); + return String.format(Locale.ROOT,"%03d:%02d:%02d:%02d", days, hours, minutes, secs); } diff --git a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java index 29b8a69..e2052c1 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java @@ -300,7 +300,6 @@ public class HomeFragment extends Fragment { } }); - // Setup task handler = new Handler(); updateRunnable = new Runnable() { @@ -315,7 +314,6 @@ public class HomeFragment extends Fragment { } }; handler.post(updateRunnable); - return root; } diff --git a/app/src/main/res/menu/worker_popup_menu.xml b/app/src/main/res/menu/worker_popup_menu.xml new file mode 100644 index 0000000..f0fe9a7 --- /dev/null +++ b/app/src/main/res/menu/worker_popup_menu.xml @@ -0,0 +1,52 @@ + +
\ No newline at end of file