Merge branch 'dev' into send-screen-redesign

.gitignore

@@ -15,4 +15,3 @@
 /app/alphaStagenet
 /app/prodStagenet
 /app/.cxx
-/mynero.id

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="net.mynero.wallet">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2"
 
     }

doc/BUILDING-external-libs.md

@@ -4,22 +4,21 @@
 
 1. Docker
 
-2. `make` (sudo apt install make, little tricky to get it on Windows, https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows)
+2. `sudo apt install make automake libtinfo5`
 
 3. Huge amount of RAM and free disk space
 
 ## Building:
 
-1. Clone https://github.com/pokkst/monero repo.
+1. Clone the Monero repo required for this app to function. A specific fork for UTXO management is hosted here: http://git.mynero.i2p/pokkst/monero.git
+Clone a specific branch, and shorten I2P download time with `git clone -b release-v0.18.1.2-mynero --single-branch --depth 1 http://git.mynero.i2p/pokkst/monero.git`
 
-2. Change repo to correct branch (example: `git checkout release-v0.18.1.1-mynero`).
+2. Update submodules: `git submodule update --init --force`.
 
-3. Update submodules: `git submodule update --init --force`.
+3. Then go to folder with monero-wallet repo, then external-libs. Here you need to create symbol link to `monero` folder:
-
-4. Then go to folder with monero-wallet repo, then external-libs. Here you need to create symbol link to `monero` folder:
 
 Linux: `ln -s ~/monero ~/monero-wallet/external-libs/monero`
 
 Windows: `mklink /D "C:\Users\<USERNAME>\monero-wallet\external-libs\monero" "C:\Users\<USERNAME>\monero"`
 
-5. Start Docker and then run `make` in `external-libs` folder. It will fail at end on Windows, but if `wallet2_api.h` exists in `include` folder, the build was successful. 
+5. Start Docker and then run `sudo make` in `external-libs` folder. It will fail at end on Windows, but if `wallet2_api.h` exists in `include` folder, the build was successful. 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Feb 10 17:24:42 CST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME