nicolas
/
DCAv2GUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2025.03.13

This commit is contained in:
Nicolás Sánchez 2025-03-13 12:00:12 -03:00
parent 4dbf1177a2
commit 5cbe1e1224
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java
View File

@ -92,9 +92,21 @@ public class EarnerCardAdapter {
public void populateStatusBar(TextView statusBar, EarnerInterface.EarnerGlobalData earnerData) { public void populateStatusBar(TextView statusBar, EarnerInterface.EarnerGlobalData earnerData) {
double uptime = earnerData.getUptime(); double uptime = earnerData.getUptime();
//Loop through all the earners in earnerData and calculate total funds
double totalEarningFunds = 0;
double totalTradingFunds = 0;
for (EarnerData earner : earnerData.getEarnerList()) {
totalEarningFunds += earner.getEarningBalance();
totalTradingFunds += earner.getTradingBalance();
}
double totalFunds = totalEarningFunds + totalTradingFunds;
String earningPercentage = String.format(Locale.ROOT, "%.2f", totalEarningFunds/totalFunds*100);
List<EarnerData> earnerList = earnerData.getEarnerList(); List<EarnerData> earnerList = earnerData.getEarnerList();
String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Earners online: " + earnerList.size(); String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Total funds: " +
String.format(Locale.ROOT, "%.2f", totalFunds) + " USDT \n On Earn: " +
String.format(Locale.ROOT, "%.2f", totalEarningFunds) + " USDT (" + earningPercentage + "%)";
statusBar.setText(statusBarText); statusBar.setText(statusBarText);
} }

22
app/src/main/res/layout/earner_card.xml
View File

@ -36,7 +36,7 @@
android:text="Trading:" android:text="Trading:"
android:textColor="@color/secondary_text_color" android:textColor="@color/secondary_text_color"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/earnerCardTradingBalanceValue" android:id="@+id/earnerCardTradingBalanceValue"
android:layout_width="64dp" android:layout_width="64dp"
@ -59,7 +59,7 @@
android:text="Earning:" android:text="Earning:"
android:textColor="@color/secondary_text_color" android:textColor="@color/secondary_text_color"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/earnerCardEarningBalanceValue" android:id="@+id/earnerCardEarningBalanceValue"
android:layout_width="64dp" android:layout_width="64dp"
@ -88,42 +88,42 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="8dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="3dp" android:padding="3dp"
android:layout_marginBottom="2dp"> android:layout_marginBottom="2dp">
<TextView <TextView
android:id="@+id/earnerCardLastSubscriptionLabel" android:id="@+id/earnerCardLastSubscriptionLabel"
android:layout_width="84dp" android:layout_width="88dp"
android:layout_height="18dp" android:layout_height="18dp"
android:text="Last subscription:" android:text="Last subscription:"
android:textColor="@color/secondary_text_color" android:textColor="@color/secondary_text_color"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/earnerCardLastSubscriptionDateTime" android:id="@+id/earnerCardLastSubscriptionDateTime"
android:layout_width="96dp" android:layout_width="104dp"
android:layout_height="18dp" android:layout_height="18dp"
android:text="2025/03/08 04:20" android:text="2025/03/08 04:20"
android:textColor="@color/bright_green" android:textColor="@color/bright_green"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/earnerCardLastRedemptionLabel" android:id="@+id/earnerCardLastRedemptionLabel"
android:layout_width="84dp" android:layout_width="88dp"
android:layout_height="18dp" android:layout_height="18dp"
android:text="Last redemption:" android:text="Last redemption:"
android:textColor="@color/secondary_text_color" android:textColor="@color/secondary_text_color"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/earnerCardLastRedemptionDateTime" android:id="@+id/earnerCardLastRedemptionDateTime"
android:layout_width="96dp" android:layout_width="104dp"
android:layout_height="18dp" android:layout_height="18dp"
android:text="2025/03/08 04:20" android:text="2025/03/08 04:20"
android:textColor="@color/red" android:textColor="@color/red"
android:textAlignment="center" android:textAlignment="center"
android:textSize="10sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
app/src/main/res/values/strings.xml
View File

@ -1,7 +1,7 @@
<resources> <resources>
<string name="app_name" translatable="false">DCAv2GUI</string> <string name="app_name" translatable="false">DCAv2GUI</string>
<string name="nav_header_title" translatable="false">DCAv2</string> <string name="nav_header_title" translatable="false">DCAv2</string>
<string name="nav_header_subtitle">Version 2025.03.06 </string> <string name="nav_header_subtitle">Version 2025.03.13 </string>
<string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string>
<string name="nav_header_desc">Navigation header</string> <string name="nav_header_desc">Navigation header</string>