diff --git a/android/assets/icon.ico b/android/assets/icon.ico new file mode 100644 index 0000000..685b48d Binary files /dev/null and b/android/assets/icon.ico differ diff --git a/android/assets/icon.png b/android/assets/icon.png deleted file mode 100644 index 19c63a8..0000000 Binary files a/android/assets/icon.png and /dev/null differ diff --git a/android/assets/icon32.png b/android/assets/icon32.png new file mode 100644 index 0000000..b7ff94f Binary files /dev/null and b/android/assets/icon32.png differ diff --git a/android/assets/lilicon.png b/android/assets/lilicon.png deleted file mode 100644 index db93954..0000000 Binary files a/android/assets/lilicon.png and /dev/null differ diff --git a/android/project.properties b/android/project.properties index 6e18427..4ab1256 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-19 diff --git a/core/bitmonerod.bat b/core/bitmonerod.bat deleted file mode 100644 index 24f7e03..0000000 --- a/core/bitmonerod.bat +++ /dev/null @@ -1 +0,0 @@ -bitmonerod.exe --data-dir=D:\wallets\monero\data \ No newline at end of file diff --git a/core/src/com/jw/lightwallet/screens/DaemonView.java b/core/src/com/jw/lightwallet/screens/DaemonView.java index 445a8f3..c45580c 100644 --- a/core/src/com/jw/lightwallet/screens/DaemonView.java +++ b/core/src/com/jw/lightwallet/screens/DaemonView.java @@ -8,6 +8,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.jw.lightwallet.utils.Constants; import com.jw.lightwallet.utils.DaemonValues; + +import java.text.DecimalFormat; import java.util.Date; public class DaemonView { @@ -73,9 +75,9 @@ public class DaemonView { nodevalue.setText(Constants.moneroclub); statusvalue.setText(daemonvalues.getStatus()); heightvalue.setText(String.valueOf(daemonvalues.getBlockheight())); - hashratevalue.setText(String.valueOf(daemonvalues.getHashrate() + " Mh/s")); + hashratevalue.setText(new DecimalFormat("##.##").format(daemonvalues.getHashrate()) + " Mh/s"); timevalue.setText(String.valueOf(new java.util.Date(daemonvalues.getLastblocktime()*1000))); - rewardvalue.setText(String.valueOf(daemonvalues.getLastblockreward()/1e12 + " XMR")); + rewardvalue.setText(new DecimalFormat("##.##").format(daemonvalues.getLastblockreward()/1e12) + " XMR"); } } diff --git a/desktop/src/com/jw/lightwallet/desktop/DesktopLauncher.java b/desktop/src/com/jw/lightwallet/desktop/DesktopLauncher.java index ca2ef49..b7f68c9 100644 --- a/desktop/src/com/jw/lightwallet/desktop/DesktopLauncher.java +++ b/desktop/src/com/jw/lightwallet/desktop/DesktopLauncher.java @@ -1,5 +1,6 @@ package com.jw.lightwallet.desktop; +import com.badlogic.gdx.Files.FileType; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.jw.lightwallet.LightWallet; @@ -10,6 +11,8 @@ public class DesktopLauncher { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.width = Constants.DESKTOP_WIDTH; config.height = Constants.DESKTOP_HEIGHT; + config.title = "Monero LightWallet"; + config.addIcon("icon32.png", FileType.Internal); new LwjglApplication(new LightWallet(), config); } }