release android; remove google ads; add link to download app

CodingForMoney · CodingForMoney · commit ee94aa0d8338 · 2023-08-18T12:23:38.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ local.properties
 .cxx/
 *.keystore
 !debug.keystore
+android/app/release/
 
 # node.js
 #
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ So, when you back up your wallet, you should back up the mnemonic and the passwo
 
 ## Supported Chains
 
+- Bitcoin
 - Ethereum
 - Binance Smart Chain
 - EVM-compatible chains: Polygon, Fantom, Avalanche, etc. Not tested yet. If you meet any problems, please open an issue.
@@ -46,6 +47,12 @@ We will support Bitcoin and other chains in the future.
 - You can also contact us by email [info@prosurfer.net](mailto:info@prosurfer.net)
 - Please open an [issue](https://github.com/wave-org/DoomWallet/issues) if you want to report problems or bugs or request a new feature.
 
+## Download Now
+
+<a href='https://play.google.com/store/apps/details?id=org.wave.doom&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' style="width: 290px;"/></a>
+
+<a href="https://apps.apple.com/us/app/doom-wallet/id6455836435?itsct=apps_box_badge&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-radius: 13px; width: 250px; height: 83px; margin: 20px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-us?size=250x83&amp;releaseDate=1691020800" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a>
+
 ## How to use Doom Wallet?
 
 #### 1. Use MetaMask
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -73,13 +73,13 @@ android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    namespace "com.doomwallet"
+    namespace "org.wave.doom"
     defaultConfig {
-        applicationId "com.doomwallet"
+        applicationId "org.wave.doom"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "0.0.1"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
@@ -94,8 +94,11 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            applicationIdSuffix ".debug"
+            resValue 'string', 'app_name', '"Doom Debug"'
         }
         release {
+            resValue 'string', 'app_name', '"DoomWallet"'
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
diff --git a/android/app/src/debug/java/org/wave/doom/ReactNativeFlipper.java b/android/app/src/debug/java/org/wave/doom/ReactNativeFlipper.java
@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.doomwallet;
+package org.wave.doom;
 
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <application
       android:name=".MainApplication"
diff --git a/android/app/src/main/java/org/wave/doom/MainActivity.java b/android/app/src/main/java/org/wave/doom/MainActivity.java
@@ -1,4 +1,4 @@
-package com.doomwallet;
+package org.wave.doom;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
diff --git a/android/app/src/main/java/org/wave/doom/MainApplication.java b/android/app/src/main/java/org/wave/doom/MainApplication.java
@@ -1,6 +1,7 @@
-package com.doomwallet;
+package org.wave.doom;
 
 import android.app.Application;
+
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">DoomWallet</string>
 </resources>
diff --git a/android/app/src/release/java/org/wave/doom/ReactNativeFlipper.java b/android/app/src/release/java/org/wave/doom/ReactNativeFlipper.java
@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.doomwallet;
+package org.wave.doom;
 
 import android.content.Context;
 import com.facebook.react.ReactInstanceManager;
diff --git a/app.json b/app.json
@@ -1,8 +1,4 @@
 {
   "name": "DoomWallet",
-  "displayName": "Doom Wallet",
-  "react-native-google-mobile-ads": {
-    "android_app_id": "ca-app-pub-3940256099942544~6300978111",
-    "ios_app_id": "ca-app-pub-3940256099942544~2934735716"
-  }
+  "displayName": "Doom Wallet"
 }
diff --git a/app/pages/Home/index.tsx b/app/pages/Home/index.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import {SafeAreaView, Text, View, StyleSheet} from 'react-native';
-// import {BannerAd, TestIds} from 'react-native-google-mobile-ads';
 import NetInfo, {NetInfoState} from '@react-native-community/netinfo';
 
 const HomePage = () => {
@@ -27,24 +26,6 @@ const HomePage = () => {
             </Text>
           </View>
         </View>
-        {/* {networkState?.isConnected ? (
-          <Text style={styles.adsText}>
-            If you have network connection, you can see the ads below:
-          </Text>
-        ) : null}
-        {networkState?.isConnected ? (
-          <View style={styles.adContainer}>
-            <BannerAd
-              unitId={TestIds.BANNER}
-              // size="600x400"
-              // size="INLINE_ADAPTIVE_BANNER"
-              size="ANCHORED_ADAPTIVE_BANNER"
-              requestOptions={{
-                requestNonPersonalizedAdsOnly: true,
-              }}
-            />
-          </View>
-        ) : null} */}
       </View>
     </SafeAreaView>
   );
diff --git a/app/pages/Setup/index.tsx b/app/pages/Setup/index.tsx
@@ -9,13 +9,15 @@ import {
   TouchableWithoutFeedback,
   TouchableOpacity,
   ScrollView,
+  ActivityIndicator,
 } from 'react-native';
 import Routes from '../../routes/Routes';
 import * as wallet from '../../wallet';
 import Toast from 'react-native-toast-message';
 import MnemonicView from '../../components/MnemonicView';
 
 const SetupPage = ({navigation}: {navigation: any}) => {
+  const [loading, setLoading] = React.useState<boolean>(false);
   const [text, setText] = React.useState<string>('');
   const [editingText, setEditingText] = React.useState<boolean>(false);
   const [mnemonic, setMnemonic] = React.useState<string>('');
@@ -70,23 +72,34 @@ const SetupPage = ({navigation}: {navigation: any}) => {
   };
 
   const complete = () => {
+    setLoading(true);
     // save to storage
-    try {
-      wallet.setupWallet({
-        mnemonic,
-        password,
-        passwordType,
-        simplePassword,
-        useBiometrics,
-      });
-      navigation.replace(Routes.ROOT.TABS);
-    } catch (error) {
-      let message = (error as Error).message;
-      Toast.show({
-        type: 'error',
-        text1: message,
-      });
+    async function loadWallet() {
+      try {
+        wallet.setupWallet({
+          mnemonic,
+          password,
+          passwordType,
+          simplePassword,
+          useBiometrics,
+        });
+        setTimeout(() => {
+          setLoading(false);
+          navigation.replace(Routes.ROOT.TABS);
+        }, 50);
+      } catch (error) {
+        setLoading(false);
+        let message = (error as Error).message;
+        Toast.show({
+          type: 'error',
+          text1: message,
+        });
+      }
     }
+
+    setTimeout(() => {
+      loadWallet();
+    }, 50);
   };
 
   const successView = () => {
@@ -154,6 +167,11 @@ const SetupPage = ({navigation}: {navigation: any}) => {
             </View>
           </ScrollView>
         </TouchableWithoutFeedback>
+        {loading ? (
+          <View style={styles.indicatorView}>
+            <ActivityIndicator size="large" color="#00ff00" />
+          </View>
+        ) : null}
       </SafeAreaView>
     );
   };
@@ -357,6 +375,17 @@ const styles = StyleSheet.create({
     fontSize: 16,
     color: '#ffffff',
   },
+  indicatorView: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    width: '100%',
+    height: '100%',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'rgba(0,0,0,0.5)',
+  },
 });
 
 export default SetupPage;
diff --git a/index.js b/index.js
@@ -6,13 +6,6 @@ import 'fast-text-encoding';
 import Joi from 'joi';
 global.Buffer = require('buffer').Buffer;
 import 'react-native-get-random-values';
-import mobileAds from 'react-native-google-mobile-ads';
-
-mobileAds()
-  .initialize()
-  .then(adapterStatuses => {
-    // Initialization complete!
-  });
 
 import {AppRegistry, Appearance} from 'react-native';
 
diff --git a/ios/DoomWallet.xcodeproj/project.pbxproj b/ios/DoomWallet.xcodeproj/project.pbxproj
@@ -184,7 +184,6 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */,
 				E235C05ADACE081382539298 /* [CP] Copy Pods Resources */,
-				48B6270F39B074831C756C2A /* [CP-User] [RNGoogleMobileAds] Configuration */,
 			);
 			buildRules = (
 			);
@@ -284,19 +283,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DoomWallet/Pods-DoomWallet-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		48B6270F39B074831C756C2A /* [CP-User] [RNGoogleMobileAds] Configuration */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
-			);
-			name = "[CP-User] [RNGoogleMobileAds] Configuration";
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "#!/usr/bin/env bash\n#\n# Copyright (c) 2016-present Invertase Limited & Contributors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this library except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\nset -e\n\n_MAX_LOOKUPS=2;\n_SEARCH_RESULT=''\n_RN_ROOT_EXISTS=''\n_CURRENT_LOOKUPS=1\n_PROJECT_ABBREVIATION=\"RNGoogleMobileAds\"\n_JSON_ROOT=\"'react-native-google-mobile-ads'\"\n_JSON_FILE_NAME='app.json'\n_JSON_OUTPUT_BASE64='e30=' # { }\n_CURRENT_SEARCH_DIR=${PROJECT_DIR}\n_PLIST_BUDDY=/usr/libexec/PlistBuddy\n_TARGET_PLIST=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n_DSYM_PLIST=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\n\n# plist arrays\n_PLIST_ENTRY_KEYS=()\n_PLIST_ENTRY_TYPES=()\n_PLIST_ENTRY_VALUES=()\n\nfunction setPlistValue {\n  echo \"info:      setting plist entry '$1' of type '$2' in file '$4'\"\n  ${_PLIST_BUDDY} -c \"Add :$1 $2 '$3'\" $4 || echo \"info:      '$1' already exists\"\n}\n\nfunction getJsonKeyValue () {\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    ruby -KU -e \"require 'rubygems';require 'json'; output=JSON.parse('$1'); puts output[$_JSON_ROOT]['$2']\"\n  else\n    echo \"\"\n  fi;\n}\n\nfunction jsonBoolToYesNo () {\n  if [[ $1 == \"false\" ]]; then\n    echo \"NO\"\n  elif [[ $1 == \"true\" ]]; then\n    echo \"YES\"\n  else echo \"NO\"\n  fi\n}\n\necho \"info: -> ${_PROJECT_ABBREVIATION} build script started\"\necho \"info: 1) Locating ${_JSON_FILE_NAME} file:\"\n\nif [[ -z ${_CURRENT_SEARCH_DIR} ]]; then\n  _CURRENT_SEARCH_DIR=$(pwd)\nfi;\n\nwhile true; do\n  _CURRENT_SEARCH_DIR=$(dirname \"$_CURRENT_SEARCH_DIR\")\n  if [[ \"$_CURRENT_SEARCH_DIR\" == \"/\" ]] || [[ ${_CURRENT_LOOKUPS} -gt ${_MAX_LOOKUPS} ]]; then break; fi;\n  echo \"info:      ($_CURRENT_LOOKUPS of $_MAX_LOOKUPS) Searching in '$_CURRENT_SEARCH_DIR' for a ${_JSON_FILE_NAME} file.\"\n  _SEARCH_RESULT=$(find \"$_CURRENT_SEARCH_DIR\" -maxdepth 2 -name ${_JSON_FILE_NAME} -print | /usr/bin/head -n 1)\n  if [[ ${_SEARCH_RESULT} ]]; then\n    echo \"info:      ${_JSON_FILE_NAME} found at $_SEARCH_RESULT\"\n    break;\n  fi;\n  _CURRENT_LOOKUPS=$((_CURRENT_LOOKUPS+1))\ndone\n\nif [[ ${_SEARCH_RESULT} ]]; then\n  _JSON_OUTPUT_RAW=$(cat \"${_SEARCH_RESULT}\")\n  _RN_ROOT_EXISTS=$(ruby -KU -e \"require 'rubygems';require 'json'; output=JSON.parse('$_JSON_OUTPUT_RAW'); puts output[$_JSON_ROOT]\" || echo '')\n\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    if ! python3 --version >/dev/null 2>&1; then echo \"python3 not found, app.json file processing error.\" && exit 1; fi\n    _JSON_OUTPUT_BASE64=$(python3 -c 'import json,sys,base64;print(base64.b64encode(bytes(json.dumps(json.loads(open('\"'${_SEARCH_RESULT}'\"', '\"'rb'\"').read())['${_JSON_ROOT}']), '\"'utf-8'\"')).decode())' || echo \"e30=\")\n  fi\n\n  _PLIST_ENTRY_KEYS+=(\"google_mobile_ads_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n\n  # config.delay_app_measurement_init\n  _DELAY_APP_MEASUREMENT=$(getJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"delay_app_measurement_init\")\n  if [[ $_DELAY_APP_MEASUREMENT == \"true\" ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GADDelayAppMeasurementInit\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"YES\")\n  fi\n\n  # config.ios_app_id\n  _IOS_APP_ID=$(getJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"ios_app_id\")\n  if [[ $_IOS_APP_ID ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GADApplicationIdentifier\")\n    _PLIST_ENTRY_TYPES+=(\"string\")\n    _PLIST_ENTRY_VALUES+=(\"$_IOS_APP_ID\")\n  fi\n\n  # config.sk_ad_network_items\n  _SK_AD_NETWORK_ITEMS=$(getJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"sk_ad_network_items\")\n  if [[ $_SK_AD_NETWORK_ITEMS ]]; then\n    _PLIST_ENTRY_KEYS+=(\"SKAdNetworkItems\")\n    _PLIST_ENTRY_TYPES+=(\"array\")\n    _PLIST_ENTRY_VALUES+=(\"\")\n\n    oldifs=$IFS\n    IFS=\"\n\"\n    array=($(echo \"$_SK_AD_NETWORK_ITEMS\"))\n    IFS=$oldifs\n    for i in \"${!array[@]}\"; do\n      _PLIST_ENTRY_KEYS+=(\"SKAdNetworkItems:$i:SKAdNetworkIdentifier\")\n      _PLIST_ENTRY_TYPES+=(\"string\")\n      _PLIST_ENTRY_VALUES+=(\"${array[i]}\")  \n    done\n  fi\n\n    # config.user_tracking_usage_description\n  _USER_TRACKING_USAGE_DESCRIPTION=$(getJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"user_tracking_usage_description\")\n  if [[ $_USER_TRACKING_USAGE_DESCRIPTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"NSUserTrackingUsageDescription\")\n    _PLIST_ENTRY_TYPES+=(\"string\")\n    _PLIST_ENTRY_VALUES+=(\"$_USER_TRACKING_USAGE_DESCRIPTION\")\n  fi\nelse\n  _PLIST_ENTRY_KEYS+=(\"google_mobile_ads_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n  echo \"warning:   A ${_JSON_FILE_NAME} file was not found, whilst this file is optional it is recommended to include it to auto-configure services.\"\nfi;\n\necho \"info: 2) Injecting Info.plist entries: \"\n\n# Log out the keys we're adding\nfor i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n  echo \"    ->  $i) ${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\"\ndone\n\nif ! [[ -f \"${_TARGET_PLIST}\" ]]; then\n  echo \"error: unable to locate Info.plist to set properties. App will crash without GADApplicationIdentifier set.\"\n  exit 1\nfi\n\nif ! [[ $_IOS_APP_ID ]]; then\n  echo \"error: ios_app_id key not found in react-native-google-mobile-ads key in app.json. App will crash without it.\"\n  exit 1\nfi\n\nfor plist in \"${_TARGET_PLIST}\" \"${_DSYM_PLIST}\" ; do\n  if [[ -f \"${plist}\" ]]; then\n\n    # paths with spaces break the call to setPlistValue. temporarily modify\n    # the shell internal field separator variable (IFS), which normally\n    # includes spaces, to consist only of line breaks\n    oldifs=$IFS\n    IFS=\"\n\"\n\n    for i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n      setPlistValue \"${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\" \"${plist}\"\n    done\n\n    # restore the original internal field separator value\n    IFS=$oldifs\n  else\n    echo \"warning:   A Info.plist build output file was not found (${plist})\"\n  fi\ndone\n\necho \"info: <- ${_PROJECT_ABBREVIATION} build script finished\"\n";
-		};
 		A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ local.properties`
`33`	`33`	`.cxx/`
`34`	`34`	`*.keystore`
`35`	`35`	`!debug.keystore`
	`36`	`+android/app/release/`
`36`	`37`
`37`	`38`	`# node.js`
`38`	`39`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.doomwallet;`
	`1`	`+package org.wave.doom;`
`2`	`2`
`3`	`3`	`import com.facebook.react.ReactActivity;`
`4`	`4`	`import com.facebook.react.ReactActivityDelegate;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`<resources>`
`2`		`- <string name="app_name">DoomWallet</string>`
`3`	`2`	`</resources>`