mirror of https://github.com/m2049r/xmrwallet.git
parent
8ea2081270
commit
2884fc711c
|
@ -8,8 +8,8 @@ android {
|
|||
applicationId "com.m2049r.xmrwallet"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 25
|
||||
versionCode 64
|
||||
versionName "1.3.4 'Satoshis Dream'"
|
||||
versionCode 65
|
||||
versionName "1.3.5 'Satoshis Dream'"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/tx_green" />
|
||||
</shape>
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/button_disabled" android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/button_green" android:state_enabled="true" />
|
||||
<item android:drawable="@drawable/button_green" android:state_pressed="false" />
|
||||
</selector>
|
|
@ -35,7 +35,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:visibility="visible">
|
||||
android:visibility="invisible">
|
||||
|
||||
<TextView
|
||||
style="@style/MoneroText.Confirm.Label"
|
||||
|
@ -231,7 +231,7 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/bSend"
|
||||
style="@style/MoneroButton"
|
||||
style="@style/MoneroButton.Green"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
|
|
|
@ -177,7 +177,7 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/bSend"
|
||||
style="@style/MoneroButton"
|
||||
style="@style/MoneroButton.Green"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="48dp"
|
||||
|
|
|
@ -140,6 +140,8 @@
|
|||
<p>This is the public address of the wallet you are sending Moneroj to, you can copy this from
|
||||
your clipboard, scan a QR code or enter it manually. Make sure you triple check this to
|
||||
ensure you aren’t sending coins to the wrong address.</p>
|
||||
<p>In addition to sending XMR, you can send BTC through the XMR.TO service (see https://xmr.to
|
||||
for details). See the section on sending BTC below.</p>
|
||||
<h2>Payment ID</h2>
|
||||
<p>You can use a Payment ID to identify the reason you sent Monero between two parties. This
|
||||
is fully optional and private. For example it can allow a business to reconcile your
|
||||
|
@ -156,6 +158,28 @@
|
|||
and the inverse is true for a low priority. Please note that if you set your transaction to
|
||||
a low priority it can be hours before it is included on the blockchain. The default priority
|
||||
is \"Medium\".</p>
|
||||
<h1>Sending BTC</h1>
|
||||
<h2>XMR.TO</h2>
|
||||
<p>XMR.TO is a third party service which acts as an exchange from Monero to Bitcoin.
|
||||
We use the XMR.TO API to integrate Bitcoin payments into Monerujo. Please check out
|
||||
https://xmr.to and decide for yourself if this is something you want to use. The Monerujo
|
||||
Team is not associated with XMR.TO and cannot help you with their service.</p>
|
||||
<h2>XMR.TO Exchange Rate<h2>
|
||||
<p>On the \"Amount\" screen you will be shown the current parameters of the XMR.TO service. These
|
||||
include the current exchange rate as well as upper and lower BTC limits. Note that this
|
||||
rate is not guaranteed at this point. You will also see
|
||||
the amount up to which the BTC transaction will be executed instantly without waiting for
|
||||
XMR confirmations (see the XMR.TO FAQ for more details). Please note, that XMR.TO does
|
||||
not charge extra fees - how cool is that?</p>
|
||||
<h2>XMR.TO Order<h2>
|
||||
<p>On the \"Confirm\" screen, you will see the actual XMR.TO order. This order is valid for
|
||||
a limited time - you may notice a countdown on the \"Spend\" button. The exchange rate may
|
||||
be different to the indicative one shown on previous screens.</p>
|
||||
<h2>XMR.TO Secret Key<h2>
|
||||
<p>Since Monerujo only handles the Monero part of your transaction your XMR.TO secret key
|
||||
can be used to track the Bitcoin part of your order on the XMR.TO homepage.</p>
|
||||
<h2>XMR.TO Countdown!</h2>
|
||||
<p>Once the countdown reaches zero, you need to get a new quote from XMR.TO by going back to the
|
||||
previous step and then coming back to the \"Confirm\" screen.</p>
|
||||
]]></string>
|
||||
|
||||
</resources>
|
|
@ -240,6 +240,10 @@
|
|||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
|
||||
<style name="MoneroButton.Green">
|
||||
<item name="android:background">@drawable/button_selector_green</item>
|
||||
</style>
|
||||
|
||||
<style name="MoneroButton.Small">
|
||||
<item name="android:textSize">11sp</item>
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue