Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaks (#167) 

* update privacy policy

* fix height

* send confirm scrollable

* use clickable instead of enabled

* rename
This commit is contained in:
m2049r 2017-12-24 14:18:32 +01:00 committed by GitHub
parent 2884fc711c
commit d843bdb451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 438 additions and 719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
View File

@ -103,6 +103,7 @@ public class GenerateReviewFragment extends Fragment {
copyAddress(); copyAddress();
} }
}); });
bCopyAddress.setClickable(false);
view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() { view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -213,7 +214,7 @@ public class GenerateReviewFragment extends Fragment {
tvWalletViewKey.setText(viewKey); tvWalletViewKey.setText(viewKey);
tvWalletSpendKey.setText(spendKey); tvWalletSpendKey.setText(spendKey);
bAdvancedInfo.setVisibility(View.VISIBLE); bAdvancedInfo.setVisibility(View.VISIBLE);
bCopyAddress.setEnabled(true); bCopyAddress.setClickable(true);
bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp); bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
activityCallback.setTitle(name, getString(R.string.details_title)); activityCallback.setTitle(name, getString(R.string.details_title));
activityCallback.setToolbarButton( activityCallback.setToolbarButton(

3
app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
View File

@ -106,6 +106,7 @@ public class ReceiveFragment extends Fragment {
copyAddress(); copyAddress();
} }
}); });
bCopyAddress.setClickable(false);
evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() { evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() {
@Override @Override
@ -240,7 +241,7 @@ public class ReceiveFragment extends Fragment {
tvAddress.setText(address); tvAddress.setText(address);
etPaymentId.setEnabled(true); etPaymentId.setEnabled(true);
bPaymentId.setEnabled(true); bPaymentId.setEnabled(true);
bCopyAddress.setEnabled(true); bCopyAddress.setClickable(true);
bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp); bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
hideProgress(); hideProgress();
generateQr(); generateQr();

2
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
View File

@ -99,7 +99,7 @@ public class SendFragment extends Fragment
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.fragment_send_new, container, false); final View view = inflater.inflate(R.layout.fragment_send, container, false);
llNavBar = view.findViewById(R.id.llNavBar); llNavBar = view.findViewById(R.id.llNavBar);
bDone = (Button) view.findViewById(R.id.bDone); bDone = (Button) view.findViewById(R.id.bDone);

2
app/src/main/res/layout/fragment_receive.xml
View File

@ -42,7 +42,7 @@
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginEnd="80dp" android:layout_marginEnd="80dp"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:enabled="false" android:clickable="false"
android:src="@drawable/ic_content_nocopy_black_24dp" /> android:src="@drawable/ic_content_nocopy_black_24dp" />
</FrameLayout> </FrameLayout>

2
app/src/main/res/layout/fragment_review.xml
View File

@ -86,7 +86,7 @@
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginEnd="80dp" android:layout_marginEnd="80dp"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:enabled="false" android:clickable="false"
android:src="@drawable/ic_content_nocopy_black_24dp" /> android:src="@drawable/ic_content_nocopy_black_24dp" />
</FrameLayout> </FrameLayout>

309
app/src/main/res/layout/fragment_send.xml
View File

@ -1,296 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="8dp">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:weightSum="10">
<android.support.design.widget.TextInputLayout
android:id="@+id/etAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
app:counterEnabled="true"
app:counterMaxLength="95"
app:errorEnabled="true">
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/send_address_hint"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/bScan"
style="@style/MoneroText.Button"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:background="@drawable/ic_scan"
android:text="@string/send_qr_hint" />
</LinearLayout>
<com.m2049r.xmrwallet.widget.ExchangeView
android:id="@+id/evAmount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="0dp"
android:orientation="vertical" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="horizontal"
android:weightSum="10">
<android.support.design.widget.TextInputLayout
android:id="@+id/etPaymentId"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
app:counterEnabled="true"
app:counterMaxLength="16"
app:errorEnabled="true">
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
android:backgroundTint="@color/moneroGray"
android:hint="@string/send_paymentid_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/bPaymentId"
style="@style/MoneroText.Button.Small"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:background="?android:selectableItemBackground"
android:drawableTop="@drawable/ic_settings_orange_24dp"
android:text="@string/send_generate_paymentid_hint"
android:textColor="@color/moneroGray" />
</LinearLayout>
<EditText <EditText
android:id="@+id/etDummy" android:id="@+id/etDummy"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" /> android:layout_height="0dp" />
<com.m2049r.xmrwallet.layout.SpendViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/llNavBar"
android:padding="8dp" />
<LinearLayout <LinearLayout
android:id="@+id/llNavBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16sp" android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <Button
style="@style/MoneroLabel.Caps.Gray.Small" android:id="@+id/bPrev"
android:layout_width="wrap_content" style="@style/MoneroButton"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_gravity="center|end" android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:text="Advanced:"
android:textAlignment="textEnd" />
<Spinner
android:id="@+id/sMixin"
style="@style/MoneroSpinnerGray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1" android:layout_weight="1"
android:entries="@array/mixin" android:drawableStart="@drawable/ic_navigate_prev_white_24dp"
android:textAlignment="center" /> tools:text="Back" />
<Spinner <com.m2049r.xmrwallet.widget.DotBar
android:id="@+id/sPriority" android:id="@+id/dotBar"
style="@style/MoneroSpinnerGray" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_height="wrap_content" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:entries="@array/priority" android:background="@color/gradientOrange"
android:textAlignment="center" /> app:activeColor="@color/white"
app:activeDot="0"
app:dotSize="12dp"
app:inactiveColor="@color/dotGray"
app:numberDots="4" />
<Button
android:id="@+id/bNext"
style="@style/MoneroButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableEnd="@drawable/ic_navigate_next_white_24dp"
tools:text="Next" />
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/bPrepareSend" android:id="@+id/bDone"
style="@style/MoneroButton" style="@style/MoneroButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_alignParentBottom="true"
android:layout_marginTop="4dp" android:layout_gravity="bottom"
android:enabled="true" android:text="@string/label_send_done"
android:minHeight="36dp"
android:text="@string/send_prepare_hint" />
<ProgressBar
android:id="@+id/pbProgress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout </RelativeLayout>
android:id="@+id/llConfirmSend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:orientation="vertical"
android:visibility="gone">
<Button
android:id="@+id/bDispose"
style="@style/MoneroButton.Alert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:minHeight="36dp"
android:text="@string/send_dispose_hint" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:id="@+id/tvTxAmountLabel"
style="@style/MoneroLabel.Caps"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/send_amount_label"
android:textAlignment="textEnd" />
<TextView
android:id="@+id/tvTxAmount"
style="@style/MoneroText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_weight="2"
android:textAlignment="textEnd"
tools:text="143.008000000000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:id="@+id/tvTxFeeLabel"
style="@style/MoneroLabel.Caps.Gray"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:text="@string/send_fee_label"
android:textAlignment="textEnd" />
<TextView
android:id="@+id/tvTxFee"
style="@style/MoneroText.Gray"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_weight="2"
android:textAlignment="textEnd"
tools:text="0.006817000000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:id="@+id/tvTxTotalLabel"
style="@style/MoneroLabel.Caps.Black"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/send_total_label"
android:textAlignment="textEnd" />
<TextView
android:id="@+id/tvTxTotal"
style="@style/MoneroText.Black"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_weight="2"
android:textAlignment="textEnd"
tools:text="143.014817000000" />
</LinearLayout>
<EditText
android:id="@+id/etNotes"
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:backgroundTint="@color/moneroGray"
android:hint="@string/send_notes_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
<Button
android:id="@+id/bSend"
style="@style/MoneroButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:enabled="false"
android:minHeight="36dp"
android:text="@string/send_send_label" />
<Button
android:id="@+id/bReallySend"
style="@style/MoneroButton.ReallySend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="16dp"
android:enabled="false"
android:padding="8dp"
android:text="@string/send_really_send_hint"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</ScrollView>

7
app/src/main/res/layout/fragment_send_btc_confirm.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -250,3 +254,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

7
app/src/main/res/layout/fragment_send_confirm.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -197,3 +201,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

71
app/src/main/res/layout/fragment_send_new.xml
View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<EditText
android:id="@+id/etDummy"
android:layout_width="0dp"
android:layout_height="0dp" />
<com.m2049r.xmrwallet.layout.SpendViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/llNavBar"
android:padding="8dp" />
<LinearLayout
android:id="@+id/llNavBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:orientation="horizontal">
<Button
android:id="@+id/bPrev"
style="@style/MoneroButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableStart="@drawable/ic_navigate_prev_white_24dp"
tools:text="Back" />
<com.m2049r.xmrwallet.widget.DotBar
android:id="@+id/dotBar"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@color/gradientOrange"
app:activeColor="@color/white"
app:activeDot="0"
app:dotSize="12dp"
app:inactiveColor="@color/dotGray"
app:numberDots="4" />
<Button
android:id="@+id/bNext"
style="@style/MoneroButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableEnd="@drawable/ic_navigate_next_white_24dp"
tools:text="Next" />
</LinearLayout>
<Button
android:id="@+id/bDone"
style="@style/MoneroButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:text="@string/label_send_done"
android:visibility="gone" />
</RelativeLayout>

3
app/src/main/res/values/about.xml
View File

@ -43,6 +43,9 @@
See their privacy policy at https://www.kraken.com/legal/privacy for See their privacy policy at https://www.kraken.com/legal/privacy for
details on how data in your requests is collected (especially the details on how data in your requests is collected (especially the
section "Information We Collect Automatically").</p> section "Information We Collect Automatically").</p>
<p>If you use the app to pay to BTC addresses, you will be using the XMR.TO service.
See their privacy policy at https://xmr.to/ for details. Monerujo send them the BTC
destination address and amount. Your IP will also be collectable.</p>
<h2>App Permissions</h2> <h2>App Permissions</h2>
<ul> <ul>
<li>INTERNET : Connect to the Monero Network via a Monero Daemon Node</li> <li>INTERNET : Connect to the Monero Network via a Monero Daemon Node</li>