diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8ee28627f7ea..cf6afd8d5a59 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,12 +1,12 @@ ## What does this implement/fix? Explain your changes. … -## Does this close any currently open issues? +## Does this close any currently open issues? If it fixes a bug or resolves a feature request, be sure to link to that issue. … ## Pull request type - + _Put an `x` in the boxes that apply_ - [ ] Bugfix - [ ] Feature @@ -14,7 +14,7 @@ _Put an `x` in the boxes that apply_ - [ ] Refactoring (no functional changes, no api changes) - [ ] Build related changes - [ ] Documentation content changes -- [ ] Other (please describe): +- [ ] Other (please describe): ## Where has this been tested? … diff --git a/.github/workflows/ios-app-build.yml b/.github/workflows/ios-app-build.yml index 54adf6bc916a..99dcc65f6df1 100644 --- a/.github/workflows/ios-app-build.yml +++ b/.github/workflows/ios-app-build.yml @@ -77,7 +77,7 @@ jobs: plutil -insert 'provisioningProfiles' -xml " $APP_ID $UUID_PROVISION " -- Support/OneKey-Info.plist plutil -insert 'teamID' -string "$DEVELOPMENT_TEAM" -- Support/OneKey-Info.plist plutil -insert 'signingStyle' -string "mannual" -- Support/OneKey-Info.plist - working-directory: ios + working-directory: ios - name: Build app id: xcodebuild_export run: | @@ -140,7 +140,7 @@ jobs: | tee xcodebuild.log \ | xcpretty -r json-compilation-database --output compile_commands.json oclint-json-compilation-database -e Pods -e CustomCode/Modules/Third/ -- -report-type html -o oclintReport.html - working-directory: ios/iOS + working-directory: ios/iOS - name: Archive lint artifacts uses: actions/upload-artifact@v2 if: success() @@ -148,6 +148,5 @@ jobs: name: OneKey ios app lint report path: | ios/iOS/xcodebuild.log - ios/iOS/oclintReport.html + ios/iOS/oclintReport.html ios/iOS/clang-analyze/StaticAnalyzer/ - diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9abb7c6150ed..44c880884d02 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -8,14 +8,6 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: actions/cache@v1 - with: - path: ~/.cache/pre-commit - key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} - - id: file_changes - uses: jitterbit/get-changed-files@v1 - - uses: pre-commit/action@v2.0.0 - with: - extra_args: --files ${{ steps.file_changes.outputs.all }} + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - uses: pre-commit/action@v2.0.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54fbcdbf2368..e1ba35a30dda 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,5 +37,5 @@ repos: rev: 1.7.0 hooks: - id: bandit - files: ^electrum_gui - args: [--skip, "B107,B101,B106",] + files: ^electrum_gui/common + args: [--skip, "B107,B101,B106"] diff --git a/.travis.yml b/.travis.yml index c7b90fa59450..01f14d2d33d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,11 @@ jobs: - if [ $TRAVIS_PULL_REQUEST == false ]; then openssl aes-256-cbc -K $encrypted_0712df971a99_key -iv $encrypted_0712df971a99_iv -in android/local.properties.enc -out android/local.properties -d; - sudo docker run --rm -it --name electrum-android-native-builder-cont -v $PWD:/data + sudo docker run --rm -it --name electrum-android-native-builder-cont -v $PWD:/data -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER --workdir=/data/android lightningcn/electrum_env:latest /bin/bash -c 'cp debug.keystore ~/.android/debug.keystore && /data/android/gradlew app:assembleDebug'; else - sudo docker run --rm -it --name electrum-android-native-builder-cont -v $PWD:/data + sudo docker run --rm -it --name electrum-android-native-builder-cont -v $PWD:/data -e TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER --workdir=/data/android lightningcn/electrum_env:latest /bin/bash -c 'cp ~/android/local.properties local.properties && cp debug.keystore ~/.android/debug.keystore && /data/android/gradlew app:assembleDebug'; fi @@ -69,7 +69,7 @@ deploy: provider: releases api_key: $GITHUB_API_KEY file_glob: true - file: + file: - "android/app/build/outputs/apk/MainNetOnekey/debug/*.apk" - "android/app/build/outputs/apk/MainNetOnekey/release/*.apk" - "android/app/build/outputs/apk/TestNetOnekey/debug/*.apk" diff --git a/AUTHORS b/AUTHORS index 9cff06784e0c..0a938ec3e378 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,4 +9,4 @@ Genjix - Porting pro-mode functionality to lite-gui and worked on server Slush - Work on the server. Designed the original Stratum spec. Julian Toash (Tuxavant) - Various fixes to the client. rdymac - Website and translations. -kyuupichan - Miscellaneous. \ No newline at end of file +kyuupichan - Miscellaneous. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 2c3308b251ab..d8be371663fa 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -511,7 +511,7 @@ issue #3374. Users should upgrade to 3.0.5. run "python3 setup.py install" in order to install the new dependencies. - * Segwit support: + * Segwit support: - Native segwit scripts are supported using a new type of seed. The version number for segwit seeds is 0x100. The install diff --git a/android/Dockerfile b/android/Dockerfile index 213d951a31e1..7f0d06e447b3 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && \ apt-get install -y gettext openjdk-8-jdk-headless unzip wget RUN echo "progress=dot:giga" > .wgetrc -# install Python 3.8 +# install Python 3.8 RUN apt install -y python3.8 libpython3.8-minimal libpython3.8-dev libpython3.8-stdlib python3-distutils RUN filename=sdk-tools-linux-4333796.zip && \ diff --git a/android/app/proguard-android-optimize-wallet.txt b/android/app/proguard-android-optimize-wallet.txt index 0ba95a58aae9..decead776deb 100644 --- a/android/app/proguard-android-optimize-wallet.txt +++ b/android/app/proguard-android-optimize-wallet.txt @@ -97,4 +97,4 @@ -keepclasseswithmembers class * { @androidx.annotation.Keep (...); -} \ No newline at end of file +} diff --git a/android/app/proguard-dict.txt b/android/app/proguard-dict.txt index 6cd876527e03..cba77dc33870 100644 --- a/android/app/proguard-dict.txt +++ b/android/app/proguard-dict.txt @@ -200,4 +200,4 @@ Mmmmmm Mmmmm Mmmm Mmm -Mm \ No newline at end of file +Mm diff --git a/android/app/src/main/assets/initParams.json b/android/app/src/main/assets/initParams.json index e33b519c1aa0..fa7e45c10a94 100644 --- a/android/app/src/main/assets/initParams.json +++ b/android/app/src/main/assets/initParams.json @@ -6,4 +6,4 @@ "hostID": "8080808080808080", "crt": "7F2181E89310434552545F4150505F45434B41303031420D6A75626974657277616C6C65745F200D6A75626974657277616C6C6574950200805F2504202005255F2404202505245300BF200EEF0C8D0A820182028203820482057F4946B041048FD3FAB3907C5CC8CD193EB2B653EA179115B7F305C9E21DE6D29C0736A3B82025B219F24BDA86D80F5AE262521E124F4C6691A0C47B1FB72D95895E9312CB0DF001005F3746304402204D75EAA2F09604A9597DA905D680EB619B8ADCF080E5AD6950E1DBF26195C9E2022067649AFB4A8BC380B382520499C6F2BB350A8519B0ECDBE0B7374AA898826D0E", "sk": "B66BE8CB7512A6DFF741839EE8C5092D6987A5D7790E93B52EBB16FCD4EAD7AA" -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/ReceivedPageActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/ReceivedPageActivity.java index 6d1b8dc541f5..2982af36d9b3 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/ReceivedPageActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/ReceivedPageActivity.java @@ -264,4 +264,3 @@ protected void onDestroy() { } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/ShareOtherActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/ShareOtherActivity.java index a3191ddf9c7a..da867d8981ff 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/ShareOtherActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/ShareOtherActivity.java @@ -373,4 +373,3 @@ protected void onDestroy() { }); } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/personalwallet/mnemonic_word/CreatePersonalHelpPassActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/personalwallet/mnemonic_word/CreatePersonalHelpPassActivity.java index 118c919eccc1..aff5fb03e1cd 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/personalwallet/mnemonic_word/CreatePersonalHelpPassActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/personalwallet/mnemonic_word/CreatePersonalHelpPassActivity.java @@ -186,7 +186,3 @@ public void run() { }); } } - - - - diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/service/NfcNotifyHelper.java b/android/app/src/main/java/org/haobtc/onekey/activities/service/NfcNotifyHelper.java index ad24da3049b8..ceee3deee0c2 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/service/NfcNotifyHelper.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/service/NfcNotifyHelper.java @@ -173,4 +173,4 @@ protected void onRestart() { super.onRestart(); finish(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/settings/fixpin/ChangePinFailedActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/settings/fixpin/ChangePinFailedActivity.java index cb688b31b32e..39d92b576f5d 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/settings/fixpin/ChangePinFailedActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/settings/fixpin/ChangePinFailedActivity.java @@ -47,4 +47,4 @@ public void onViewClicked(View view) { default: } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/InputBackupPassActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/InputBackupPassActivity.java index 76d48a1b00fd..ca38a5e9f7e0 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/InputBackupPassActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/InputBackupPassActivity.java @@ -74,7 +74,3 @@ public void onViewClicked(View view) { } } } - - - - diff --git a/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/RecoveryActivity.java b/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/RecoveryActivity.java index efec4be8d573..844c7c039587 100644 --- a/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/RecoveryActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/activities/settings/recovery_set/RecoveryActivity.java @@ -188,4 +188,3 @@ protected void onRestart() { } } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/adapter/ChoosePayAddressAdapter.java b/android/app/src/main/java/org/haobtc/onekey/adapter/ChoosePayAddressAdapter.java index 4b7f6f42878a..8eebb6ed387d 100644 --- a/android/app/src/main/java/org/haobtc/onekey/adapter/ChoosePayAddressAdapter.java +++ b/android/app/src/main/java/org/haobtc/onekey/adapter/ChoosePayAddressAdapter.java @@ -106,4 +106,4 @@ public void setmOnItemClickListener(OnItemClickListener mOnItemClickListener) { this.mOnItemClickListener = mOnItemClickListener; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/adapter/MoreAddressAdapter.java b/android/app/src/main/java/org/haobtc/onekey/adapter/MoreAddressAdapter.java index 9f0dba9c92e2..c0b6845089a9 100644 --- a/android/app/src/main/java/org/haobtc/onekey/adapter/MoreAddressAdapter.java +++ b/android/app/src/main/java/org/haobtc/onekey/adapter/MoreAddressAdapter.java @@ -53,4 +53,3 @@ protected void convert(BaseViewHolder helper, TransactionInfoBean.OutputAddrBean } } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/bean/HardwareFeatures.java b/android/app/src/main/java/org/haobtc/onekey/bean/HardwareFeatures.java index ec7c112f6730..4d805b223d10 100644 --- a/android/app/src/main/java/org/haobtc/onekey/bean/HardwareFeatures.java +++ b/android/app/src/main/java/org/haobtc/onekey/bean/HardwareFeatures.java @@ -382,4 +382,4 @@ public void setOneKeyVersion(String oneKeyVersion) { public String toString() { return new Gson().toJson(this); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/bean/TransactionInfoBean.java b/android/app/src/main/java/org/haobtc/onekey/bean/TransactionInfoBean.java index 2e71919340d8..6139ed38e21c 100644 --- a/android/app/src/main/java/org/haobtc/onekey/bean/TransactionInfoBean.java +++ b/android/app/src/main/java/org/haobtc/onekey/bean/TransactionInfoBean.java @@ -217,4 +217,4 @@ public void setAddress(String address) { this.address = address; } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/card/CardPin.java b/android/app/src/main/java/org/haobtc/onekey/card/CardPin.java index 91d38ae65e88..b94cba93a8b5 100644 --- a/android/app/src/main/java/org/haobtc/onekey/card/CardPin.java +++ b/android/app/src/main/java/org/haobtc/onekey/card/CardPin.java @@ -145,4 +145,3 @@ public void onButtonRequest(ButtonRequestEvent event) { // finish(); // } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/card/InitParameter.java b/android/app/src/main/java/org/haobtc/onekey/card/InitParameter.java index 093859cb8e7a..c505f3701c77 100644 --- a/android/app/src/main/java/org/haobtc/onekey/card/InitParameter.java +++ b/android/app/src/main/java/org/haobtc/onekey/card/InitParameter.java @@ -15,4 +15,4 @@ public InitParameter(Context context, Tag tag) { this.mContext = context; this.mTag = tag; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/card/NativeApi.java b/android/app/src/main/java/org/haobtc/onekey/card/NativeApi.java index 63c46fe7b82a..ecce3340f9d6 100644 --- a/android/app/src/main/java/org/haobtc/onekey/card/NativeApi.java +++ b/android/app/src/main/java/org/haobtc/onekey/card/NativeApi.java @@ -61,4 +61,4 @@ public class NativeApi { public static native String[] nativeBTCGetAddress(long contextID, String json); -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/card/utils/JsonParseUtils.java b/android/app/src/main/java/org/haobtc/onekey/card/utils/JsonParseUtils.java index 27ba9ce38c5d..fb603980b13d 100644 --- a/android/app/src/main/java/org/haobtc/onekey/card/utils/JsonParseUtils.java +++ b/android/app/src/main/java/org/haobtc/onekey/card/utils/JsonParseUtils.java @@ -36,4 +36,4 @@ public static String getJsonStr(Context context, String name) { return ""; } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/card/utils/Utils.java b/android/app/src/main/java/org/haobtc/onekey/card/utils/Utils.java index 4c24121a982a..6d3cedea94de 100644 --- a/android/app/src/main/java/org/haobtc/onekey/card/utils/Utils.java +++ b/android/app/src/main/java/org/haobtc/onekey/card/utils/Utils.java @@ -81,4 +81,4 @@ public static String byte2HexStr(byte b) { char d = (char)(j > 9 ? 'A' + j%10 : '0' + j); return "" + c + d; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/dfu/NotificationActivity.java b/android/app/src/main/java/org/haobtc/onekey/dfu/NotificationActivity.java index 5807c56b23b5..9c3f8748f849 100644 --- a/android/app/src/main/java/org/haobtc/onekey/dfu/NotificationActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/dfu/NotificationActivity.java @@ -22,4 +22,4 @@ protected void onCreate(Bundle savedInstanceState) { // of the task stack finish(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/dfu/service/DfuService.java b/android/app/src/main/java/org/haobtc/onekey/dfu/service/DfuService.java index 11bbc3fd8cd8..a77211812b44 100644 --- a/android/app/src/main/java/org/haobtc/onekey/dfu/service/DfuService.java +++ b/android/app/src/main/java/org/haobtc/onekey/dfu/service/DfuService.java @@ -15,14 +15,14 @@ public class DfuService extends DfuBaseService { protected Class getNotificationTarget() { /* * As a target activity the NotificationActivity is returned, not the MainActivity. This is because the notification must create a new task: - * + * * intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - * + * * when user press it. Using NotificationActivity we can check whether the new activity is a root activity (that means no other activity was open before) * or that there is other activity already open. In the later case the notificationActivity will just be closed. System will restore the previous activity. * However if the application has been closed during upload and user click the notification a NotificationActivity will be launched as a root activity. * It will create and start the main activity and terminate itself. - * + * * This method may be used to restore the target activity in case the application was closed or is open. It may also be used to recreate an activity * history (see NotificationActivity). */ @@ -34,4 +34,4 @@ protected boolean isDebug() { // return BuildConfig.DEBUG; return true; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/event/ButtonRequestEvent.java b/android/app/src/main/java/org/haobtc/onekey/event/ButtonRequestEvent.java index d098fe486da3..292329983b13 100644 --- a/android/app/src/main/java/org/haobtc/onekey/event/ButtonRequestEvent.java +++ b/android/app/src/main/java/org/haobtc/onekey/event/ButtonRequestEvent.java @@ -14,4 +14,4 @@ public ButtonRequestEvent(int type) { public int getType() { return type; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/exception/ByteFormatException.java b/android/app/src/main/java/org/haobtc/onekey/exception/ByteFormatException.java index 604beea3d069..c4c7416a4656 100644 --- a/android/app/src/main/java/org/haobtc/onekey/exception/ByteFormatException.java +++ b/android/app/src/main/java/org/haobtc/onekey/exception/ByteFormatException.java @@ -11,4 +11,4 @@ public ByteFormatException() { public ByteFormatException(String message) { super(message); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/fragment/mainwheel/WheelViewpagerFragment.java b/android/app/src/main/java/org/haobtc/onekey/fragment/mainwheel/WheelViewpagerFragment.java index 0c7eecb1b4f5..0eed7098678e 100644 --- a/android/app/src/main/java/org/haobtc/onekey/fragment/mainwheel/WheelViewpagerFragment.java +++ b/android/app/src/main/java/org/haobtc/onekey/fragment/mainwheel/WheelViewpagerFragment.java @@ -358,4 +358,4 @@ public void onDestroy() { super.onDestroy(); EventBus.getDefault().unregister(this); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/manager/PreferencesManager.java b/android/app/src/main/java/org/haobtc/onekey/manager/PreferencesManager.java index 75599f3723b3..cc2facc68d5d 100755 --- a/android/app/src/main/java/org/haobtc/onekey/manager/PreferencesManager.java +++ b/android/app/src/main/java/org/haobtc/onekey/manager/PreferencesManager.java @@ -152,4 +152,4 @@ public static boolean contains(Context context, String name, String key) { public static boolean hasWallet(Context context) { return !PreferencesManager.getAll(context, org.haobtc.onekey.constant.Constant.WALLETS).isEmpty(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupCheckSuccessActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupCheckSuccessActivity.java index 857f82387587..0d94c6b73200 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupCheckSuccessActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupCheckSuccessActivity.java @@ -60,4 +60,4 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { } return super.onKeyDown(keyCode, event); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupGuideActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupGuideActivity.java index f2f18eda2ad8..e0fbae970ad3 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupGuideActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/backup/BackupGuideActivity.java @@ -154,4 +154,4 @@ protected void onDestroy() { public boolean isRestricted() { return super.isRestricted(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/dialog/recovery/HardwareRecoveryActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/dialog/recovery/HardwareRecoveryActivity.java index 52dd627ce684..6ce16678c332 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/dialog/recovery/HardwareRecoveryActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/dialog/recovery/HardwareRecoveryActivity.java @@ -19,4 +19,4 @@ public void initView() { public void initData() { } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/DiscoverFragment.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/DiscoverFragment.java index 896aaa9e1c6f..458b63b20d42 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/DiscoverFragment.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/DiscoverFragment.java @@ -24,4 +24,4 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, return view; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/MindFragment.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/MindFragment.java index 3294b19db5d1..94b7e41092ab 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/MindFragment.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/MindFragment.java @@ -130,4 +130,4 @@ public void onViewClicked(View view) { break; } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/mindmenu/HdRootMnemonicsActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/mindmenu/HdRootMnemonicsActivity.java index a6bfca25a6b0..f385890126ca 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/mindmenu/HdRootMnemonicsActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/mindmenu/HdRootMnemonicsActivity.java @@ -200,4 +200,4 @@ protected void onDestroy() { EventBus.getDefault().unregister(this); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ChooseCurrencyActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ChooseCurrencyActivity.java index bdde8156b184..b0177ec403e8 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ChooseCurrencyActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ChooseCurrencyActivity.java @@ -51,4 +51,4 @@ public void onViewClicked(View view) { break; } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ExportPrivateActivity.java b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ExportPrivateActivity.java index ff2055f1df43..92712dfb23ee 100644 --- a/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ExportPrivateActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/onekeys/homepage/process/ExportPrivateActivity.java @@ -127,4 +127,4 @@ private void screenTipDialog(Context context, @LayoutRes int resource) { dialogBtoms.setCanceledOnTouchOutside(true); dialogBtoms.show(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/ui/activity/CreateMultiSigWalletActivity.java b/android/app/src/main/java/org/haobtc/onekey/ui/activity/CreateMultiSigWalletActivity.java index f774eead6feb..7e2ce66a6e2b 100644 --- a/android/app/src/main/java/org/haobtc/onekey/ui/activity/CreateMultiSigWalletActivity.java +++ b/android/app/src/main/java/org/haobtc/onekey/ui/activity/CreateMultiSigWalletActivity.java @@ -191,4 +191,4 @@ public void onViewClicked(View view) { public void onFinish(ExitEvent exitEvent) { finish(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/ui/dialog/custom/CustomWatchWalletDialog.java b/android/app/src/main/java/org/haobtc/onekey/ui/dialog/custom/CustomWatchWalletDialog.java index d9f3340a5ddc..129210d16c19 100644 --- a/android/app/src/main/java/org/haobtc/onekey/ui/dialog/custom/CustomWatchWalletDialog.java +++ b/android/app/src/main/java/org/haobtc/onekey/ui/dialog/custom/CustomWatchWalletDialog.java @@ -89,4 +89,3 @@ public void onDestroy () { } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/ui/fragment/ConfirmOnHardwareFragment.java b/android/app/src/main/java/org/haobtc/onekey/ui/fragment/ConfirmOnHardwareFragment.java index 6251b5470cb6..dd3d86a9c035 100644 --- a/android/app/src/main/java/org/haobtc/onekey/ui/fragment/ConfirmOnHardwareFragment.java +++ b/android/app/src/main/java/org/haobtc/onekey/ui/fragment/ConfirmOnHardwareFragment.java @@ -49,4 +49,3 @@ public boolean needEvents() { return true; } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/ui/widget/PointLengthFilter.java b/android/app/src/main/java/org/haobtc/onekey/ui/widget/PointLengthFilter.java index b944ac354cb6..0f11dc3274ca 100644 --- a/android/app/src/main/java/org/haobtc/onekey/ui/widget/PointLengthFilter.java +++ b/android/app/src/main/java/org/haobtc/onekey/ui/widget/PointLengthFilter.java @@ -39,4 +39,3 @@ public interface onMaxListener { } } - diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/ByteFormatter.java b/android/app/src/main/java/org/haobtc/onekey/utils/ByteFormatter.java index b6d952e1195b..6b5160af8630 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/ByteFormatter.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/ByteFormatter.java @@ -152,4 +152,4 @@ public static String addHexPrefix(String hex) { } return String.format("0x%s", hex.toLowerCase(Locale.getDefault())); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/CashierInputFilter.java b/android/app/src/main/java/org/haobtc/onekey/utils/CashierInputFilter.java index 97a6e5a02b5c..c2ba8556f214 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/CashierInputFilter.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/CashierInputFilter.java @@ -75,4 +75,4 @@ public CharSequence filter(CharSequence source, int start, int end, Spanned dest return dest.subSequence(dstart, dend) + sourceText; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/ClsUtils.java b/android/app/src/main/java/org/haobtc/onekey/utils/ClsUtils.java index c6745bbecebf..1b74adfbc09d 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/ClsUtils.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/ClsUtils.java @@ -7,130 +7,130 @@ import java.lang.reflect.Method; public class ClsUtils -{ - /** - * 与设备配对 参考源码:platform/packages/apps/Settings.git - * /Settings/src/com/android/settings/bluetooth/CachedBluetoothDevice.java - */ +{ + /** + * 与设备配对 参考源码:platform/packages/apps/Settings.git + * /Settings/src/com/android/settings/bluetooth/CachedBluetoothDevice.java + */ static public boolean createBond(Class btClass, BluetoothDevice btDevice) - throws Exception - { + throws Exception + { Method createBondMethod = btClass.getMethod("createBond"); - Boolean returnValue = (Boolean) createBondMethod.invoke(btDevice); - return returnValue.booleanValue(); - } - - /** - * 与设备解除配对 参考源码:platform/packages/apps/Settings.git - * /Settings/src/com/android/settings/bluetooth/CachedBluetoothDevice.java - */ - static public boolean removeBond(Class btClass, BluetoothDevice btDevice) - throws Exception - { - Method removeBondMethod = btClass.getMethod("removeBond"); - Boolean returnValue = (Boolean) removeBondMethod.invoke(btDevice); - return returnValue.booleanValue(); - } - - static public boolean setPin(Class btClass, BluetoothDevice btDevice, - String str) throws Exception - { - try - { - Method removeBondMethod = btClass.getDeclaredMethod("setPin", - new Class[] - {byte[].class}); - Boolean returnValue = (Boolean) removeBondMethod.invoke(btDevice, - new Object[] - {str.getBytes()}); - Log.e("returnValue", "" + returnValue); - } - catch (SecurityException e) - { - // throw new RuntimeException(e.getMessage()); - e.printStackTrace(); - } - catch (IllegalArgumentException e) - { - // throw new RuntimeException(e.getMessage()); - e.printStackTrace(); - } - catch (Exception e) - { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return true; - - } - - // 取消用户输入 - static public boolean cancelPairingUserInput(Class btClass, - BluetoothDevice device) throws Exception - { - Method createBondMethod = btClass.getMethod("cancelPairingUserInput"); -// cancelBondProcess(btClass, device); - Boolean returnValue = (Boolean) createBondMethod.invoke(device); - return returnValue.booleanValue(); - } - - // 取消配对 - static public boolean cancelBondProcess(Class btClass, - BluetoothDevice device) - - throws Exception - { - Method createBondMethod = btClass.getMethod("cancelBondProcess"); - Boolean returnValue = (Boolean) createBondMethod.invoke(device); - return returnValue.booleanValue(); - } - - //确认配对 - - static public void setPairingConfirmation(Class btClass,BluetoothDevice device,boolean isConfirm)throws Exception - { - Method setPairingConfirmation = btClass.getDeclaredMethod("setPairingConfirmation",boolean.class); - setPairingConfirmation.invoke(device,isConfirm); - } - - - /** - * - * @param clsShow - */ - static public void printAllInform(Class clsShow) - { - try - { - // 取得所有方法 - Method[] hideMethod = clsShow.getMethods(); - int i = 0; - for (; i < hideMethod.length; i++) - { - Log.e("method name", hideMethod[i].getName() + ";and the i is:" - + i); - } - // 取得所有常量 + Boolean returnValue = (Boolean) createBondMethod.invoke(btDevice); + return returnValue.booleanValue(); + } + + /** + * 与设备解除配对 参考源码:platform/packages/apps/Settings.git + * /Settings/src/com/android/settings/bluetooth/CachedBluetoothDevice.java + */ + static public boolean removeBond(Class btClass, BluetoothDevice btDevice) + throws Exception + { + Method removeBondMethod = btClass.getMethod("removeBond"); + Boolean returnValue = (Boolean) removeBondMethod.invoke(btDevice); + return returnValue.booleanValue(); + } + + static public boolean setPin(Class btClass, BluetoothDevice btDevice, + String str) throws Exception + { + try + { + Method removeBondMethod = btClass.getDeclaredMethod("setPin", + new Class[] + {byte[].class}); + Boolean returnValue = (Boolean) removeBondMethod.invoke(btDevice, + new Object[] + {str.getBytes()}); + Log.e("returnValue", "" + returnValue); + } + catch (SecurityException e) + { + // throw new RuntimeException(e.getMessage()); + e.printStackTrace(); + } + catch (IllegalArgumentException e) + { + // throw new RuntimeException(e.getMessage()); + e.printStackTrace(); + } + catch (Exception e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return true; + + } + + // 取消用户输入 + static public boolean cancelPairingUserInput(Class btClass, + BluetoothDevice device) throws Exception + { + Method createBondMethod = btClass.getMethod("cancelPairingUserInput"); +// cancelBondProcess(btClass, device); + Boolean returnValue = (Boolean) createBondMethod.invoke(device); + return returnValue.booleanValue(); + } + + // 取消配对 + static public boolean cancelBondProcess(Class btClass, + BluetoothDevice device) + + throws Exception + { + Method createBondMethod = btClass.getMethod("cancelBondProcess"); + Boolean returnValue = (Boolean) createBondMethod.invoke(device); + return returnValue.booleanValue(); + } + + //确认配对 + + static public void setPairingConfirmation(Class btClass,BluetoothDevice device,boolean isConfirm)throws Exception + { + Method setPairingConfirmation = btClass.getDeclaredMethod("setPairingConfirmation",boolean.class); + setPairingConfirmation.invoke(device,isConfirm); + } + + + /** + * + * @param clsShow + */ + static public void printAllInform(Class clsShow) + { + try + { + // 取得所有方法 + Method[] hideMethod = clsShow.getMethods(); + int i = 0; + for (; i < hideMethod.length; i++) + { + Log.e("method name", hideMethod[i].getName() + ";and the i is:" + + i); + } + // 取得所有常量 Field[] allFields = clsShow.getFields(); - for (i = 0; i < allFields.length; i++) - { + for (i = 0; i < allFields.length; i++) + { Log.e("Field name", allFields[i].getName()); - } - } - catch (SecurityException e) - { - // throw new RuntimeException(e.getMessage()); - e.printStackTrace(); - } - catch (IllegalArgumentException e) - { - // throw new RuntimeException(e.getMessage()); - e.printStackTrace(); - } - catch (Exception e) - { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } -} \ No newline at end of file + } + } + catch (SecurityException e) + { + // throw new RuntimeException(e.getMessage()); + e.printStackTrace(); + } + catch (IllegalArgumentException e) + { + // throw new RuntimeException(e.getMessage()); + e.printStackTrace(); + } + catch (Exception e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/CommonUtil.java b/android/app/src/main/java/org/haobtc/onekey/utils/CommonUtil.java index 03cd70e3b97a..8b0fc6d541cd 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/CommonUtil.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/CommonUtil.java @@ -38,16 +38,16 @@ import java.util.UUID; public class CommonUtil { - + private static String generateFileName() { return UUID.randomUUID().toString(); } - + private static final String SD_PATH = Environment.getExternalStorageDirectory().getPath() + "/OA头像/"; - + public static void saveBitmap2file(Bitmap bmp, Context context) { - - + + String savePath; String fileName = generateFileName() + ".JPEG"; if (Environment.getExternalStorageState().equals( @@ -81,9 +81,9 @@ public static void saveBitmap2file(Bitmap bmp, Context context) { // } // 最后通知图库更新 context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + savePath+fileName))); - + } - + public static File getFileDir(Context context, String desFileName) { try { File dir = new File(Environment.getExternalStorageDirectory().toString() + "/carefree/"); @@ -95,9 +95,9 @@ public static File getFileDir(Context context, String desFileName) { e.printStackTrace(); return new File(context.getFilesDir() + desFileName); } - + } - + public static Bitmap createAsciiPic(final String path, Context context) { final String base = "#8XOHLTI)i=+;:,.";// 字符串由复杂到简单 // final String base = "#,.0123456789:;@ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";// 字符串由复杂到简单 @@ -136,7 +136,7 @@ public static Bitmap createAsciiPic(final String path, Context context) { // return creatCodeBitmap(text,context,colors); // return image; } - + public static Bitmap createAsciiPicColor(final String path, Context context) { final String base = "#8XOHLTI)i=+;:,.";// 字符串由复杂到简单 // final String base = "#,.0123456789:;@ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";// 字符串由复杂到简单 @@ -178,11 +178,11 @@ public static Bitmap createAsciiPicColor(final String path, Context context) { // return creatCodeBitmap(text,context,colors); // return image; } - + public static Bitmap creatCodeBitmap(StringBuilder contents, Context context, List colors) { // contents = new StringBuilder().append("") float scale = context.getResources().getDisplayMetrics().scaledDensity; - + TextView tv = new TextView(context); LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, @@ -202,15 +202,15 @@ public static Bitmap creatCodeBitmap(StringBuilder contents, Context context, Li tv.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); tv.layout(0, 0, tv.getMeasuredWidth(), tv.getMeasuredHeight()); - - + + tv.setBackgroundColor(Color.WHITE); - + tv.buildDrawingCache(); Bitmap bitmapCode = tv.getDrawingCache(); return bitmapCode; } - + public static Bitmap textAsBitmap(StringBuilder text, Context context) { TextPaint textPaint = new TextPaint(); textPaint.setColor(Color.GRAY); @@ -221,27 +221,27 @@ public static Bitmap textAsBitmap(StringBuilder text, Context context) { DisplayMetrics dm = new DisplayMetrics(); wm.getDefaultDisplay().getMetrics(dm); int width = dm.widthPixels; // - + StaticLayout layout = new StaticLayout(text, textPaint, width, - + Layout.Alignment.ALIGN_CENTER, 1f, 0.0f, true); - + Bitmap bitmap = Bitmap.createBitmap(layout.getWidth() + 20, - + layout.getHeight() + 20, Bitmap.Config.ARGB_8888); - + Canvas canvas = new Canvas(bitmap); - + canvas.translate(10, 10); - + canvas.drawColor(Color.WHITE); - + // canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);//绘制透明色 - + layout.draw(canvas); - + return bitmap; - + } public static Bitmap textAsBitmapColor(StringBuilder text, List colors, Context context) { TextPaint textPaint = new TextPaint(); @@ -260,32 +260,32 @@ public static Bitmap textAsBitmapColor(StringBuilder text, List colors, spannableString.setSpan(colorSpan, i, i+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } StaticLayout layout = new StaticLayout(spannableString, textPaint, width, - + Layout.Alignment.ALIGN_CENTER, 1f, 0.0f, true); - + Bitmap bitmap = Bitmap.createBitmap(layout.getWidth() + 20, - + layout.getHeight() + 20, Bitmap.Config.ARGB_8888); - + Canvas canvas = new Canvas(bitmap); - + canvas.translate(10, 10); - + canvas.drawColor(Color.WHITE); - + // canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);//绘制透明色 - + layout.draw(canvas); - + return bitmap; - + } - + public static Bitmap scale(String src, int newWidth, int newHeight) { Bitmap ret = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(src), newWidth, newHeight, true); return ret; } - + /** * 存放拍摄图片的文件夹 */ @@ -298,8 +298,8 @@ public static Bitmap scale(String src, int newWidth, int newHeight) { * 图片种类 */ public static final String IMAGE_TYPE = ".png"; - - + + /** * 获取手机可存储路径 * @@ -317,7 +317,7 @@ private static String getPhoneRootPath(Context context) { return context.getCacheDir().getPath(); } } - + /** * 使用当前系统时间作为上传图片的名称 * @@ -336,7 +336,7 @@ public static String getPhotoFileName(Context context) { String photoName = "/" + time + IMAGE_TYPE; return file + photoName; } - + /** * 保存Bitmap图片在SD卡中 * 如果没有SD卡则存在手机中 @@ -369,7 +369,7 @@ public static String savePhotoToSD(Bitmap mbitmap, Context context) { } } } - + /** * 把原图按1/10的比例压缩 * @@ -384,7 +384,7 @@ public static Bitmap getCompressPhoto(String path) { options = null; return bmp; } - + /** * 处理旋转后的图片 * @@ -393,7 +393,7 @@ public static Bitmap getCompressPhoto(String path) { * @return 返回修复完毕后的图片路径 */ public static String amendRotatePhoto(String originpath, Context context) { - + // 取得图片旋转角度 int angle = readPictureDegree(originpath); // 把原图压缩后得到Bitmap对象 @@ -404,9 +404,9 @@ public static String amendRotatePhoto(String originpath, Context context) { } else { return originpath; } - + } - + /** * 读取照片旋转角度 * @@ -434,7 +434,7 @@ public static int readPictureDegree(String path) { } return degree; } - + /** * 旋转图片 * @@ -460,7 +460,7 @@ public static Bitmap rotaingImageView(int angle, Bitmap bitmap) { } return returnBm; } - + public static Bitmap sizeCompres(String path, int rqsW, int rqsH) { // 用option设置返回的bitmap对象的一些属性参数 final BitmapFactory.Options options = new BitmapFactory.Options(); @@ -480,4 +480,4 @@ public static Bitmap sizeCompres(String path, int rqsW, int rqsH) { } return BitmapFactory.decodeFile(path, options);// 主要通过option里的inSampleSize对原图片进行按比例压缩 } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/EmojiEditText.java b/android/app/src/main/java/org/haobtc/onekey/utils/EmojiEditText.java index 1c1771dc20f8..1f79f4605b13 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/EmojiEditText.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/EmojiEditText.java @@ -123,4 +123,4 @@ private static boolean isEmojiCharacter(char codePoint) { } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/ImageUtils.java b/android/app/src/main/java/org/haobtc/onekey/utils/ImageUtils.java index e252c85116d1..1c8ca4c8a4c3 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/ImageUtils.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/ImageUtils.java @@ -60,4 +60,4 @@ private static File sharePic(Bitmap cachebmp, String child) { } return qrImage; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/NfcUtils.java b/android/app/src/main/java/org/haobtc/onekey/utils/NfcUtils.java index 95bf57919774..c94861af5f26 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/NfcUtils.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/NfcUtils.java @@ -83,4 +83,4 @@ private static void goToSet(Activity activity) { activity.startActivity(intent); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/OpenFileDialog.java b/android/app/src/main/java/org/haobtc/onekey/utils/OpenFileDialog.java index a9ce5e568da9..96af8ade732a 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/OpenFileDialog.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/OpenFileDialog.java @@ -23,7 +23,7 @@ public class OpenFileDialog { public static String tag = "OpenFileDialog"; - static final public String sRoot = "/"; + static final public String sRoot = "/"; static final public String sParent = ".."; static final public String sFolder = "."; static final public String sEmpty = ""; @@ -37,19 +37,19 @@ public static Dialog createDialog(int id, Context context, String title, Callbac dialog.setTitle(title); return dialog; } - + static class FileSelectView extends ListView implements AdapterView.OnItemClickListener { - - + + private CallbackBundle callback = null; private String path = sRoot; private List> list = null; private int dialogid = 0; - + private String suffix = null; - + private Map imagemap = null; - + public FileSelectView(Context context, int dialogid, CallbackBundle callback, String suffix, Map images) { super(context); this.imagemap = images; @@ -59,7 +59,7 @@ public FileSelectView(Context context, int dialogid, CallbackBundle callback, St this.setOnItemClickListener(this); refreshFileList(); } - + private String getSuffix(String filename){ int dix = filename.lastIndexOf('.'); if(dix<0){ @@ -69,7 +69,7 @@ private String getSuffix(String filename){ return filename.substring(dix+1); } } - + private int getImageId(String s){ if(imagemap == null){ return 0; @@ -84,7 +84,7 @@ else if(imagemap.containsKey(sEmpty)){ return 0; } } - + private int refreshFileList() { // 刷新文件列表 @@ -106,11 +106,11 @@ private int refreshFileList() else{ list = new ArrayList>(files.length); } - + // 用来先保存文件夹和文件夹的两个列表 ArrayList> lfolders = new ArrayList>(); ArrayList> lfiles = new ArrayList>(); - + if(!this.path.equals(sRoot)){ // 添加根目录 和 上一层目录 Map map = new HashMap(); @@ -118,14 +118,14 @@ private int refreshFileList() map.put("path", sRoot); map.put("img", getImageId(sRoot)); list.add(map); - + map = new HashMap(); map.put("name", sParent); map.put("path", path); map.put("img", getImageId(sParent)); list.add(map); } - + for(File file: files) { if(file.isDirectory() && file.listFiles()!=null){ @@ -146,13 +146,13 @@ else if(file.isFile()){ map.put("img", getImageId(sf)); lfiles.add(map); } - } + } } - + list.addAll(lfolders); // 先添加文件夹,确保文件夹显示在上面 list.addAll(lfiles); //再添加文件 - - + + SimpleAdapter adapter = new SimpleAdapter(getContext(), list, R.layout.filedialogitem, new String[]{"img", "name", "path"}, new int[]{R.id.filedialogitem_img, R.id.filedialogitem_name, R.id.filedialogitem_path}); this.setAdapter(adapter); return files.length; @@ -180,7 +180,7 @@ public void onItemClick(AdapterView parent, View v, int position, long id) { if(fl.isFile()){ // 如果是文件 ((Activity)getContext()).dismissDialog(this.dialogid); // 让文件夹对话框消失 - + // 设置回调的返回值 Bundle bundle = new Bundle(); bundle.putString("path", pt); @@ -199,4 +199,4 @@ else if(fl.isDirectory()){ } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/PasswordInputView.java b/android/app/src/main/java/org/haobtc/onekey/utils/PasswordInputView.java index 4cbdef340f9b..8d29ccb17c9c 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/PasswordInputView.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/PasswordInputView.java @@ -157,4 +157,4 @@ public void setPasswordRadius(float passwordRadius) { this.passwordRadius = passwordRadius; invalidate(); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/PermissionUtils.java b/android/app/src/main/java/org/haobtc/onekey/utils/PermissionUtils.java index 99c03396a4a2..ce6fc83bd7fb 100755 --- a/android/app/src/main/java/org/haobtc/onekey/utils/PermissionUtils.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/PermissionUtils.java @@ -357,4 +357,4 @@ public interface FullCallback { public interface ThemeCallback { void onActivityCreate(AppCompatActivity activity); } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/PwdEditText.java b/android/app/src/main/java/org/haobtc/onekey/utils/PwdEditText.java index b4823c4f3a4e..0204d7dc58d3 100755 --- a/android/app/src/main/java/org/haobtc/onekey/utils/PwdEditText.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/PwdEditText.java @@ -372,4 +372,4 @@ public void setWaitInput(boolean waitInput) { isWaitInput = waitInput; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/ScreenShotListenManager.java b/android/app/src/main/java/org/haobtc/onekey/utils/ScreenShotListenManager.java index eaf7478f64e5..7857e18f52f4 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/ScreenShotListenManager.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/ScreenShotListenManager.java @@ -432,4 +432,4 @@ public void onChange(boolean selfChange) { } } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/StatusBarUtil.java b/android/app/src/main/java/org/haobtc/onekey/utils/StatusBarUtil.java index d846875382ac..5ba80c0d8ceb 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/StatusBarUtil.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/StatusBarUtil.java @@ -46,7 +46,7 @@ public static void setStatusBarColor(AppCompatActivity activity, int colorId) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { Window window = activity.getWindow(); -// window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); +// window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); window.setStatusBarColor(activity.getColor(colorId)); } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { //使用SystemBarTint库使4.4版本状态栏变色,需要先将状态栏设置为透明 @@ -183,4 +183,4 @@ public static boolean MIUISetStatusBarLightMode(AppCompatActivity activity, bool } return result; } -} \ No newline at end of file +} diff --git a/android/app/src/main/java/org/haobtc/onekey/utils/SystemBarTintManager.java b/android/app/src/main/java/org/haobtc/onekey/utils/SystemBarTintManager.java index 8bff6249914b..0b58f61fe166 100644 --- a/android/app/src/main/java/org/haobtc/onekey/utils/SystemBarTintManager.java +++ b/android/app/src/main/java/org/haobtc/onekey/utils/SystemBarTintManager.java @@ -23,7 +23,7 @@ import java.lang.reflect.Method; /** - * Class to manage status and navigation bar tint effects when using KitKat + * Class to manage status and navigation bar tint effects when using KitKat * translucent system UI modes. * */ @@ -548,4 +548,4 @@ public int getPixelInsetRight() { } -} \ No newline at end of file +} diff --git a/android/app/src/main/res/anim/anim_silent.xml b/android/app/src/main/res/anim/anim_silent.xml index ef8ddf93c61c..d54f5cbee2a7 100644 --- a/android/app/src/main/res/anim/anim_silent.xml +++ b/android/app/src/main/res/anim/anim_silent.xml @@ -5,4 +5,4 @@ android:toYDelta="0" android:duration="1000" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/anim/dialog_progress_anim.xml b/android/app/src/main/res/anim/dialog_progress_anim.xml index 48a96fbac29d..cbe64f6c3912 100755 --- a/android/app/src/main/res/anim/dialog_progress_anim.xml +++ b/android/app/src/main/res/anim/dialog_progress_anim.xml @@ -13,4 +13,4 @@ android:interpolator="@android:anim/linear_interpolator" android:duration="800" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/anim/from_top_to_bottom.xml b/android/app/src/main/res/anim/from_top_to_bottom.xml index 50de2415b050..a1e6d11eafb0 100644 --- a/android/app/src/main/res/anim/from_top_to_bottom.xml +++ b/android/app/src/main/res/anim/from_top_to_bottom.xml @@ -5,4 +5,4 @@ android:toYDelta="100%p" android:duration="400" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/anim/push_bottom_in.xml b/android/app/src/main/res/anim/push_bottom_in.xml index 3fd7ee1f2692..00cf2878ad9b 100755 --- a/android/app/src/main/res/anim/push_bottom_in.xml +++ b/android/app/src/main/res/anim/push_bottom_in.xml @@ -6,4 +6,4 @@ android:fromYDelta="50%p" android:toYDelta="0" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/anim/push_bottom_out.xml b/android/app/src/main/res/anim/push_bottom_out.xml index 8f832a2ea8f8..0b363da55838 100755 --- a/android/app/src/main/res/anim/push_bottom_out.xml +++ b/android/app/src/main/res/anim/push_bottom_out.xml @@ -7,4 +7,4 @@ android:toYDelta="50%p" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/add_bk.xml b/android/app/src/main/res/drawable/add_bk.xml index 88d94e09fc5a..1a00073d4a32 100644 --- a/android/app/src/main/res/drawable/add_bk.xml +++ b/android/app/src/main/res/drawable/add_bk.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/animalist.xml b/android/app/src/main/res/drawable/animalist.xml index 1ece3e15356e..b4a26b15c064 100644 --- a/android/app/src/main/res/drawable/animalist.xml +++ b/android/app/src/main/res/drawable/animalist.xml @@ -35,4 +35,4 @@ android:duration="100"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/animalist_lite.xml b/android/app/src/main/res/drawable/animalist_lite.xml index 79400f1af24f..af2a2a5cb388 100644 --- a/android/app/src/main/res/drawable/animalist_lite.xml +++ b/android/app/src/main/res/drawable/animalist_lite.xml @@ -25,4 +25,4 @@ android:duration="100"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/appwallet_back.xml b/android/app/src/main/res/drawable/appwallet_back.xml index 8aaf9d30069e..f4eb81971cc7 100644 --- a/android/app/src/main/res/drawable/appwallet_back.xml +++ b/android/app/src/main/res/drawable/appwallet_back.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/appwallet_text_back.xml b/android/app/src/main/res/drawable/appwallet_text_back.xml index 3e4754a5d96c..ebf2c3ff672d 100644 --- a/android/app/src/main/res/drawable/appwallet_text_back.xml +++ b/android/app/src/main/res/drawable/appwallet_text_back.xml @@ -6,4 +6,4 @@ android:endColor="#98FFFFFF" android:startColor="#FFFFFF" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/back_white_6.xml b/android/app/src/main/res/drawable/back_white_6.xml index e19bf8d06dd3..036e160d9d2b 100644 --- a/android/app/src/main/res/drawable/back_white_6.xml +++ b/android/app/src/main/res/drawable/back_white_6.xml @@ -7,4 +7,4 @@ android:width="@dimen/line_hight" android:color="#1F54545A" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/backup_back.xml b/android/app/src/main/res/drawable/backup_back.xml index a68501ae7b9e..a4d3701cd4ca 100644 --- a/android/app/src/main/res/drawable/backup_back.xml +++ b/android/app/src/main/res/drawable/backup_back.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/big_gray_tuo.xml b/android/app/src/main/res/drawable/big_gray_tuo.xml index d8056a7c8c0d..246004eeffa7 100644 --- a/android/app/src/main/res/drawable/big_gray_tuo.xml +++ b/android/app/src/main/res/drawable/big_gray_tuo.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/black_bk.xml b/android/app/src/main/res/drawable/black_bk.xml index 47617e2a8402..392d0ef7812c 100644 --- a/android/app/src/main/res/drawable/black_bk.xml +++ b/android/app/src/main/res/drawable/black_bk.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/black_broken.xml b/android/app/src/main/res/drawable/black_broken.xml index e154691cfd07..42368b915c2f 100644 --- a/android/app/src/main/res/drawable/black_broken.xml +++ b/android/app/src/main/res/drawable/black_broken.xml @@ -6,4 +6,4 @@ android:width="@dimen/dp_1" android:color="#9FA6AD" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/black_tuo.xml b/android/app/src/main/res/drawable/black_tuo.xml index 21f7d7094563..5704d75801b3 100644 --- a/android/app/src/main/res/drawable/black_tuo.xml +++ b/android/app/src/main/res/drawable/black_tuo.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/block_gray.xml b/android/app/src/main/res/drawable/block_gray.xml index 834eb5cc9da8..7d385ed8d85b 100644 --- a/android/app/src/main/res/drawable/block_gray.xml +++ b/android/app/src/main/res/drawable/block_gray.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/blue_backgraound.xml b/android/app/src/main/res/drawable/blue_backgraound.xml index b5db72b62a4e..6b71c0beaf38 100644 --- a/android/app/src/main/res/drawable/blue_backgraound.xml +++ b/android/app/src/main/res/drawable/blue_backgraound.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/blue_button.xml b/android/app/src/main/res/drawable/blue_button.xml index e967833c728a..b66b16695d13 100644 --- a/android/app/src/main/res/drawable/blue_button.xml +++ b/android/app/src/main/res/drawable/blue_button.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/blue_point.xml b/android/app/src/main/res/drawable/blue_point.xml index d53f4d23fe20..7354aa2076d4 100644 --- a/android/app/src/main/res/drawable/blue_point.xml +++ b/android/app/src/main/res/drawable/blue_point.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/blue_strok.xml b/android/app/src/main/res/drawable/blue_strok.xml index 2574b4e1da08..67f5bca81754 100644 --- a/android/app/src/main/res/drawable/blue_strok.xml +++ b/android/app/src/main/res/drawable/blue_strok.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/boot_page_bluedot.xml b/android/app/src/main/res/drawable/boot_page_bluedot.xml index 59750104b6cb..5de99e39d1e8 100644 --- a/android/app/src/main/res/drawable/boot_page_bluedot.xml +++ b/android/app/src/main/res/drawable/boot_page_bluedot.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/boot_page_greydot.xml b/android/app/src/main/res/drawable/boot_page_greydot.xml index 07e68cc00a6c..a3fbd4b54b9d 100644 --- a/android/app/src/main/res/drawable/boot_page_greydot.xml +++ b/android/app/src/main/res/drawable/boot_page_greydot.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/bottom_circle.xml b/android/app/src/main/res/drawable/bottom_circle.xml index fe5820652ad0..96b09e04750e 100644 --- a/android/app/src/main/res/drawable/bottom_circle.xml +++ b/android/app/src/main/res/drawable/bottom_circle.xml @@ -5,4 +5,4 @@ android:topRightRadius="0dp" android:bottomRightRadius="@dimen/dp_20" android:bottomLeftRadius="@dimen/dp_20"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_checked.xml b/android/app/src/main/res/drawable/btn_checked.xml index d473f5e1e788..5b7ab170875b 100644 --- a/android/app/src/main/res/drawable/btn_checked.xml +++ b/android/app/src/main/res/drawable/btn_checked.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_checked_red.xml b/android/app/src/main/res/drawable/btn_checked_red.xml index 3546f6c54f87..e82126a52d4f 100644 --- a/android/app/src/main/res/drawable/btn_checked_red.xml +++ b/android/app/src/main/res/drawable/btn_checked_red.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_copy_to_other.xml b/android/app/src/main/res/drawable/btn_copy_to_other.xml index 283ddec74123..b7dda8260342 100644 --- a/android/app/src/main/res/drawable/btn_copy_to_other.xml +++ b/android/app/src/main/res/drawable/btn_copy_to_other.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_enable_selector.xml b/android/app/src/main/res/drawable/btn_enable_selector.xml index b522a8bf13a3..c531a3003116 100644 --- a/android/app/src/main/res/drawable/btn_enable_selector.xml +++ b/android/app/src/main/res/drawable/btn_enable_selector.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_enable_selector_red.xml b/android/app/src/main/res/drawable/btn_enable_selector_red.xml index 497a4548ed7d..2cb02b4878fb 100644 --- a/android/app/src/main/res/drawable/btn_enable_selector_red.xml +++ b/android/app/src/main/res/drawable/btn_enable_selector_red.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_gry.xml b/android/app/src/main/res/drawable/btn_gry.xml index 4b88f2edc92e..8e26fba0cfb6 100644 --- a/android/app/src/main/res/drawable/btn_gry.xml +++ b/android/app/src/main/res/drawable/btn_gry.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_no_check.xml b/android/app/src/main/res/drawable/btn_no_check.xml index 8776729036ad..acd3721b8184 100644 --- a/android/app/src/main/res/drawable/btn_no_check.xml +++ b/android/app/src/main/res/drawable/btn_no_check.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/btn_no_check_red.xml b/android/app/src/main/res/drawable/btn_no_check_red.xml index 2520550e9ed1..61c3966dae59 100644 --- a/android/app/src/main/res/drawable/btn_no_check_red.xml +++ b/android/app/src/main/res/drawable/btn_no_check_red.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/button_bk.xml b/android/app/src/main/res/drawable/button_bk.xml index c119ef21efc7..dc7987a2cbe0 100644 --- a/android/app/src/main/res/drawable/button_bk.xml +++ b/android/app/src/main/res/drawable/button_bk.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/button_bk_grey.xml b/android/app/src/main/res/drawable/button_bk_grey.xml index 5fd91bcc22bd..3bce6612f939 100644 --- a/android/app/src/main/res/drawable/button_bk_grey.xml +++ b/android/app/src/main/res/drawable/button_bk_grey.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/button_bk_small.xml b/android/app/src/main/res/drawable/button_bk_small.xml index bafd4e03d88f..158faa320dfd 100644 --- a/android/app/src/main/res/drawable/button_bk_small.xml +++ b/android/app/src/main/res/drawable/button_bk_small.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/button_bk_small_big_radius.xml b/android/app/src/main/res/drawable/button_bk_small_big_radius.xml index 8767994f0b26..819f5ff98d4a 100644 --- a/android/app/src/main/res/drawable/button_bk_small_big_radius.xml +++ b/android/app/src/main/res/drawable/button_bk_small_big_radius.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/button_bk_small_grey_big_radius.xml b/android/app/src/main/res/drawable/button_bk_small_grey_big_radius.xml index f8dbb83b4ac2..4f95e154d7dc 100644 --- a/android/app/src/main/res/drawable/button_bk_small_grey_big_radius.xml +++ b/android/app/src/main/res/drawable/button_bk_small_grey_big_radius.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/check_mnemonic.xml b/android/app/src/main/res/drawable/check_mnemonic.xml index fddc73a9dc0c..53b16fc4b511 100644 --- a/android/app/src/main/res/drawable/check_mnemonic.xml +++ b/android/app/src/main/res/drawable/check_mnemonic.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/check_mnemonic_color.xml b/android/app/src/main/res/drawable/check_mnemonic_color.xml index 6deba419665b..ed3c7dbb1ac9 100644 --- a/android/app/src/main/res/drawable/check_mnemonic_color.xml +++ b/android/app/src/main/res/drawable/check_mnemonic_color.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/check_money.xml b/android/app/src/main/res/drawable/check_money.xml index c43c2e416b40..4f6524ed7cd2 100644 --- a/android/app/src/main/res/drawable/check_money.xml +++ b/android/app/src/main/res/drawable/check_money.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/checkbox.xml b/android/app/src/main/res/drawable/checkbox.xml index 45a86c24db79..e2c0bf27e0f5 100644 --- a/android/app/src/main/res/drawable/checkbox.xml +++ b/android/app/src/main/res/drawable/checkbox.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/checkbox_selector_onkey.xml b/android/app/src/main/res/drawable/checkbox_selector_onkey.xml index f9088cc16e8a..249cb628c928 100644 --- a/android/app/src/main/res/drawable/checkbox_selector_onkey.xml +++ b/android/app/src/main/res/drawable/checkbox_selector_onkey.xml @@ -1,6 +1,6 @@ - - + + - - \ No newline at end of file + + diff --git a/android/app/src/main/res/drawable/circle_checkbox.xml b/android/app/src/main/res/drawable/circle_checkbox.xml index ec642a41ef13..19e5e4a32798 100644 --- a/android/app/src/main/res/drawable/circle_checkbox.xml +++ b/android/app/src/main/res/drawable/circle_checkbox.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/circle_empty.xml b/android/app/src/main/res/drawable/circle_empty.xml index d2d1cf299ada..96b1e3587321 100644 --- a/android/app/src/main/res/drawable/circle_empty.xml +++ b/android/app/src/main/res/drawable/circle_empty.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/connecting.xml b/android/app/src/main/res/drawable/connecting.xml index b25204ed071e..29f1924b4c4b 100644 --- a/android/app/src/main/res/drawable/connecting.xml +++ b/android/app/src/main/res/drawable/connecting.xml @@ -11,4 +11,4 @@ /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/connecting_shape.xml b/android/app/src/main/res/drawable/connecting_shape.xml index e3ae0972f495..95a5739caf11 100644 --- a/android/app/src/main/res/drawable/connecting_shape.xml +++ b/android/app/src/main/res/drawable/connecting_shape.xml @@ -9,4 +9,4 @@ android:startColor="@color/button_bk" android:useLevel="false" android:type="sweep"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/dark_bg.xml b/android/app/src/main/res/drawable/dark_bg.xml index 283ddec74123..b7dda8260342 100644 --- a/android/app/src/main/res/drawable/dark_bg.xml +++ b/android/app/src/main/res/drawable/dark_bg.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/delete_wallet_no.xml b/android/app/src/main/res/drawable/delete_wallet_no.xml index 25216d232024..d726362acf49 100644 --- a/android/app/src/main/res/drawable/delete_wallet_no.xml +++ b/android/app/src/main/res/drawable/delete_wallet_no.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/delete_wallet_yes.xml b/android/app/src/main/res/drawable/delete_wallet_yes.xml index 2d2f0becda2f..6b8954b813d4 100644 --- a/android/app/src/main/res/drawable/delete_wallet_yes.xml +++ b/android/app/src/main/res/drawable/delete_wallet_yes.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/dh_main.xml b/android/app/src/main/res/drawable/dh_main.xml index 994ab48b2d25..43abcde88b09 100755 --- a/android/app/src/main/res/drawable/dh_main.xml +++ b/android/app/src/main/res/drawable/dh_main.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/dh_mine.xml b/android/app/src/main/res/drawable/dh_mine.xml index 50df0b827ec9..8e3b8c7b97d9 100755 --- a/android/app/src/main/res/drawable/dh_mine.xml +++ b/android/app/src/main/res/drawable/dh_mine.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/dh_yanyi.xml b/android/app/src/main/res/drawable/dh_yanyi.xml index 61066af74e89..58039f00a306 100755 --- a/android/app/src/main/res/drawable/dh_yanyi.xml +++ b/android/app/src/main/res/drawable/dh_yanyi.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/dialog_bg.xml b/android/app/src/main/res/drawable/dialog_bg.xml index b43f9db297e2..ba8db1bfd004 100644 --- a/android/app/src/main/res/drawable/dialog_bg.xml +++ b/android/app/src/main/res/drawable/dialog_bg.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/divider.xml b/android/app/src/main/res/drawable/divider.xml index 4de3c3132c11..0c94a6b33701 100644 --- a/android/app/src/main/res/drawable/divider.xml +++ b/android/app/src/main/res/drawable/divider.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/edit_text_bg.xml b/android/app/src/main/res/drawable/edit_text_bg.xml index 9bcacbf11e61..91d3ca06815b 100644 --- a/android/app/src/main/res/drawable/edit_text_bg.xml +++ b/android/app/src/main/res/drawable/edit_text_bg.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/eos_gray_back.xml b/android/app/src/main/res/drawable/eos_gray_back.xml index 8aded83c1e24..c90394d8f00f 100644 --- a/android/app/src/main/res/drawable/eos_gray_back.xml +++ b/android/app/src/main/res/drawable/eos_gray_back.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/eth_blue_back.xml b/android/app/src/main/res/drawable/eth_blue_back.xml index 27d9f2d0c6f2..6ef6879e9b36 100644 --- a/android/app/src/main/res/drawable/eth_blue_back.xml +++ b/android/app/src/main/res/drawable/eth_blue_back.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/fee_back_4.xml b/android/app/src/main/res/drawable/fee_back_4.xml index fe7367c96d18..c73cf14ccf9d 100644 --- a/android/app/src/main/res/drawable/fee_back_4.xml +++ b/android/app/src/main/res/drawable/fee_back_4.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/graeen_tuo_15.xml b/android/app/src/main/res/drawable/graeen_tuo_15.xml index 11ab79bfa928..7e3003f84589 100644 --- a/android/app/src/main/res/drawable/graeen_tuo_15.xml +++ b/android/app/src/main/res/drawable/graeen_tuo_15.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_back_.xml b/android/app/src/main/res/drawable/gray_back_.xml index 514dc22d8075..653fd1e6e138 100644 --- a/android/app/src/main/res/drawable/gray_back_.xml +++ b/android/app/src/main/res/drawable/gray_back_.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_block_circle.xml b/android/app/src/main/res/drawable/gray_block_circle.xml index 2db2ac9e8d38..4a038a9e7902 100644 --- a/android/app/src/main/res/drawable/gray_block_circle.xml +++ b/android/app/src/main/res/drawable/gray_block_circle.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_broken.xml b/android/app/src/main/res/drawable/gray_broken.xml index 42a7efcaf343..21413b176b25 100644 --- a/android/app/src/main/res/drawable/gray_broken.xml +++ b/android/app/src/main/res/drawable/gray_broken.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_circle.xml b/android/app/src/main/res/drawable/gray_circle.xml index 8a9032bcfff9..7dcb614065f7 100644 --- a/android/app/src/main/res/drawable/gray_circle.xml +++ b/android/app/src/main/res/drawable/gray_circle.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_down_tuo.xml b/android/app/src/main/res/drawable/gray_down_tuo.xml index b298c19a1be9..cc406e4eba6a 100644 --- a/android/app/src/main/res/drawable/gray_down_tuo.xml +++ b/android/app/src/main/res/drawable/gray_down_tuo.xml @@ -8,4 +8,4 @@ android:topRightRadius="@dimen/dp_0" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_ovle.xml b/android/app/src/main/res/drawable/gray_ovle.xml index f553c36c40a1..5c63476a82f5 100644 --- a/android/app/src/main/res/drawable/gray_ovle.xml +++ b/android/app/src/main/res/drawable/gray_ovle.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_qian_tuo.xml b/android/app/src/main/res/drawable/gray_qian_tuo.xml index da8c10550df3..cd018e29623f 100644 --- a/android/app/src/main/res/drawable/gray_qian_tuo.xml +++ b/android/app/src/main/res/drawable/gray_qian_tuo.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_shentuo.xml b/android/app/src/main/res/drawable/gray_shentuo.xml index ece84b0fc6e7..b8bee73f273f 100644 --- a/android/app/src/main/res/drawable/gray_shentuo.xml +++ b/android/app/src/main/res/drawable/gray_shentuo.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_stoken.xml b/android/app/src/main/res/drawable/gray_stoken.xml index f94a3db2ebb4..9422c815835e 100644 --- a/android/app/src/main/res/drawable/gray_stoken.xml +++ b/android/app/src/main/res/drawable/gray_stoken.xml @@ -6,4 +6,4 @@ android:color="#bdbdbd" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_stoken_5.xml b/android/app/src/main/res/drawable/gray_stoken_5.xml index 17478b0ffbcd..39257aeba0db 100644 --- a/android/app/src/main/res/drawable/gray_stoken_5.xml +++ b/android/app/src/main/res/drawable/gray_stoken_5.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_15.xml b/android/app/src/main/res/drawable/gray_tuo_15.xml index baa81bc6ae6e..8d1585cea805 100644 --- a/android/app/src/main/res/drawable/gray_tuo_15.xml +++ b/android/app/src/main/res/drawable/gray_tuo_15.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_30.xml b/android/app/src/main/res/drawable/gray_tuo_30.xml index 2c13ca159f94..41cc7bd1b929 100644 --- a/android/app/src/main/res/drawable/gray_tuo_30.xml +++ b/android/app/src/main/res/drawable/gray_tuo_30.xml @@ -7,4 +7,4 @@ android:width="@dimen/dp_1" android:color="#F2F2F2" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_6.xml b/android/app/src/main/res/drawable/gray_tuo_6.xml index 918285b9b3b4..7f0abacd0ec2 100644 --- a/android/app/src/main/res/drawable/gray_tuo_6.xml +++ b/android/app/src/main/res/drawable/gray_tuo_6.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_broken.xml b/android/app/src/main/res/drawable/gray_tuo_broken.xml index ee8d6fa07c84..43ddc672bc94 100644 --- a/android/app/src/main/res/drawable/gray_tuo_broken.xml +++ b/android/app/src/main/res/drawable/gray_tuo_broken.xml @@ -7,4 +7,4 @@ android:width="@dimen/dp_1" android:color="#f2f2f2" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_c4.xml b/android/app/src/main/res/drawable/gray_tuo_c4.xml index d54b59ddd858..49d0201ec3ef 100644 --- a/android/app/src/main/res/drawable/gray_tuo_c4.xml +++ b/android/app/src/main/res/drawable/gray_tuo_c4.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_little_6.xml b/android/app/src/main/res/drawable/gray_tuo_little_6.xml index a1046e030221..4ef7f0798daa 100644 --- a/android/app/src/main/res/drawable/gray_tuo_little_6.xml +++ b/android/app/src/main/res/drawable/gray_tuo_little_6.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuo_qian_15.xml b/android/app/src/main/res/drawable/gray_tuo_qian_15.xml index c53a8f3ac13d..171b79b8ed15 100644 --- a/android/app/src/main/res/drawable/gray_tuo_qian_15.xml +++ b/android/app/src/main/res/drawable/gray_tuo_qian_15.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_tuocircle.xml b/android/app/src/main/res/drawable/gray_tuocircle.xml index 1c60dc2e0113..6ac5bfbb65de 100644 --- a/android/app/src/main/res/drawable/gray_tuocircle.xml +++ b/android/app/src/main/res/drawable/gray_tuocircle.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/gray_up_tuo.xml b/android/app/src/main/res/drawable/gray_up_tuo.xml index 5cb6040c2d17..9c0c7454f5ae 100644 --- a/android/app/src/main/res/drawable/gray_up_tuo.xml +++ b/android/app/src/main/res/drawable/gray_up_tuo.xml @@ -6,4 +6,4 @@ android:bottomRightRadius="@dimen/dp_0" android:bottomLeftRadius="@dimen/dp_0"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_bacj.xml b/android/app/src/main/res/drawable/green_bacj.xml index e3758168d57e..10977ddee328 100644 --- a/android/app/src/main/res/drawable/green_bacj.xml +++ b/android/app/src/main/res/drawable/green_bacj.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_broken.xml b/android/app/src/main/res/drawable/green_broken.xml index 93b1f3681592..a7a45398d07d 100644 --- a/android/app/src/main/res/drawable/green_broken.xml +++ b/android/app/src/main/res/drawable/green_broken.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_broken_.xml b/android/app/src/main/res/drawable/green_broken_.xml index 2080b0228e21..977db37e7cf1 100644 --- a/android/app/src/main/res/drawable/green_broken_.xml +++ b/android/app/src/main/res/drawable/green_broken_.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_btn.xml b/android/app/src/main/res/drawable/green_btn.xml index bcaf0c3965f0..5c5751bac2fd 100644 --- a/android/app/src/main/res/drawable/green_btn.xml +++ b/android/app/src/main/res/drawable/green_btn.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_circle.xml b/android/app/src/main/res/drawable/green_circle.xml index 190e8a2bda4d..46dcfc0b6d04 100644 --- a/android/app/src/main/res/drawable/green_circle.xml +++ b/android/app/src/main/res/drawable/green_circle.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_point.xml b/android/app/src/main/res/drawable/green_point.xml index 61a14cc351b4..1da5600d645d 100644 --- a/android/app/src/main/res/drawable/green_point.xml +++ b/android/app/src/main/res/drawable/green_point.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/green_tuo.xml b/android/app/src/main/res/drawable/green_tuo.xml index 67b4031aeb1e..7d480fcab4ea 100644 --- a/android/app/src/main/res/drawable/green_tuo.xml +++ b/android/app/src/main/res/drawable/green_tuo.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/home_text_color.xml b/android/app/src/main/res/drawable/home_text_color.xml index e4dba9f29dee..3d91b1533313 100755 --- a/android/app/src/main/res/drawable/home_text_color.xml +++ b/android/app/src/main/res/drawable/home_text_color.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/home_wallet.xml b/android/app/src/main/res/drawable/home_wallet.xml index cbf086075174..bfd46cd29d78 100644 --- a/android/app/src/main/res/drawable/home_wallet.xml +++ b/android/app/src/main/res/drawable/home_wallet.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/key_board_bk_normal.xml b/android/app/src/main/res/drawable/key_board_bk_normal.xml index 13e2043228f2..e30c1bf43c5e 100644 --- a/android/app/src/main/res/drawable/key_board_bk_normal.xml +++ b/android/app/src/main/res/drawable/key_board_bk_normal.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/key_board_bk_pressed.xml b/android/app/src/main/res/drawable/key_board_bk_pressed.xml index 448728f73e6a..467de7c53aeb 100644 --- a/android/app/src/main/res/drawable/key_board_bk_pressed.xml +++ b/android/app/src/main/res/drawable/key_board_bk_pressed.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/keyboard_selector.xml b/android/app/src/main/res/drawable/keyboard_selector.xml index 41fd8b274c6a..abc40f47d9c3 100644 --- a/android/app/src/main/res/drawable/keyboard_selector.xml +++ b/android/app/src/main/res/drawable/keyboard_selector.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/laft_gray_tuo.xml b/android/app/src/main/res/drawable/laft_gray_tuo.xml index d6b855b415c6..79e4a3205265 100644 --- a/android/app/src/main/res/drawable/laft_gray_tuo.xml +++ b/android/app/src/main/res/drawable/laft_gray_tuo.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/laft_green_tuo.xml b/android/app/src/main/res/drawable/laft_green_tuo.xml index d4d64aa55dea..853d38fe11c7 100644 --- a/android/app/src/main/res/drawable/laft_green_tuo.xml +++ b/android/app/src/main/res/drawable/laft_green_tuo.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/light_ellipse.xml b/android/app/src/main/res/drawable/light_ellipse.xml index e52ccca7a054..38b1c50a8b1e 100644 --- a/android/app/src/main/res/drawable/light_ellipse.xml +++ b/android/app/src/main/res/drawable/light_ellipse.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/line_check.xml b/android/app/src/main/res/drawable/line_check.xml index 98fb00dce774..f3388074ba66 100755 --- a/android/app/src/main/res/drawable/line_check.xml +++ b/android/app/src/main/res/drawable/line_check.xml @@ -7,4 +7,4 @@ android:width="20dp" android:height="3dp" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/line_checkno.xml b/android/app/src/main/res/drawable/line_checkno.xml index 2557c04ebe45..7ac6d1393677 100755 --- a/android/app/src/main/res/drawable/line_checkno.xml +++ b/android/app/src/main/res/drawable/line_checkno.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_blue.xml b/android/app/src/main/res/drawable/little_blue.xml index 3075b119d958..2080a4c66db4 100644 --- a/android/app/src/main/res/drawable/little_blue.xml +++ b/android/app/src/main/res/drawable/little_blue.xml @@ -11,4 +11,4 @@ android:width="1.5dp" android:color="@color/button_bk_disableok" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_blue_back.xml b/android/app/src/main/res/drawable/little_blue_back.xml index c550615c5f14..407a8d44ef43 100644 --- a/android/app/src/main/res/drawable/little_blue_back.xml +++ b/android/app/src/main/res/drawable/little_blue_back.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_blue_back_2.xml b/android/app/src/main/res/drawable/little_blue_back_2.xml index 48ab98f27235..6e9d4f8998b7 100644 --- a/android/app/src/main/res/drawable/little_blue_back_2.xml +++ b/android/app/src/main/res/drawable/little_blue_back_2.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_conner_btn.xml b/android/app/src/main/res/drawable/little_conner_btn.xml index 3b85564babdd..7762a8932fe7 100644 --- a/android/app/src/main/res/drawable/little_conner_btn.xml +++ b/android/app/src/main/res/drawable/little_conner_btn.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_gray.xml b/android/app/src/main/res/drawable/little_gray.xml index d31d7653dbb8..9cc954633b59 100644 --- a/android/app/src/main/res/drawable/little_gray.xml +++ b/android/app/src/main/res/drawable/little_gray.xml @@ -11,4 +11,4 @@ android:width="1.5dp" android:color="@color/circle_color" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_radio_blue.xml b/android/app/src/main/res/drawable/little_radio_blue.xml index 1143341e1d52..3ac3e8fcb8c9 100644 --- a/android/app/src/main/res/drawable/little_radio_blue.xml +++ b/android/app/src/main/res/drawable/little_radio_blue.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/little_radio_qian.xml b/android/app/src/main/res/drawable/little_radio_qian.xml index 89f87554a10a..01817f694b0c 100644 --- a/android/app/src/main/res/drawable/little_radio_qian.xml +++ b/android/app/src/main/res/drawable/little_radio_qian.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/md_style_quote.xml b/android/app/src/main/res/drawable/md_style_quote.xml index e517fbb37adb..63fb5511ef07 100644 --- a/android/app/src/main/res/drawable/md_style_quote.xml +++ b/android/app/src/main/res/drawable/md_style_quote.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/onekey_grey_tuo.xml b/android/app/src/main/res/drawable/onekey_grey_tuo.xml index 1a8b5aa71364..e3efd47577a6 100644 --- a/android/app/src/main/res/drawable/onekey_grey_tuo.xml +++ b/android/app/src/main/res/drawable/onekey_grey_tuo.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/orange_back.xml b/android/app/src/main/res/drawable/orange_back.xml index 2e10b7f4ed64..d3293f2aa5bd 100644 --- a/android/app/src/main/res/drawable/orange_back.xml +++ b/android/app/src/main/res/drawable/orange_back.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/orange_circle.xml b/android/app/src/main/res/drawable/orange_circle.xml index ddcbc0b776dd..cccf3ffe7f43 100644 --- a/android/app/src/main/res/drawable/orange_circle.xml +++ b/android/app/src/main/res/drawable/orange_circle.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/orange_tou.xml b/android/app/src/main/res/drawable/orange_tou.xml index ad7e186996f4..43ae02311b14 100644 --- a/android/app/src/main/res/drawable/orange_tou.xml +++ b/android/app/src/main/res/drawable/orange_tou.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/pin_input.xml b/android/app/src/main/res/drawable/pin_input.xml index da2e7a273391..feabc9a55bb3 100644 --- a/android/app/src/main/res/drawable/pin_input.xml +++ b/android/app/src/main/res/drawable/pin_input.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/progress.xml b/android/app/src/main/res/drawable/progress.xml index 1bf2fad86dc1..8269f82da02e 100755 --- a/android/app/src/main/res/drawable/progress.xml +++ b/android/app/src/main/res/drawable/progress.xml @@ -4,4 +4,4 @@ android:pivotX="50%" android:pivotY="50%" > - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/progressbar_bg.xml b/android/app/src/main/res/drawable/progressbar_bg.xml index 92e8c86f2c3a..afd2eb477bd9 100644 --- a/android/app/src/main/res/drawable/progressbar_bg.xml +++ b/android/app/src/main/res/drawable/progressbar_bg.xml @@ -10,4 +10,4 @@ android:scaleWidth="100%" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/progressbar_drawable.xml b/android/app/src/main/res/drawable/progressbar_drawable.xml index c0011353bc35..bdaefbd1fb22 100644 --- a/android/app/src/main/res/drawable/progressbar_drawable.xml +++ b/android/app/src/main/res/drawable/progressbar_drawable.xml @@ -8,4 +8,4 @@ android:pivotY="50.0%" android:toDegrees="720" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/radioback_check.xml b/android/app/src/main/res/drawable/radioback_check.xml index a975bc95a87f..a656b4bd9c29 100644 --- a/android/app/src/main/res/drawable/radioback_check.xml +++ b/android/app/src/main/res/drawable/radioback_check.xml @@ -3,4 +3,4 @@ android:shape="rectangle"> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/radioback_checkno.xml b/android/app/src/main/res/drawable/radioback_checkno.xml index 8b9ef4821c0e..5109093eade2 100644 --- a/android/app/src/main/res/drawable/radioback_checkno.xml +++ b/android/app/src/main/res/drawable/radioback_checkno.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/radiobackgd_color.xml b/android/app/src/main/res/drawable/radiobackgd_color.xml index 8d0a4dee9940..7a460f65431c 100644 --- a/android/app/src/main/res/drawable/radiobackgd_color.xml +++ b/android/app/src/main/res/drawable/radiobackgd_color.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/radiotext_color.xml b/android/app/src/main/res/drawable/radiotext_color.xml index ad31a2c5c4b4..adc62cceba11 100644 --- a/android/app/src/main/res/drawable/radiotext_color.xml +++ b/android/app/src/main/res/drawable/radiotext_color.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/salf_white_tuo_20.xml b/android/app/src/main/res/drawable/salf_white_tuo_20.xml index c02c2654b35b..7bca9faed8c8 100644 --- a/android/app/src/main/res/drawable/salf_white_tuo_20.xml +++ b/android/app/src/main/res/drawable/salf_white_tuo_20.xml @@ -10,4 +10,4 @@ android:width="@dimen/dp_1" android:color="#F1EDED" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/sign_check_back.xml b/android/app/src/main/res/drawable/sign_check_back.xml index d0ad0f992142..0d6e95b235c3 100644 --- a/android/app/src/main/res/drawable/sign_check_back.xml +++ b/android/app/src/main/res/drawable/sign_check_back.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/splash.xml b/android/app/src/main/res/drawable/splash.xml index 84eac664d3f8..cc4569a59f90 100644 --- a/android/app/src/main/res/drawable/splash.xml +++ b/android/app/src/main/res/drawable/splash.xml @@ -7,4 +7,4 @@ android:gravity="center_horizontal|bottom" android:mipMap="true"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/splash_en.xml b/android/app/src/main/res/drawable/splash_en.xml index 767f935380f0..0dafaf9ab46d 100644 --- a/android/app/src/main/res/drawable/splash_en.xml +++ b/android/app/src/main/res/drawable/splash_en.xml @@ -7,4 +7,4 @@ android:gravity="center_horizontal|bottom" android:mipMap="true"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/src_qiye.xml b/android/app/src/main/res/drawable/src_qiye.xml index 0dad51eef43e..3be5af891795 100755 --- a/android/app/src/main/res/drawable/src_qiye.xml +++ b/android/app/src/main/res/drawable/src_qiye.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/stoke_line.xml b/android/app/src/main/res/drawable/stoke_line.xml index 1a1bba4fd264..bfb2bc82aa1d 100644 --- a/android/app/src/main/res/drawable/stoke_line.xml +++ b/android/app/src/main/res/drawable/stoke_line.xml @@ -8,4 +8,4 @@ android:dashGap="@dimen/dp_4" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_thumb_off.xml b/android/app/src/main/res/drawable/switch_custom_thumb_off.xml index cf95a5bd961b..14509a4e491a 100644 --- a/android/app/src/main/res/drawable/switch_custom_thumb_off.xml +++ b/android/app/src/main/res/drawable/switch_custom_thumb_off.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_thumb_on.xml b/android/app/src/main/res/drawable/switch_custom_thumb_on.xml index f22d9e030b5b..ca2435fb1cee 100644 --- a/android/app/src/main/res/drawable/switch_custom_thumb_on.xml +++ b/android/app/src/main/res/drawable/switch_custom_thumb_on.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_thumb_selector.xml b/android/app/src/main/res/drawable/switch_custom_thumb_selector.xml index cc7d7dc3c440..bf9194e0d785 100644 --- a/android/app/src/main/res/drawable/switch_custom_thumb_selector.xml +++ b/android/app/src/main/res/drawable/switch_custom_thumb_selector.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_track_off.xml b/android/app/src/main/res/drawable/switch_custom_track_off.xml index 033c21214a04..0c4e00699643 100644 --- a/android/app/src/main/res/drawable/switch_custom_track_off.xml +++ b/android/app/src/main/res/drawable/switch_custom_track_off.xml @@ -7,4 +7,4 @@ android:color="#00000000" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_track_on.xml b/android/app/src/main/res/drawable/switch_custom_track_on.xml index e842111b9442..8f2830750d9c 100644 --- a/android/app/src/main/res/drawable/switch_custom_track_on.xml +++ b/android/app/src/main/res/drawable/switch_custom_track_on.xml @@ -6,4 +6,4 @@ android:width="@dimen/dp_5" android:color="#00000000" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/switch_custom_track_selector.xml b/android/app/src/main/res/drawable/switch_custom_track_selector.xml index 1089406d94ab..6780552c44ec 100644 --- a/android/app/src/main/res/drawable/switch_custom_track_selector.xml +++ b/android/app/src/main/res/drawable/switch_custom_track_selector.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/text_tou_back_blue.xml b/android/app/src/main/res/drawable/text_tou_back_blue.xml index 1c66c503705c..a2e71222cff0 100644 --- a/android/app/src/main/res/drawable/text_tou_back_blue.xml +++ b/android/app/src/main/res/drawable/text_tou_back_blue.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/textcolor.xml b/android/app/src/main/res/drawable/textcolor.xml index 6b61f1562425..dc9fa042e5a8 100755 --- a/android/app/src/main/res/drawable/textcolor.xml +++ b/android/app/src/main/res/drawable/textcolor.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/transparent.xml b/android/app/src/main/res/drawable/transparent.xml index c9dc2980eba0..ed2b0c1a2656 100644 --- a/android/app/src/main/res/drawable/transparent.xml +++ b/android/app/src/main/res/drawable/transparent.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/wallet_list_btc.xml b/android/app/src/main/res/drawable/wallet_list_btc.xml index fd328819a728..2acd02a86ff2 100644 --- a/android/app/src/main/res/drawable/wallet_list_btc.xml +++ b/android/app/src/main/res/drawable/wallet_list_btc.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_back_.xml b/android/app/src/main/res/drawable/white_back_.xml index 452ff7d25183..965dad0dcaea 100644 --- a/android/app/src/main/res/drawable/white_back_.xml +++ b/android/app/src/main/res/drawable/white_back_.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_back_1.xml b/android/app/src/main/res/drawable/white_back_1.xml index 41519d87deb6..02192cf3b965 100644 --- a/android/app/src/main/res/drawable/white_back_1.xml +++ b/android/app/src/main/res/drawable/white_back_1.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_back_tuo.xml b/android/app/src/main/res/drawable/white_back_tuo.xml index 222866c986ba..6a2d61cfa7ef 100644 --- a/android/app/src/main/res/drawable/white_back_tuo.xml +++ b/android/app/src/main/res/drawable/white_back_tuo.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_bg.xml b/android/app/src/main/res/drawable/white_bg.xml index 1dc791e1791d..8128e7bc5442 100644 --- a/android/app/src/main/res/drawable/white_bg.xml +++ b/android/app/src/main/res/drawable/white_bg.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_clrcle.xml b/android/app/src/main/res/drawable/white_clrcle.xml index a0ae3d207d0a..3b94e00bd860 100644 --- a/android/app/src/main/res/drawable/white_clrcle.xml +++ b/android/app/src/main/res/drawable/white_clrcle.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_stoken.xml b/android/app/src/main/res/drawable/white_stoken.xml index c631085197f0..cd88ff07ce9a 100644 --- a/android/app/src/main/res/drawable/white_stoken.xml +++ b/android/app/src/main/res/drawable/white_stoken.xml @@ -7,4 +7,4 @@ android:width="@dimen/dp_1" android:color="#F2F2F2" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_title_bg.xml b/android/app/src/main/res/drawable/white_title_bg.xml index db91a16dff10..c96c5428298f 100644 --- a/android/app/src/main/res/drawable/white_title_bg.xml +++ b/android/app/src/main/res/drawable/white_title_bg.xml @@ -8,4 +8,4 @@ /> - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_tuo.xml b/android/app/src/main/res/drawable/white_tuo.xml index ffdd5760bdb6..62248bf4fe5c 100644 --- a/android/app/src/main/res/drawable/white_tuo.xml +++ b/android/app/src/main/res/drawable/white_tuo.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/white_tuo_big.xml b/android/app/src/main/res/drawable/white_tuo_big.xml index fc3f97b3b854..253e067352fc 100644 --- a/android/app/src/main/res/drawable/white_tuo_big.xml +++ b/android/app/src/main/res/drawable/white_tuo_big.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/actionbar.xml b/android/app/src/main/res/layout/actionbar.xml index 4c91aeae715f..e74464b3501d 100644 --- a/android/app/src/main/res/layout/actionbar.xml +++ b/android/app/src/main/res/layout/actionbar.xml @@ -21,4 +21,3 @@ android:textSize="@dimen/text_size" android:textColor="@color/text"/> - diff --git a/android/app/src/main/res/layout/activate.xml b/android/app/src/main/res/layout/activate.xml index 73e741070a2a..a35168c3500b 100644 --- a/android/app/src/main/res/layout/activate.xml +++ b/android/app/src/main/res/layout/activate.xml @@ -127,4 +127,4 @@ android:textSize="@dimen/sp_12" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activated_successful.xml b/android/app/src/main/res/layout/activated_successful.xml index 727aa64b67e3..99901d6eee10 100644 --- a/android/app/src/main/res/layout/activated_successful.xml +++ b/android/app/src/main/res/layout/activated_successful.xml @@ -48,4 +48,4 @@ android:text="@string/next" android:textAllCaps="false" android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/active_failed.xml b/android/app/src/main/res/layout/active_failed.xml index 86f22580337a..bc579c4ee4e0 100644 --- a/android/app/src/main/res/layout/active_failed.xml +++ b/android/app/src/main/res/layout/active_failed.xml @@ -58,4 +58,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/active_successful.xml b/android/app/src/main/res/layout/active_successful.xml index b0fe104b0116..7068688e5f89 100644 --- a/android/app/src/main/res/layout/active_successful.xml +++ b/android/app/src/main/res/layout/active_successful.xml @@ -61,4 +61,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_agent_server.xml b/android/app/src/main/res/layout/activity_agent_server.xml index 878b5b785ea4..05938e02170d 100644 --- a/android/app/src/main/res/layout/activity_agent_server.xml +++ b/android/app/src/main/res/layout/activity_agent_server.xml @@ -294,4 +294,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_all_assets.xml b/android/app/src/main/res/layout/activity_all_assets.xml index 7f43ef59f5e7..5e4ff3cea6cb 100644 --- a/android/app/src/main/res/layout/activity_all_assets.xml +++ b/android/app/src/main/res/layout/activity_all_assets.xml @@ -100,4 +100,4 @@ android:visibility="gone" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_app_wallet_create_finish.xml b/android/app/src/main/res/layout/activity_app_wallet_create_finish.xml index 75cab58fa8d1..b75596e55524 100644 --- a/android/app/src/main/res/layout/activity_app_wallet_create_finish.xml +++ b/android/app/src/main/res/layout/activity_app_wallet_create_finish.xml @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_app_wallet_set_pass.xml b/android/app/src/main/res/layout/activity_app_wallet_set_pass.xml index 0f1d14c420ae..f1ed369af51b 100644 --- a/android/app/src/main/res/layout/activity_app_wallet_set_pass.xml +++ b/android/app/src/main/res/layout/activity_app_wallet_set_pass.xml @@ -136,4 +136,4 @@ android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_backup_check_success.xml b/android/app/src/main/res/layout/activity_backup_check_success.xml index c9c8e35cc27a..651807670bc7 100644 --- a/android/app/src/main/res/layout/activity_backup_check_success.xml +++ b/android/app/src/main/res/layout/activity_backup_check_success.xml @@ -84,4 +84,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_backup_guide.xml b/android/app/src/main/res/layout/activity_backup_guide.xml index f8b87cb67a39..cb3a3bead97c 100644 --- a/android/app/src/main/res/layout/activity_backup_guide.xml +++ b/android/app/src/main/res/layout/activity_backup_guide.xml @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_backup_message.xml b/android/app/src/main/res/layout/activity_backup_message.xml index 4e7d554d171a..8ea99a6a7bbb 100644 --- a/android/app/src/main/res/layout/activity_backup_message.xml +++ b/android/app/src/main/res/layout/activity_backup_message.xml @@ -124,4 +124,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_backup_recovery.xml b/android/app/src/main/res/layout/activity_backup_recovery.xml index 97882072678e..347b2eef33fc 100644 --- a/android/app/src/main/res/layout/activity_backup_recovery.xml +++ b/android/app/src/main/res/layout/activity_backup_recovery.xml @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_base.xml b/android/app/src/main/res/layout/activity_base.xml index b12047cde3eb..dc5066c15543 100644 --- a/android/app/src/main/res/layout/activity_base.xml +++ b/android/app/src/main/res/layout/activity_base.xml @@ -5,4 +5,4 @@ android:layout_height="match_parent" tools:context=".activities.base.BaseActivity"> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_bixin_key_message.xml b/android/app/src/main/res/layout/activity_bixin_key_message.xml index 3f2d8ba2dc77..cbcbbe6858ac 100644 --- a/android/app/src/main/res/layout/activity_bixin_key_message.xml +++ b/android/app/src/main/res/layout/activity_bixin_key_message.xml @@ -216,4 +216,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_bixin_keymenage.xml b/android/app/src/main/res/layout/activity_bixin_keymenage.xml index f1c93ad94d88..2bf1d80f31fc 100644 --- a/android/app/src/main/res/layout/activity_bixin_keymenage.xml +++ b/android/app/src/main/res/layout/activity_bixin_keymenage.xml @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_block_choose.xml b/android/app/src/main/res/layout/activity_block_choose.xml index aff80ad23494..6d70a68eb474 100644 --- a/android/app/src/main/res/layout/activity_block_choose.xml +++ b/android/app/src/main/res/layout/activity_block_choose.xml @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_blue_tooth_status.xml b/android/app/src/main/res/layout/activity_blue_tooth_status.xml index 02f688dd6fe1..8d1d6c5e06d0 100644 --- a/android/app/src/main/res/layout/activity_blue_tooth_status.xml +++ b/android/app/src/main/res/layout/activity_blue_tooth_status.xml @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_chain_detail_web.xml b/android/app/src/main/res/layout/activity_check_chain_detail_web.xml index 996c9d8ec418..30b29b6a13b0 100644 --- a/android/app/src/main/res/layout/activity_check_chain_detail_web.xml +++ b/android/app/src/main/res/layout/activity_check_chain_detail_web.xml @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_hide_wallet.xml b/android/app/src/main/res/layout/activity_check_hide_wallet.xml index 391fb7a18b10..05454d02bfd9 100644 --- a/android/app/src/main/res/layout/activity_check_hide_wallet.xml +++ b/android/app/src/main/res/layout/activity_check_hide_wallet.xml @@ -326,4 +326,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_sign.xml b/android/app/src/main/res/layout/activity_check_sign.xml index 898ce8b153f3..50c666ed073c 100644 --- a/android/app/src/main/res/layout/activity_check_sign.xml +++ b/android/app/src/main/res/layout/activity_check_sign.xml @@ -238,4 +238,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_sign_message.xml b/android/app/src/main/res/layout/activity_check_sign_message.xml index 6be26bb628cf..6c37d931bf53 100644 --- a/android/app/src/main/res/layout/activity_check_sign_message.xml +++ b/android/app/src/main/res/layout/activity_check_sign_message.xml @@ -171,4 +171,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_sign_result.xml b/android/app/src/main/res/layout/activity_check_sign_result.xml index 652b3733583e..30cf692b4702 100644 --- a/android/app/src/main/res/layout/activity_check_sign_result.xml +++ b/android/app/src/main/res/layout/activity_check_sign_result.xml @@ -82,4 +82,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_check_wallet_detail.xml b/android/app/src/main/res/layout/activity_check_wallet_detail.xml index 1723db19ee24..e06771cc85bc 100644 --- a/android/app/src/main/res/layout/activity_check_wallet_detail.xml +++ b/android/app/src/main/res/layout/activity_check_wallet_detail.xml @@ -278,4 +278,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_choose_currency.xml b/android/app/src/main/res/layout/activity_choose_currency.xml index 4cb2bdd870dc..132166587ac0 100644 --- a/android/app/src/main/res/layout/activity_choose_currency.xml +++ b/android/app/src/main/res/layout/activity_choose_currency.xml @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_choose_histry_wallet.xml b/android/app/src/main/res/layout/activity_choose_histry_wallet.xml index 8a558931cde0..5ede928ce402 100644 --- a/android/app/src/main/res/layout/activity_choose_histry_wallet.xml +++ b/android/app/src/main/res/layout/activity_choose_histry_wallet.xml @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_choose_import_method.xml b/android/app/src/main/res/layout/activity_choose_import_method.xml index ba68c053a937..d302d8af8456 100644 --- a/android/app/src/main/res/layout/activity_choose_import_method.xml +++ b/android/app/src/main/res/layout/activity_choose_import_method.xml @@ -203,4 +203,4 @@ android:background="@color/line_color" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_confirm_backup.xml b/android/app/src/main/res/layout/activity_confirm_backup.xml index 232d5c689216..a2827762e224 100644 --- a/android/app/src/main/res/layout/activity_confirm_backup.xml +++ b/android/app/src/main/res/layout/activity_confirm_backup.xml @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_creat_app_wallet.xml b/android/app/src/main/res/layout/activity_creat_app_wallet.xml index 69501673227e..c41a0492f9cd 100644 --- a/android/app/src/main/res/layout/activity_creat_app_wallet.xml +++ b/android/app/src/main/res/layout/activity_creat_app_wallet.xml @@ -104,4 +104,4 @@ android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_creat_finish_personal.xml b/android/app/src/main/res/layout/activity_creat_finish_personal.xml index 7328851d729e..0491b74c4d8c 100644 --- a/android/app/src/main/res/layout/activity_creat_finish_personal.xml +++ b/android/app/src/main/res/layout/activity_creat_finish_personal.xml @@ -184,4 +184,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_create_help_word_wallet.xml b/android/app/src/main/res/layout/activity_create_help_word_wallet.xml index 8c50b43b44ba..5596f9276c9c 100644 --- a/android/app/src/main/res/layout/activity_create_help_word_wallet.xml +++ b/android/app/src/main/res/layout/activity_create_help_word_wallet.xml @@ -127,4 +127,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_create_input_help_word_wallet_succse.xml b/android/app/src/main/res/layout/activity_create_input_help_word_wallet_succse.xml index ff34a09a9df2..44b9a93cefd2 100644 --- a/android/app/src/main/res/layout/activity_create_input_help_word_wallet_succse.xml +++ b/android/app/src/main/res/layout/activity_create_input_help_word_wallet_succse.xml @@ -116,4 +116,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_create_only_choose.xml b/android/app/src/main/res/layout/activity_create_only_choose.xml index 5532ca28619c..1e4d9738558e 100644 --- a/android/app/src/main/res/layout/activity_create_only_choose.xml +++ b/android/app/src/main/res/layout/activity_create_only_choose.xml @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_create_personal_help_pass.xml b/android/app/src/main/res/layout/activity_create_personal_help_pass.xml index 0285ae9ebf65..c059d12d3752 100644 --- a/android/app/src/main/res/layout/activity_create_personal_help_pass.xml +++ b/android/app/src/main/res/layout/activity_create_personal_help_pass.xml @@ -134,4 +134,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_create_personal_wallet.xml b/android/app/src/main/res/layout/activity_create_personal_wallet.xml index ffc70022996c..e4d69baa4103 100644 --- a/android/app/src/main/res/layout/activity_create_personal_wallet.xml +++ b/android/app/src/main/res/layout/activity_create_personal_wallet.xml @@ -102,4 +102,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_deatil_more_address.xml b/android/app/src/main/res/layout/activity_deatil_more_address.xml index 92dafc678fd3..3f3ba4211da0 100644 --- a/android/app/src/main/res/layout/activity_deatil_more_address.xml +++ b/android/app/src/main/res/layout/activity_deatil_more_address.xml @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_delete_wallet.xml b/android/app/src/main/res/layout/activity_delete_wallet.xml index 9fdef97006fa..d2926ec488c6 100644 --- a/android/app/src/main/res/layout/activity_delete_wallet.xml +++ b/android/app/src/main/res/layout/activity_delete_wallet.xml @@ -124,4 +124,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_16" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_detail_eth_transaction.xml b/android/app/src/main/res/layout/activity_detail_eth_transaction.xml index b4e80fa95fdb..cdcf863c6471 100644 --- a/android/app/src/main/res/layout/activity_detail_eth_transaction.xml +++ b/android/app/src/main/res/layout/activity_detail_eth_transaction.xml @@ -339,4 +339,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_detail_transaction.xml b/android/app/src/main/res/layout/activity_detail_transaction.xml index b4e80fa95fdb..cdcf863c6471 100644 --- a/android/app/src/main/res/layout/activity_detail_transaction.xml +++ b/android/app/src/main/res/layout/activity_detail_transaction.xml @@ -339,4 +339,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_electrum_node_choose.xml b/android/app/src/main/res/layout/activity_electrum_node_choose.xml index eb7522eb41be..9f1d84650a5c 100644 --- a/android/app/src/main/res/layout/activity_electrum_node_choose.xml +++ b/android/app/src/main/res/layout/activity_electrum_node_choose.xml @@ -184,4 +184,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_find_device_and_backed_up.xml b/android/app/src/main/res/layout/activity_find_device_and_backed_up.xml index ed3745b63b1b..0643d931df5b 100644 --- a/android/app/src/main/res/layout/activity_find_device_and_backed_up.xml +++ b/android/app/src/main/res/layout/activity_find_device_and_backed_up.xml @@ -73,4 +73,4 @@ android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_find_device_no_backup.xml b/android/app/src/main/res/layout/activity_find_device_no_backup.xml index 3fc58bd1a17b..61bdb459a61c 100644 --- a/android/app/src/main/res/layout/activity_find_device_no_backup.xml +++ b/android/app/src/main/res/layout/activity_find_device_no_backup.xml @@ -185,4 +185,4 @@ android:background="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_find_new_device.xml b/android/app/src/main/res/layout/activity_find_new_device.xml index 75e687b770a9..ebf546186af6 100644 --- a/android/app/src/main/res/layout/activity_find_new_device.xml +++ b/android/app/src/main/res/layout/activity_find_new_device.xml @@ -220,4 +220,4 @@ android:background="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_h_d_wallet.xml b/android/app/src/main/res/layout/activity_h_d_wallet.xml index d4309ea1e7c6..992997558a68 100644 --- a/android/app/src/main/res/layout/activity_h_d_wallet.xml +++ b/android/app/src/main/res/layout/activity_h_d_wallet.xml @@ -264,4 +264,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_hardware_recovery.xml b/android/app/src/main/res/layout/activity_hardware_recovery.xml index 17e0919d2ee2..1da3e66d346e 100644 --- a/android/app/src/main/res/layout/activity_hardware_recovery.xml +++ b/android/app/src/main/res/layout/activity_hardware_recovery.xml @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_hd_root_mnemonics.xml b/android/app/src/main/res/layout/activity_hd_root_mnemonics.xml index 7996ef085c1e..142502fd3309 100644 --- a/android/app/src/main/res/layout/activity_hd_root_mnemonics.xml +++ b/android/app/src/main/res/layout/activity_hd_root_mnemonics.xml @@ -558,4 +558,4 @@ android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_hide_wallet.xml b/android/app/src/main/res/layout/activity_hide_wallet.xml index ecc077b48e31..74a19670f07d 100644 --- a/android/app/src/main/res/layout/activity_hide_wallet.xml +++ b/android/app/src/main/res/layout/activity_hide_wallet.xml @@ -116,4 +116,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_hide_wallet_input_pass.xml b/android/app/src/main/res/layout/activity_hide_wallet_input_pass.xml index c4c14e70f8dc..71d6d13ffa32 100644 --- a/android/app/src/main/res/layout/activity_hide_wallet_input_pass.xml +++ b/android/app/src/main/res/layout/activity_hide_wallet_input_pass.xml @@ -86,4 +86,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_hide_wallet_set_pass.xml b/android/app/src/main/res/layout/activity_hide_wallet_set_pass.xml index 9746adf04456..6fb8364ae529 100644 --- a/android/app/src/main/res/layout/activity_hide_wallet_set_pass.xml +++ b/android/app/src/main/res/layout/activity_hide_wallet_set_pass.xml @@ -94,4 +94,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_import_history_wallet.xml b/android/app/src/main/res/layout/activity_import_history_wallet.xml index d6c2c029a489..987a767c69e2 100644 --- a/android/app/src/main/res/layout/activity_import_history_wallet.xml +++ b/android/app/src/main/res/layout/activity_import_history_wallet.xml @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_import_keystore.xml b/android/app/src/main/res/layout/activity_import_keystore.xml index d13e95c9bd38..52ef2c6eb675 100644 --- a/android/app/src/main/res/layout/activity_import_keystore.xml +++ b/android/app/src/main/res/layout/activity_import_keystore.xml @@ -13,4 +13,4 @@ android:name="org.haobtc.onekey.onekeys.walletprocess.importsoft.ImportKeystoreFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_import_mnemonic.xml b/android/app/src/main/res/layout/activity_import_mnemonic.xml index 0bf27f73af22..836e3c1d7142 100644 --- a/android/app/src/main/res/layout/activity_import_mnemonic.xml +++ b/android/app/src/main/res/layout/activity_import_mnemonic.xml @@ -13,4 +13,4 @@ android:name="org.haobtc.onekey.onekeys.walletprocess.importsoft.ImportMnemonicFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_import_private_key.xml b/android/app/src/main/res/layout/activity_import_private_key.xml index 54d3ec6a509a..5bd5fe91f5cb 100644 --- a/android/app/src/main/res/layout/activity_import_private_key.xml +++ b/android/app/src/main/res/layout/activity_import_private_key.xml @@ -14,4 +14,4 @@ android:name="org.haobtc.onekey.onekeys.walletprocess.importsoft.ImportPrivateKeyFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_import_wallet_set_name.xml b/android/app/src/main/res/layout/activity_import_wallet_set_name.xml index dc56fed6bbee..7aaec1d9d694 100644 --- a/android/app/src/main/res/layout/activity_import_wallet_set_name.xml +++ b/android/app/src/main/res/layout/activity_import_wallet_set_name.xml @@ -82,4 +82,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_input_new_pin.xml b/android/app/src/main/res/layout/activity_input_new_pin.xml index b917e4e792e8..871679e28360 100644 --- a/android/app/src/main/res/layout/activity_input_new_pin.xml +++ b/android/app/src/main/res/layout/activity_input_new_pin.xml @@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_lunch.xml b/android/app/src/main/res/layout/activity_lunch.xml index 39037b1404cb..56234234e53d 100644 --- a/android/app/src/main/res/layout/activity_lunch.xml +++ b/android/app/src/main/res/layout/activity_lunch.xml @@ -26,4 +26,4 @@ android:layout_marginBottom="@dimen/dp_66" android:background="@drawable/onekey_text" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_many_wallet_together.xml b/android/app/src/main/res/layout/activity_many_wallet_together.xml index ca485fb101f6..4126af1558d0 100644 --- a/android/app/src/main/res/layout/activity_many_wallet_together.xml +++ b/android/app/src/main/res/layout/activity_many_wallet_together.xml @@ -414,12 +414,3 @@ - - - - - - - - - diff --git a/android/app/src/main/res/layout/activity_mnemonic_word.xml b/android/app/src/main/res/layout/activity_mnemonic_word.xml index 5e4e64381d9a..f0baf093cb55 100644 --- a/android/app/src/main/res/layout/activity_mnemonic_word.xml +++ b/android/app/src/main/res/layout/activity_mnemonic_word.xml @@ -315,4 +315,4 @@ android:text="@string/next" android:textAllCaps="false" android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_no_secret_payment.xml b/android/app/src/main/res/layout/activity_no_secret_payment.xml index 0427506e59a2..f45019712ec0 100644 --- a/android/app/src/main/res/layout/activity_no_secret_payment.xml +++ b/android/app/src/main/res/layout/activity_no_secret_payment.xml @@ -296,4 +296,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_quetation_choose.xml b/android/app/src/main/res/layout/activity_quetation_choose.xml index 243bb09246c7..cae4a48b9537 100644 --- a/android/app/src/main/res/layout/activity_quetation_choose.xml +++ b/android/app/src/main/res/layout/activity_quetation_choose.xml @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_recover_hd_wallet.xml b/android/app/src/main/res/layout/activity_recover_hd_wallet.xml index 2c92d37a37f9..5916fb944e1a 100644 --- a/android/app/src/main/res/layout/activity_recover_hd_wallet.xml +++ b/android/app/src/main/res/layout/activity_recover_hd_wallet.xml @@ -652,4 +652,4 @@ tools:listitem="@layout/search_mnemonic_item"> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_recovery_set.xml b/android/app/src/main/res/layout/activity_recovery_set.xml index d0492f9402ab..e69b3161d739 100644 --- a/android/app/src/main/res/layout/activity_recovery_set.xml +++ b/android/app/src/main/res/layout/activity_recovery_set.xml @@ -63,4 +63,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" android:textSize="@dimen/sp_14"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_remeber_mnemonic_word.xml b/android/app/src/main/res/layout/activity_remeber_mnemonic_word.xml index 7ba0375bae40..fa2887a6f418 100644 --- a/android/app/src/main/res/layout/activity_remeber_mnemonic_word.xml +++ b/android/app/src/main/res/layout/activity_remeber_mnemonic_word.xml @@ -168,4 +168,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_search_devices.xml b/android/app/src/main/res/layout/activity_search_devices.xml index 09ed85b526cc..9c0e2dd4ed61 100644 --- a/android/app/src/main/res/layout/activity_search_devices.xml +++ b/android/app/src/main/res/layout/activity_search_devices.xml @@ -122,4 +122,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_share_other.xml b/android/app/src/main/res/layout/activity_share_other.xml index d3ce9427dfd2..c77bcd14c8fc 100644 --- a/android/app/src/main/res/layout/activity_share_other.xml +++ b/android/app/src/main/res/layout/activity_share_other.xml @@ -224,4 +224,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_sign.xml b/android/app/src/main/res/layout/activity_sign.xml index ee61d6b51b75..44a5caf3887a 100644 --- a/android/app/src/main/res/layout/activity_sign.xml +++ b/android/app/src/main/res/layout/activity_sign.xml @@ -213,4 +213,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_somemore.xml b/android/app/src/main/res/layout/activity_somemore.xml index dcb2f3203fdd..7ba5ba9bfa96 100644 --- a/android/app/src/main/res/layout/activity_somemore.xml +++ b/android/app/src/main/res/layout/activity_somemore.xml @@ -353,4 +353,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_title_container.xml b/android/app/src/main/res/layout/activity_title_container.xml index d8dfbd57aedb..8d9b13271efd 100644 --- a/android/app/src/main/res/layout/activity_title_container.xml +++ b/android/app/src/main/res/layout/activity_title_container.xml @@ -14,4 +14,4 @@ android:background="@android:color/white"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_transaction_completion.xml b/android/app/src/main/res/layout/activity_transaction_completion.xml index 7283ba5d5691..7b5517a75eaf 100644 --- a/android/app/src/main/res/layout/activity_transaction_completion.xml +++ b/android/app/src/main/res/layout/activity_transaction_completion.xml @@ -95,4 +95,4 @@ android:textAllCaps="false" android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_upgrade_bixin_key.xml b/android/app/src/main/res/layout/activity_upgrade_bixin_key.xml index 7d83ea16c4f4..4c999e7e2752 100644 --- a/android/app/src/main/res/layout/activity_upgrade_bixin_key.xml +++ b/android/app/src/main/res/layout/activity_upgrade_bixin_key.xml @@ -86,4 +86,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_upgrade_finished.xml b/android/app/src/main/res/layout/activity_upgrade_finished.xml index cb3249927464..b2f6788d94ba 100644 --- a/android/app/src/main/res/layout/activity_upgrade_finished.xml +++ b/android/app/src/main/res/layout/activity_upgrade_finished.xml @@ -59,4 +59,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_verification_mnemonic_word.xml b/android/app/src/main/res/layout/activity_verification_mnemonic_word.xml index 1d767baa8250..b386320fa2f7 100644 --- a/android/app/src/main/res/layout/activity_verification_mnemonic_word.xml +++ b/android/app/src/main/res/layout/activity_verification_mnemonic_word.xml @@ -289,4 +289,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_verification_success.xml b/android/app/src/main/res/layout/activity_verification_success.xml index e1e2a01ec273..43b367d49118 100644 --- a/android/app/src/main/res/layout/activity_verification_success.xml +++ b/android/app/src/main/res/layout/activity_verification_success.xml @@ -79,4 +79,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_version_upgrade.xml b/android/app/src/main/res/layout/activity_version_upgrade.xml index 11ba061b3e1d..8338e7f6c626 100644 --- a/android/app/src/main/res/layout/activity_version_upgrade.xml +++ b/android/app/src/main/res/layout/activity_version_upgrade.xml @@ -326,4 +326,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/activity_wallet_manage.xml b/android/app/src/main/res/layout/activity_wallet_manage.xml index 25ada8281061..943ee9e12ab6 100644 --- a/android/app/src/main/res/layout/activity_wallet_manage.xml +++ b/android/app/src/main/res/layout/activity_wallet_manage.xml @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/address_info.xml b/android/app/src/main/res/layout/address_info.xml index 9de090ac0d90..ccc163aeac3b 100644 --- a/android/app/src/main/res/layout/address_info.xml +++ b/android/app/src/main/res/layout/address_info.xml @@ -193,4 +193,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/app_upgrade_dialog.xml b/android/app/src/main/res/layout/app_upgrade_dialog.xml index 190291641486..5fa4dc57f87e 100644 --- a/android/app/src/main/res/layout/app_upgrade_dialog.xml +++ b/android/app/src/main/res/layout/app_upgrade_dialog.xml @@ -116,4 +116,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/base_ui_toolbar.xml b/android/app/src/main/res/layout/base_ui_toolbar.xml index 67e6a7235463..ff81386180fa 100644 --- a/android/app/src/main/res/layout/base_ui_toolbar.xml +++ b/android/app/src/main/res/layout/base_ui_toolbar.xml @@ -26,4 +26,4 @@ android:textColor="@color/black_0" android:textSize="17sp" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/bluetooth_device_connecting_or_bonding.xml b/android/app/src/main/res/layout/bluetooth_device_connecting_or_bonding.xml index ce7cd5afc070..19821c638578 100644 --- a/android/app/src/main/res/layout/bluetooth_device_connecting_or_bonding.xml +++ b/android/app/src/main/res/layout/bluetooth_device_connecting_or_bonding.xml @@ -22,4 +22,4 @@ android:src="@drawable/connecting_shape" android:layout_marginTop="@dimen/dp_95" android:contentDescription="@string/ble_device_connecting" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/bluetooth_device_list.xml b/android/app/src/main/res/layout/bluetooth_device_list.xml index 5c594b11aecd..85016032112a 100644 --- a/android/app/src/main/res/layout/bluetooth_device_list.xml +++ b/android/app/src/main/res/layout/bluetooth_device_list.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/bluetooth_device_list_item.xml b/android/app/src/main/res/layout/bluetooth_device_list_item.xml index 5cfa9d25f351..124767bbab6a 100644 --- a/android/app/src/main/res/layout/bluetooth_device_list_item.xml +++ b/android/app/src/main/res/layout/bluetooth_device_list_item.xml @@ -34,4 +34,4 @@ android:textSize="@dimen/sp_16" tools:text="BixinKEY-12345678" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/bluetooth_nfc.xml b/android/app/src/main/res/layout/bluetooth_nfc.xml index e509cc9a2e85..1b7137887397 100644 --- a/android/app/src/main/res/layout/bluetooth_nfc.xml +++ b/android/app/src/main/res/layout/bluetooth_nfc.xml @@ -147,4 +147,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/boot_page.xml b/android/app/src/main/res/layout/boot_page.xml index 40ef7a7166a0..f5eee373c81b 100644 --- a/android/app/src/main/res/layout/boot_page.xml +++ b/android/app/src/main/res/layout/boot_page.xml @@ -49,4 +49,4 @@ app:srcCompat="@drawable/boot_page_greydot" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/boot_page_item1.xml b/android/app/src/main/res/layout/boot_page_item1.xml index 87d9d8ccb7b7..0cdfc9466a60 100644 --- a/android/app/src/main/res/layout/boot_page_item1.xml +++ b/android/app/src/main/res/layout/boot_page_item1.xml @@ -25,4 +25,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@string/strguidefirst" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/boot_page_item2.xml b/android/app/src/main/res/layout/boot_page_item2.xml index 0768d27fc904..079bd3479d06 100644 --- a/android/app/src/main/res/layout/boot_page_item2.xml +++ b/android/app/src/main/res/layout/boot_page_item2.xml @@ -26,4 +26,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@string/boot_message" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/button_request_confirm_fragment.xml b/android/app/src/main/res/layout/button_request_confirm_fragment.xml index ae9f69feee8d..a465bce569a3 100644 --- a/android/app/src/main/res/layout/button_request_confirm_fragment.xml +++ b/android/app/src/main/res/layout/button_request_confirm_fragment.xml @@ -55,4 +55,4 @@ android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/change_pin_failed.xml b/android/app/src/main/res/layout/change_pin_failed.xml index 058017a8e8c9..a7fb36f899ed 100644 --- a/android/app/src/main/res/layout/change_pin_failed.xml +++ b/android/app/src/main/res/layout/change_pin_failed.xml @@ -57,4 +57,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/check_xpub.xml b/android/app/src/main/res/layout/check_xpub.xml index 24dac0e167a3..5911e268301e 100644 --- a/android/app/src/main/res/layout/check_xpub.xml +++ b/android/app/src/main/res/layout/check_xpub.xml @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/choose_mnemonic_size_fragment.xml b/android/app/src/main/res/layout/choose_mnemonic_size_fragment.xml index 703814b57d29..330573f2a9aa 100644 --- a/android/app/src/main/res/layout/choose_mnemonic_size_fragment.xml +++ b/android/app/src/main/res/layout/choose_mnemonic_size_fragment.xml @@ -69,4 +69,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/tv2"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/chooseaddress.xml b/android/app/src/main/res/layout/chooseaddress.xml index 61e1dd06a080..8db2584bacca 100644 --- a/android/app/src/main/res/layout/chooseaddress.xml +++ b/android/app/src/main/res/layout/chooseaddress.xml @@ -36,4 +36,4 @@ android:layout_marginEnd="@dimen/sp_16" android:background="@color/line_color" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/communication_way.xml b/android/app/src/main/res/layout/communication_way.xml index a6fb5d80673e..3ccdf8ca7360 100644 --- a/android/app/src/main/res/layout/communication_way.xml +++ b/android/app/src/main/res/layout/communication_way.xml @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/confirm_on_hardware.xml b/android/app/src/main/res/layout/confirm_on_hardware.xml index 50025ca78eef..8be38119d18b 100644 --- a/android/app/src/main/res/layout/confirm_on_hardware.xml +++ b/android/app/src/main/res/layout/confirm_on_hardware.xml @@ -220,4 +220,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/confirm_on_hardware_activity.xml b/android/app/src/main/res/layout/confirm_on_hardware_activity.xml index 929945af0b63..ee3b048d5bed 100644 --- a/android/app/src/main/res/layout/confirm_on_hardware_activity.xml +++ b/android/app/src/main/res/layout/confirm_on_hardware_activity.xml @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/confirm_pin.xml b/android/app/src/main/res/layout/confirm_pin.xml index 8ad95004b7d3..09581c790caf 100644 --- a/android/app/src/main/res/layout/confirm_pin.xml +++ b/android/app/src/main/res/layout/confirm_pin.xml @@ -81,4 +81,4 @@ android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/create_multi_sig_fragment_1.xml b/android/app/src/main/res/layout/create_multi_sig_fragment_1.xml index 42d2a8828b14..b966d5d70795 100644 --- a/android/app/src/main/res/layout/create_multi_sig_fragment_1.xml +++ b/android/app/src/main/res/layout/create_multi_sig_fragment_1.xml @@ -187,12 +187,3 @@ - - - - - - - - - diff --git a/android/app/src/main/res/layout/create_multi_sig_fragment_2.xml b/android/app/src/main/res/layout/create_multi_sig_fragment_2.xml index e84dd2c980bc..19362f30c666 100644 --- a/android/app/src/main/res/layout/create_multi_sig_fragment_2.xml +++ b/android/app/src/main/res/layout/create_multi_sig_fragment_2.xml @@ -180,12 +180,3 @@ - - - - - - - - - diff --git a/android/app/src/main/res/layout/create_multi_sig_fragment_3.xml b/android/app/src/main/res/layout/create_multi_sig_fragment_3.xml index b5a3e5210bc8..196e0ea14e02 100644 --- a/android/app/src/main/res/layout/create_multi_sig_fragment_3.xml +++ b/android/app/src/main/res/layout/create_multi_sig_fragment_3.xml @@ -131,12 +131,3 @@ - - - - - - - - - diff --git a/android/app/src/main/res/layout/create_wallet.xml b/android/app/src/main/res/layout/create_wallet.xml index be4662d9ec35..2f506855fddd 100644 --- a/android/app/src/main/res/layout/create_wallet.xml +++ b/android/app/src/main/res/layout/create_wallet.xml @@ -197,4 +197,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/crete_successful.xml b/android/app/src/main/res/layout/crete_successful.xml index 35376ab4d14d..5e441c3a9850 100644 --- a/android/app/src/main/res/layout/crete_successful.xml +++ b/android/app/src/main/res/layout/crete_successful.xml @@ -159,4 +159,4 @@ app:layout_constraintTop_toBottomOf="@id/cardView" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/custom_fee.xml b/android/app/src/main/res/layout/custom_fee.xml index dc45f2daf0b4..825f330e842f 100644 --- a/android/app/src/main/res/layout/custom_fee.xml +++ b/android/app/src/main/res/layout/custom_fee.xml @@ -175,4 +175,4 @@ android:textSize="@dimen/sp_16" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/dialog_mnemonic_size_selector.xml b/android/app/src/main/res/layout/dialog_mnemonic_size_selector.xml index 4d237ecbc4aa..eca4296dc331 100644 --- a/android/app/src/main/res/layout/dialog_mnemonic_size_selector.xml +++ b/android/app/src/main/res/layout/dialog_mnemonic_size_selector.xml @@ -69,4 +69,4 @@ app:drawableEndCompat="@drawable/right_arrow_small" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/dialog_read_or_sending.xml b/android/app/src/main/res/layout/dialog_read_or_sending.xml index 9fe247f2036c..509f4fd49d78 100644 --- a/android/app/src/main/res/layout/dialog_read_or_sending.xml +++ b/android/app/src/main/res/layout/dialog_read_or_sending.xml @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/dialog_restart.xml b/android/app/src/main/res/layout/dialog_restart.xml index f3b69cca11a0..63bbcfbf63f1 100644 --- a/android/app/src/main/res/layout/dialog_restart.xml +++ b/android/app/src/main/res/layout/dialog_restart.xml @@ -41,4 +41,4 @@ android:textSize="@dimen/sp_18" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/dialog_view.xml b/android/app/src/main/res/layout/dialog_view.xml index 985ed9fd574e..0026b3e67e8c 100644 --- a/android/app/src/main/res/layout/dialog_view.xml +++ b/android/app/src/main/res/layout/dialog_view.xml @@ -74,4 +74,3 @@ - diff --git a/android/app/src/main/res/layout/fragment_add_asset.xml b/android/app/src/main/res/layout/fragment_add_asset.xml index 5e0d2a25af43..fce3049a1e9b 100644 --- a/android/app/src/main/res/layout/fragment_add_asset.xml +++ b/android/app/src/main/res/layout/fragment_add_asset.xml @@ -29,4 +29,4 @@ tools:itemCount="3" android:layout_weight="1" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_add_view.xml b/android/app/src/main/res/layout/fragment_add_view.xml index 2cb17a0bfafe..bcfa77005e05 100644 --- a/android/app/src/main/res/layout/fragment_add_view.xml +++ b/android/app/src/main/res/layout/fragment_add_view.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_backup_success.xml b/android/app/src/main/res/layout/fragment_backup_success.xml index 167183dcdf67..db0502ef4ecc 100644 --- a/android/app/src/main/res/layout/fragment_backup_success.xml +++ b/android/app/src/main/res/layout/fragment_backup_success.xml @@ -59,4 +59,4 @@ android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_backup_wallet_to_cold_wallet.xml b/android/app/src/main/res/layout/fragment_backup_wallet_to_cold_wallet.xml index 96b059b0c7cf..201699d37168 100644 --- a/android/app/src/main/res/layout/fragment_backup_wallet_to_cold_wallet.xml +++ b/android/app/src/main/res/layout/fragment_backup_wallet_to_cold_wallet.xml @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_check_hide_wallet.xml b/android/app/src/main/res/layout/fragment_check_hide_wallet.xml index 7c3225810259..69e825b4912d 100644 --- a/android/app/src/main/res/layout/fragment_check_hide_wallet.xml +++ b/android/app/src/main/res/layout/fragment_check_hide_wallet.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_choose_mnemonic_size.xml b/android/app/src/main/res/layout/fragment_choose_mnemonic_size.xml index 8d59be146cdd..6e5f880587c9 100644 --- a/android/app/src/main/res/layout/fragment_choose_mnemonic_size.xml +++ b/android/app/src/main/res/layout/fragment_choose_mnemonic_size.xml @@ -77,4 +77,4 @@ android:textColor="#00B812" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_cold_device_confirm.xml b/android/app/src/main/res/layout/fragment_cold_device_confirm.xml index 92f797fee761..62b6c16b1174 100644 --- a/android/app/src/main/res/layout/fragment_cold_device_confirm.xml +++ b/android/app/src/main/res/layout/fragment_cold_device_confirm.xml @@ -40,4 +40,4 @@ android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_complete_backup.xml b/android/app/src/main/res/layout/fragment_complete_backup.xml index 7d7766872707..2dee76d2d10a 100644 --- a/android/app/src/main/res/layout/fragment_complete_backup.xml +++ b/android/app/src/main/res/layout/fragment_complete_backup.xml @@ -20,4 +20,4 @@ android:textColor="#142A3B" android:textSize="30sp" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_discover.xml b/android/app/src/main/res/layout/fragment_discover.xml index 6a7e6361fd2e..ecf4e2dcd46c 100644 --- a/android/app/src/main/res/layout/fragment_discover.xml +++ b/android/app/src/main/res/layout/fragment_discover.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_find_backup_from_phone.xml b/android/app/src/main/res/layout/fragment_find_backup_from_phone.xml index 365f2e717927..7ccafa50ae5c 100644 --- a/android/app/src/main/res/layout/fragment_find_backup_from_phone.xml +++ b/android/app/src/main/res/layout/fragment_find_backup_from_phone.xml @@ -25,4 +25,4 @@ android:layout_margin="@dimen/dp_20"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_give_name.xml b/android/app/src/main/res/layout/fragment_give_name.xml index f91b06ff8a5a..a4732c5b1207 100644 --- a/android/app/src/main/res/layout/fragment_give_name.xml +++ b/android/app/src/main/res/layout/fragment_give_name.xml @@ -52,4 +52,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_import_mnemonic_to_device.xml b/android/app/src/main/res/layout/fragment_import_mnemonic_to_device.xml index 1cd6150a26f5..af651cd0d79e 100644 --- a/android/app/src/main/res/layout/fragment_import_mnemonic_to_device.xml +++ b/android/app/src/main/res/layout/fragment_import_mnemonic_to_device.xml @@ -91,4 +91,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_20" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_item_trans.xml b/android/app/src/main/res/layout/fragment_item_trans.xml index 98e6472c8ffa..fc07c7364347 100644 --- a/android/app/src/main/res/layout/fragment_item_trans.xml +++ b/android/app/src/main/res/layout/fragment_item_trans.xml @@ -137,4 +137,4 @@ android:textSize="15sp" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_recovery_wallet_by_cold_wallet.xml b/android/app/src/main/res/layout/fragment_recovery_wallet_by_cold_wallet.xml index 7667ec3f1acf..416b9f4f4479 100644 --- a/android/app/src/main/res/layout/fragment_recovery_wallet_by_cold_wallet.xml +++ b/android/app/src/main/res/layout/fragment_recovery_wallet_by_cold_wallet.xml @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_select_coin.xml b/android/app/src/main/res/layout/fragment_select_coin.xml index edb0c3cb6466..bbab1f5d7d20 100644 --- a/android/app/src/main/res/layout/fragment_select_coin.xml +++ b/android/app/src/main/res/layout/fragment_select_coin.xml @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_trans_detail.xml b/android/app/src/main/res/layout/fragment_trans_detail.xml index 426522f45baa..2c62b474c8dd 100644 --- a/android/app/src/main/res/layout/fragment_trans_detail.xml +++ b/android/app/src/main/res/layout/fragment_trans_detail.xml @@ -262,4 +262,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_update_pin_confirm.xml b/android/app/src/main/res/layout/fragment_update_pin_confirm.xml index 4f01b160617f..7d065adb4941 100644 --- a/android/app/src/main/res/layout/fragment_update_pin_confirm.xml +++ b/android/app/src/main/res/layout/fragment_update_pin_confirm.xml @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_verify_result.xml b/android/app/src/main/res/layout/fragment_verify_result.xml index 0bb5f9ae8e96..b1a1cb3c79e7 100644 --- a/android/app/src/main/res/layout/fragment_verify_result.xml +++ b/android/app/src/main/res/layout/fragment_verify_result.xml @@ -60,4 +60,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_wheel_viewpager.xml b/android/app/src/main/res/layout/fragment_wheel_viewpager.xml index 7f4824ddc962..562e1634a75a 100644 --- a/android/app/src/main/res/layout/fragment_wheel_viewpager.xml +++ b/android/app/src/main/res/layout/fragment_wheel_viewpager.xml @@ -255,4 +255,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_add_wallet.xml b/android/app/src/main/res/layout/item_add_wallet.xml index b8dff7c1e868..92148bc51f3f 100644 --- a/android/app/src/main/res/layout/item_add_wallet.xml +++ b/android/app/src/main/res/layout/item_add_wallet.xml @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_asset.xml b/android/app/src/main/res/layout/item_asset.xml index 0f34ba7143c2..5d4555caae76 100644 --- a/android/app/src/main/res/layout/item_asset.xml +++ b/android/app/src/main/res/layout/item_asset.xml @@ -36,4 +36,4 @@ android:layout_alignParentBottom="true" android:background="@color/line_color" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_coin.xml b/android/app/src/main/res/layout/item_coin.xml index 0f34ba7143c2..5d4555caae76 100644 --- a/android/app/src/main/res/layout/item_coin.xml +++ b/android/app/src/main/res/layout/item_coin.xml @@ -36,4 +36,4 @@ android:layout_alignParentBottom="true" android:background="@color/line_color" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_loading_text.xml b/android/app/src/main/res/layout/item_loading_text.xml index 48dfe87e8513..6f7f59f8efc3 100644 --- a/android/app/src/main/res/layout/item_loading_text.xml +++ b/android/app/src/main/res/layout/item_loading_text.xml @@ -23,4 +23,4 @@ android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_mnemonic.xml b/android/app/src/main/res/layout/item_mnemonic.xml index 745f026fe84d..5b0adbca7ae6 100644 --- a/android/app/src/main/res/layout/item_mnemonic.xml +++ b/android/app/src/main/res/layout/item_mnemonic.xml @@ -20,4 +20,4 @@ android:layout_marginTop="@dimen/dp_5" android:background="@drawable/white_bg"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_no_wallet.xml b/android/app/src/main/res/layout/item_no_wallet.xml index d6dda0a9d9a8..9f4a62b2a82f 100644 --- a/android/app/src/main/res/layout/item_no_wallet.xml +++ b/android/app/src/main/res/layout/item_no_wallet.xml @@ -92,4 +92,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/language_setting.xml b/android/app/src/main/res/layout/language_setting.xml index a3647bfd77eb..4520592d95a3 100644 --- a/android/app/src/main/res/layout/language_setting.xml +++ b/android/app/src/main/res/layout/language_setting.xml @@ -204,4 +204,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/layout_search_device_ble.xml b/android/app/src/main/res/layout/layout_search_device_ble.xml index 40dc4449a6b1..fa5ddf4e1c2d 100755 --- a/android/app/src/main/res/layout/layout_search_device_ble.xml +++ b/android/app/src/main/res/layout/layout_search_device_ble.xml @@ -47,7 +47,7 @@ android:layout_marginLeft="@dimen/dp_20" android:layout_marginRight="@dimen/dp_20"/> - + - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/name_setting.xml b/android/app/src/main/res/layout/name_setting.xml index fa036cee27c9..9973a6c96044 100644 --- a/android/app/src/main/res/layout/name_setting.xml +++ b/android/app/src/main/res/layout/name_setting.xml @@ -99,4 +99,4 @@ android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/need_location_tip.xml b/android/app/src/main/res/layout/need_location_tip.xml index e62ea6b1ef4c..2351c646be26 100644 --- a/android/app/src/main/res/layout/need_location_tip.xml +++ b/android/app/src/main/res/layout/need_location_tip.xml @@ -79,4 +79,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/line1" app:layout_constraintTop_toBottomOf="@id/line" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/pin_input.xml b/android/app/src/main/res/layout/pin_input.xml index 9bbb36e47e71..5a8258b593f4 100644 --- a/android/app/src/main/res/layout/pin_input.xml +++ b/android/app/src/main/res/layout/pin_input.xml @@ -153,4 +153,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/pin_input_card.xml b/android/app/src/main/res/layout/pin_input_card.xml index d3e8bcc98b2d..cc0c205048d5 100644 --- a/android/app/src/main/res/layout/pin_input_card.xml +++ b/android/app/src/main/res/layout/pin_input_card.xml @@ -152,4 +152,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/pin_input_new.xml b/android/app/src/main/res/layout/pin_input_new.xml index 8a6fe09882ae..04faafa5b144 100644 --- a/android/app/src/main/res/layout/pin_input_new.xml +++ b/android/app/src/main/res/layout/pin_input_new.xml @@ -152,4 +152,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/pin_setting_after_init.xml b/android/app/src/main/res/layout/pin_setting_after_init.xml index 54e530da2fbf..60fefd2c4b5e 100644 --- a/android/app/src/main/res/layout/pin_setting_after_init.xml +++ b/android/app/src/main/res/layout/pin_setting_after_init.xml @@ -65,4 +65,4 @@ android:textColor="@android:color/white" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/pin_verify_way_selector_activity.xml b/android/app/src/main/res/layout/pin_verify_way_selector_activity.xml index e2413a06212b..008817b0f4a2 100644 --- a/android/app/src/main/res/layout/pin_verify_way_selector_activity.xml +++ b/android/app/src/main/res/layout/pin_verify_way_selector_activity.xml @@ -116,4 +116,4 @@ android:checked="true"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/reading_xpub_fragment.xml b/android/app/src/main/res/layout/reading_xpub_fragment.xml index 78b27f6b6af7..3efb1817b6eb 100644 --- a/android/app/src/main/res/layout/reading_xpub_fragment.xml +++ b/android/app/src/main/res/layout/reading_xpub_fragment.xml @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/recovery_result.xml b/android/app/src/main/res/layout/recovery_result.xml index fc4da751a59f..1000520f9920 100644 --- a/android/app/src/main/res/layout/recovery_result.xml +++ b/android/app/src/main/res/layout/recovery_result.xml @@ -59,4 +59,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/reset_devcie_failed.xml b/android/app/src/main/res/layout/reset_devcie_failed.xml index 16c1720b1dcb..e8208ee15162 100644 --- a/android/app/src/main/res/layout/reset_devcie_failed.xml +++ b/android/app/src/main/res/layout/reset_devcie_failed.xml @@ -60,4 +60,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/reset_devcie_successful.xml b/android/app/src/main/res/layout/reset_devcie_successful.xml index e4a54154aebf..d1af4f68cdec 100644 --- a/android/app/src/main/res/layout/reset_devcie_successful.xml +++ b/android/app/src/main/res/layout/reset_devcie_successful.xml @@ -60,4 +60,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/send_one2many_main.xml b/android/app/src/main/res/layout/send_one2many_main.xml index 24ccb5b4b45f..14d605e8dd1a 100644 --- a/android/app/src/main/res/layout/send_one2many_main.xml +++ b/android/app/src/main/res/layout/send_one2many_main.xml @@ -381,4 +381,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/send_one2one_main_page.xml b/android/app/src/main/res/layout/send_one2one_main_page.xml index c8eb8e8dee5a..41bd5ef68bf7 100644 --- a/android/app/src/main/res/layout/send_one2one_main_page.xml +++ b/android/app/src/main/res/layout/send_one2one_main_page.xml @@ -588,4 +588,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/send_to_many.xml b/android/app/src/main/res/layout/send_to_many.xml index 6c3cd0697d6a..0436c8b0f3c2 100644 --- a/android/app/src/main/res/layout/send_to_many.xml +++ b/android/app/src/main/res/layout/send_to_many.xml @@ -244,4 +244,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/set_pin.xml b/android/app/src/main/res/layout/set_pin.xml index 00e219479f0b..7952ebd1a861 100644 --- a/android/app/src/main/res/layout/set_pin.xml +++ b/android/app/src/main/res/layout/set_pin.xml @@ -41,4 +41,4 @@ android:textSize="@dimen/sp_20" android:layout_gravity="center_horizontal"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/set_wallet_name_fragment.xml b/android/app/src/main/res/layout/set_wallet_name_fragment.xml index a93f5cff4aa9..1e131a86447c 100644 --- a/android/app/src/main/res/layout/set_wallet_name_fragment.xml +++ b/android/app/src/main/res/layout/set_wallet_name_fragment.xml @@ -55,4 +55,4 @@ android:textColor="@android:color/white" android:textSize="@dimen/sp_14" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/setting.xml b/android/app/src/main/res/layout/setting.xml index eb74173afe29..f0a2ab09e987 100644 --- a/android/app/src/main/res/layout/setting.xml +++ b/android/app/src/main/res/layout/setting.xml @@ -399,4 +399,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/sinatroy_item.xml b/android/app/src/main/res/layout/sinatroy_item.xml index 67cf489e325a..0fdda9d35a1b 100644 --- a/android/app/src/main/res/layout/sinatroy_item.xml +++ b/android/app/src/main/res/layout/sinatroy_item.xml @@ -29,4 +29,4 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_40"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/soft_pass_activity.xml b/android/app/src/main/res/layout/soft_pass_activity.xml index 268f3fa48057..3b0385d60861 100644 --- a/android/app/src/main/res/layout/soft_pass_activity.xml +++ b/android/app/src/main/res/layout/soft_pass_activity.xml @@ -230,4 +230,4 @@ app:layout_constraintTop_toBottomOf="@+id/pass_type_switch" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/title_layout.xml b/android/app/src/main/res/layout/title_layout.xml index d226cb656cbf..37c6490e5541 100644 --- a/android/app/src/main/res/layout/title_layout.xml +++ b/android/app/src/main/res/layout/title_layout.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/touch.xml b/android/app/src/main/res/layout/touch.xml index 277f2cc46e1a..02d09df477b1 100644 --- a/android/app/src/main/res/layout/touch.xml +++ b/android/app/src/main/res/layout/touch.xml @@ -34,4 +34,4 @@ android:background="@drawable/touch_with_hardware" android:contentDescription="@string/picture" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/trans_details.xml b/android/app/src/main/res/layout/trans_details.xml index b18e00a86f39..66f1839e2fac 100644 --- a/android/app/src/main/res/layout/trans_details.xml +++ b/android/app/src/main/res/layout/trans_details.xml @@ -528,4 +528,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/transaction_records.xml b/android/app/src/main/res/layout/transaction_records.xml index a3657efa6f0b..4c62d865ed2a 100644 --- a/android/app/src/main/res/layout/transaction_records.xml +++ b/android/app/src/main/res/layout/transaction_records.xml @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/vervify_hardware_fragment.xml b/android/app/src/main/res/layout/vervify_hardware_fragment.xml index 47133a457461..a356d06718e0 100644 --- a/android/app/src/main/res/layout/vervify_hardware_fragment.xml +++ b/android/app/src/main/res/layout/vervify_hardware_fragment.xml @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/vout_item.xml b/android/app/src/main/res/layout/vout_item.xml index 8d26147f70c7..f657713916ec 100644 --- a/android/app/src/main/res/layout/vout_item.xml +++ b/android/app/src/main/res/layout/vout_item.xml @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/write_mnemonic_on_paper_fragment.xml b/android/app/src/main/res/layout/write_mnemonic_on_paper_fragment.xml index 7ee49fb8ed1f..dc843249d5b0 100644 --- a/android/app/src/main/res/layout/write_mnemonic_on_paper_fragment.xml +++ b/android/app/src/main/res/layout/write_mnemonic_on_paper_fragment.xml @@ -71,4 +71,4 @@ android:textSize="@dimen/sp_20" android:layout_gravity="center_horizontal"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/menu/tb.xml b/android/app/src/main/res/menu/tb.xml index 7b0340a2e51a..8f426dc9e0a4 100644 --- a/android/app/src/main/res/menu/tb.xml +++ b/android/app/src/main/res/menu/tb.xml @@ -9,4 +9,4 @@ android:title="@string/confirm" app:showAsAction="always"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/icon_app.xml b/android/app/src/main/res/mipmap-anydpi-v26/icon_app.xml index 657b7dc31a66..dfca990e2da9 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/icon_app.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/icon_app.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/icon_app_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/icon_app_round.xml index 657b7dc31a66..dfca990e2da9 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/icon_app_round.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/icon_app_round.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/values-zh/string-array.xml b/android/app/src/main/res/values-zh/string-array.xml index bd0abd184f56..4922965a3f35 100644 --- a/android/app/src/main/res/values-zh/string-array.xml +++ b/android/app/src/main/res/values-zh/string-array.xml @@ -13,4 +13,4 @@ 已完成 - \ No newline at end of file + diff --git a/android/app/src/main/res/values/block_lines.xml b/android/app/src/main/res/values/block_lines.xml index 58be6a88ed90..e9701fbafa5a 100644 --- a/android/app/src/main/res/values/block_lines.xml +++ b/android/app/src/main/res/values/block_lines.xml @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/values/icon_app_background.xml b/android/app/src/main/res/values/icon_app_background.xml index 35bb4067c1a7..039dacd27dfd 100644 --- a/android/app/src/main/res/values/icon_app_background.xml +++ b/android/app/src/main/res/values/icon_app_background.xml @@ -1,4 +1,4 @@ #6182F5 - \ No newline at end of file + diff --git a/android/app/src/main/res/values/string-array.xml b/android/app/src/main/res/values/string-array.xml index 34b53e84227b..9eb25391b0df 100644 --- a/android/app/src/main/res/values/string-array.xml +++ b/android/app/src/main/res/values/string-array.xml @@ -36,4 +36,4 @@ AUD - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/backup_rules.xml b/android/app/src/main/res/xml/backup_rules.xml index 4fe94404693c..9b2fbc0123b6 100644 --- a/android/app/src/main/res/xml/backup_rules.xml +++ b/android/app/src/main/res/xml/backup_rules.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml index f929ddc5d473..4abc624d79e4 100644 --- a/android/app/src/main/res/xml/network_security_config.xml +++ b/android/app/src/main/res/xml/network_security_config.xml @@ -3,4 +3,4 @@ android.bugly.qq.com - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/nfc_tech_filter.xml b/android/app/src/main/res/xml/nfc_tech_filter.xml index a9d6b2113f49..fda35b967e11 100644 --- a/android/app/src/main/res/xml/nfc_tech_filter.xml +++ b/android/app/src/main/res/xml/nfc_tech_filter.xml @@ -11,4 +11,4 @@ android.nfc.tech.MifareClassic android.nfc.tech.MifareUltralight - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/number.xml b/android/app/src/main/res/xml/number.xml index bf2d8e51c541..b90a03f406d6 100644 --- a/android/app/src/main/res/xml/number.xml +++ b/android/app/src/main/res/xml/number.xml @@ -64,4 +64,4 @@ android:keyEdgeFlags="right"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/plain_numbers.xml b/android/app/src/main/res/xml/plain_numbers.xml index cb68ff7793b6..fbef746be321 100644 --- a/android/app/src/main/res/xml/plain_numbers.xml +++ b/android/app/src/main/res/xml/plain_numbers.xml @@ -62,4 +62,4 @@ android:keyEdgeFlags="right"/> - \ No newline at end of file + diff --git a/android/app/src/main/res/xml/usb_device_filter.xml b/android/app/src/main/res/xml/usb_device_filter.xml index fc81ae9624b9..9cebc542bf29 100644 --- a/android/app/src/main/res/xml/usb_device_filter.xml +++ b/android/app/src/main/res/xml/usb_device_filter.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/android/blelibrary/build.gradle b/android/blelibrary/build.gradle index 9cd5db644362..abb65263f812 100644 --- a/android/blelibrary/build.gradle +++ b/android/blelibrary/build.gradle @@ -147,4 +147,4 @@ bintray { // version true // links "http://docs.oracle.com/javase/7/docs/api" // } -//} \ No newline at end of file +//} diff --git a/android/blelibrary/local.properties b/android/blelibrary/local.properties index aaee232e851b..4b91dc56a18c 100644 --- a/android/blelibrary/local.properties +++ b/android/blelibrary/local.properties @@ -5,4 +5,4 @@ # For customization when using a Version Control System, please read the # header note. #Tue Jul 23 18:00:36 CST 2019 -sdk.dir=/Users/yanli/Library/Android/sdk \ No newline at end of file +sdk.dir=/Users/yanli/Library/Android/sdk diff --git a/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/model/ScanRecord.java b/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/model/ScanRecord.java index 98aed3e5714f..e7375a301634 100644 --- a/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/model/ScanRecord.java +++ b/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/model/ScanRecord.java @@ -395,4 +395,3 @@ public static ParcelUuid parseUuidFrom(byte[] uuidBytes) { } - diff --git a/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/utils/ByteUtils.java b/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/utils/ByteUtils.java index 01f837777013..d2e70e992533 100644 --- a/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/utils/ByteUtils.java +++ b/android/blelibrary/src/main/java/cn/com/heaton/blelibrary/ble/utils/ByteUtils.java @@ -497,5 +497,3 @@ private static boolean isLittleEndian() { } } - - diff --git a/android/blelibrary/src/main/res/values/attrs.xml b/android/blelibrary/src/main/res/values/attrs.xml index d27be0fa77b9..40ad2b1bb00e 100644 --- a/android/blelibrary/src/main/res/values/attrs.xml +++ b/android/blelibrary/src/main/res/values/attrs.xml @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/android/blelibrary/src/main/res/values/styles.xml b/android/blelibrary/src/main/res/values/styles.xml index 2bdc5c6e6877..b643bcd25ded 100644 --- a/android/blelibrary/src/main/res/values/styles.xml +++ b/android/blelibrary/src/main/res/values/styles.xml @@ -48,4 +48,4 @@ 1dip 3dip - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/AndroidManifest.xml b/android/dRlibfileselector/src/main/AndroidManifest.xml index 92231ee56c9c..afadb48dd69e 100644 --- a/android/dRlibfileselector/src/main/AndroidManifest.xml +++ b/android/dRlibfileselector/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ android:versionCode="1" android:versionName="1.0" > - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectActivity.java b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectActivity.java index 10d8bc897d50..61cb7dfdfcbe 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectActivity.java +++ b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectActivity.java @@ -488,4 +488,4 @@ public void onClick(View v) { finish(); } } -} \ No newline at end of file +} diff --git a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectAdapter.java b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectAdapter.java index c1dddbd1e9f3..2b7df8980092 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectAdapter.java +++ b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectAdapter.java @@ -18,9 +18,9 @@ import android.widget.TextView; /** - * + * * FileSelectActivity中ListView的适配器 - * + * * @author DarkRanger * @datetime 20160530 * @@ -146,7 +146,7 @@ public void onClick(View v) { /** * 设置icon图标的宽度和高度 - * + * * @param holder */ private void setWidthAndHeight(ViewHoder holder) { diff --git a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectConstant.java b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectConstant.java index db1d69cd45e3..f8f64bfcf65a 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectConstant.java +++ b/android/dRlibfileselector/src/main/java/dr/android/fileselector/FileSelectConstant.java @@ -2,7 +2,7 @@ /** * 文件/文件夹路径中经常用到的常量 - * + * * @author DarkRanger * @datetime 20160530 * diff --git a/android/dRlibfileselector/src/main/java/dr/android/fileselector/InterceptLinearLayout.java b/android/dRlibfileselector/src/main/java/dr/android/fileselector/InterceptLinearLayout.java index 8629dc7e12ba..e4d000593aa4 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/fileselector/InterceptLinearLayout.java +++ b/android/dRlibfileselector/src/main/java/dr/android/fileselector/InterceptLinearLayout.java @@ -7,8 +7,8 @@ /** * 不让viewgroup向下传递触摸事件的LinearLayout - * - * + * + * * @author DarkRanger * @datetime 20160530 * diff --git a/android/dRlibfileselector/src/main/java/dr/android/fileselector/Storage.java b/android/dRlibfileselector/src/main/java/dr/android/fileselector/Storage.java index 2b8f1135c8ec..aadf0d536c58 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/fileselector/Storage.java +++ b/android/dRlibfileselector/src/main/java/dr/android/fileselector/Storage.java @@ -7,7 +7,7 @@ import dr.android.utils.SdCardUtil; /** - * + * * @author DarkRanger * @datetime 20160530 * @@ -21,7 +21,7 @@ public class Storage implements Serializable { /** * 构造函数 - * + * * @param absPath * 存储设置全路径 */ diff --git a/android/dRlibfileselector/src/main/java/dr/android/utils/FileUtil.java b/android/dRlibfileselector/src/main/java/dr/android/utils/FileUtil.java index ae0dd74139fe..d78942b85411 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/utils/FileUtil.java +++ b/android/dRlibfileselector/src/main/java/dr/android/utils/FileUtil.java @@ -22,7 +22,7 @@ /** * 文件相关工具类 - * + * * @author DarkRanger * @datetime 20160530 * @@ -31,7 +31,7 @@ public class FileUtil { /** * 根据文件得到文件的名称 比如abc.txt,返回abc。如果文件名是abc,则返回abc - * + * * @param file * @return */ @@ -47,7 +47,7 @@ public static String getFilePrefixName(File file) { /** * 根据文件得到文件的后缀 比如abc.txt,返回.txt。如果文件名是abc,则返回""; - * + * * @param file * @return */ @@ -63,7 +63,7 @@ public static String getFileSuffix(File file) { /** * 根据给出的父节点folder找到所有的file,如果不是folder,则返回size为0的集合。 - * + * * @param parentFile * @return */ @@ -83,7 +83,7 @@ public static List getChildFiles(File parentFile) { /** * 根据当前文件路径找到上级路径 - * + * * @param filepath * @return */ @@ -99,13 +99,13 @@ public static String getParentFilePath(String filePath) { /** * 根据文件名称对文件list集合进行排序(先文件夹,再文件,按文件名称排序,忽略大小写) - * + * * 排序结果类似于这样: - * + * * [F:\FileTest\b, F:\FileTest\d, F:\FileTest\A1.txt, F:\FileTest\a2.txt, * F:\FileTest\A3.txt, F:\FileTest\B1.txt, F:\FileTest\b2.txt, * F:\FileTest\B3.txt] - * + * * @param fileList * @return */ @@ -129,7 +129,7 @@ public int compare(File o1, File o2) { /** * 文件复制(通过文件通道FileChannel更加高效),目标文件不存在将会创建 - * + * * @param fromPath * from文件路径 * @param toPath @@ -143,7 +143,7 @@ public static void fileCopyByChannel(String fromPath, String toPath) { /** * 文件复制(通过文件通道FileChannel更加高效),目标文件不存在将会创建 - * + * * @param fromFile * @param toFile */ @@ -211,7 +211,7 @@ public static void fileCopyByInputStream(InputStream input, String toPath) { /** * 删除路径下所有的文件和文件夹 - * + * * @param userDataDir */ public static void deleteByParentPath(File userDataFolder) { @@ -232,7 +232,7 @@ public static void deleteByParentPath(File userDataFolder) { /** * 以字节为单位读写文件内容 - * + * * @param filePath * :需要读取的文件路径 */ @@ -266,7 +266,7 @@ public static void copyFileByByte(String filePath, File toFile) { /** * 以字符为单位读写文件内容 - * + * * @param filePath */ public static void copyFileByCharacter(String filePath, File toFile) { @@ -297,7 +297,7 @@ public static void copyFileByCharacter(String filePath, File toFile) { /** * 以行为单位读写文件内容 - * + * * @param filePath */ public static void copyFileByLine(String filePath, File toFile) { @@ -331,7 +331,7 @@ public static void copyFileByLine(String filePath, File toFile) { /** * 使用Java.nio ByteBuffer字节将一个文件输出至另一文件 - * + * * @param filePath */ public static void copyFileByBybeBuffer(String filePath, File toFile) { @@ -374,7 +374,7 @@ public static void copyFileByBybeBuffer(String filePath, File toFile) { /** * B-->KB-->M-->G之间的转换 - * + * * @param size * 传进来的字节数(B) * @return 返回类似于“12.56 KB”的string格式 @@ -398,7 +398,7 @@ public static String convertFileSize(long size) { /** * 根据文件路径创建文件,如果存在,不做任何操作。 如果文件不存在,则创建(如果父级folder不存在,则创建) - * + * * @param filePath */ public static void createFileAndFolder(String filePath) { @@ -408,7 +408,7 @@ public static void createFileAndFolder(String filePath) { /** * 根据文件路径创建文件,如果存在,不做任何操作。 如果文件不存在,则创建(如果父级folder不存在,则创建) - * + * * @param filePath */ public static void createFileAndFolder(File targetFile) { diff --git a/android/dRlibfileselector/src/main/java/dr/android/utils/LogUtil.java b/android/dRlibfileselector/src/main/java/dr/android/utils/LogUtil.java index 4516b4e13c79..dc4dee8aaf47 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/utils/LogUtil.java +++ b/android/dRlibfileselector/src/main/java/dr/android/utils/LogUtil.java @@ -6,7 +6,7 @@ /** * LogUtils工具说明: 1 只输出等级大于等于LEVEL的日志 所以在开发和产品发布后通过修改LEVEL来选择性输出日志. * 当LEVEL=NOTHING则屏蔽了所有的日志. 2 v,d,i,w,e均对应两个方法. 若不设置TAG或者TAG为空则为设置默认TAG - * + * * @author DarkRanger * @datetime 20160530 */ diff --git a/android/dRlibfileselector/src/main/java/dr/android/utils/SdCardUtil.java b/android/dRlibfileselector/src/main/java/dr/android/utils/SdCardUtil.java index 29ebeeeaa51c..9dc0bb504cb4 100644 --- a/android/dRlibfileselector/src/main/java/dr/android/utils/SdCardUtil.java +++ b/android/dRlibfileselector/src/main/java/dr/android/utils/SdCardUtil.java @@ -13,9 +13,9 @@ import dr.android.fileselector.Storage; /** - * + * * SdCard相关工具类 - * + * * @author DarkRanger * @datetime 20160530 * @@ -88,7 +88,7 @@ public static List getAllSdcardPath() { /** * 根据所有存储路径获取Storage实体类集合(不存在的路径不会添加到Storage里面) - * + * * @param storagePaths * @return */ @@ -109,7 +109,7 @@ public static List getStorages() { /** * 将/storage/sdcard替换成“sd卡存储” - * + * * @param parentFolderPath * @return */ @@ -128,7 +128,7 @@ public static String replaceAbsPathWithLocalName(String parentFolderPath) { /** * 将“sd卡存储”替换成/storage/sdcard - * + * * @param parentFolderPath * @return */ diff --git a/android/dRlibfileselector/src/main/res/drawable/checkbox_selector.xml b/android/dRlibfileselector/src/main/res/drawable/checkbox_selector.xml index b4de9f9c06eb..a64e735db131 100644 --- a/android/dRlibfileselector/src/main/res/drawable/checkbox_selector.xml +++ b/android/dRlibfileselector/src/main/res/drawable/checkbox_selector.xml @@ -1,6 +1,6 @@ - - - - - \ No newline at end of file + + + + + diff --git a/android/dRlibfileselector/src/main/res/layout/activity_file_select.xml b/android/dRlibfileselector/src/main/res/layout/activity_file_select.xml index dae5ffa53941..b6f10e46f53a 100644 --- a/android/dRlibfileselector/src/main/res/layout/activity_file_select.xml +++ b/android/dRlibfileselector/src/main/res/layout/activity_file_select.xml @@ -81,4 +81,4 @@ android:paddingRight="@dimen/padding_layout_small" /> - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/res/layout/adapter_fileselect_item.xml b/android/dRlibfileselector/src/main/res/layout/adapter_fileselect_item.xml index f3bb3f67cc41..cbcd99e63e6b 100644 --- a/android/dRlibfileselector/src/main/res/layout/adapter_fileselect_item.xml +++ b/android/dRlibfileselector/src/main/res/layout/adapter_fileselect_item.xml @@ -81,4 +81,4 @@ android:focusable="false" /> - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/res/menu/file_select.xml b/android/dRlibfileselector/src/main/res/menu/file_select.xml index e19d1c296bcb..828f54c31f73 100644 --- a/android/dRlibfileselector/src/main/res/menu/file_select.xml +++ b/android/dRlibfileselector/src/main/res/menu/file_select.xml @@ -9,4 +9,4 @@ app:showAsAction="always" android:title="@string/action_fileselector_ok"/> - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/res/values-en-rUS/strings.xml b/android/dRlibfileselector/src/main/res/values-en-rUS/strings.xml index e695dba2f3a9..df668dc1318f 100644 --- a/android/dRlibfileselector/src/main/res/values-en-rUS/strings.xml +++ b/android/dRlibfileselector/src/main/res/values-en-rUS/strings.xml @@ -16,4 +16,4 @@ Confirm Preservation - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/res/values/dimens.xml b/android/dRlibfileselector/src/main/res/values/dimens.xml index d81311bfea1e..a872127f3544 100644 --- a/android/dRlibfileselector/src/main/res/values/dimens.xml +++ b/android/dRlibfileselector/src/main/res/values/dimens.xml @@ -71,4 +71,4 @@ 16dp 16dp - \ No newline at end of file + diff --git a/android/dRlibfileselector/src/main/res/values/strings.xml b/android/dRlibfileselector/src/main/res/values/strings.xml index 87f8b7b68e93..279ad8110eae 100644 --- a/android/dRlibfileselector/src/main/res/values/strings.xml +++ b/android/dRlibfileselector/src/main/res/values/strings.xml @@ -16,4 +16,4 @@ 确认 保存 - \ No newline at end of file + diff --git a/android/dfu/build.gradle b/android/dfu/build.gradle index f9a6ae8ba652..d35fbf8d5fef 100644 --- a/android/dfu/build.gradle +++ b/android/dfu/build.gradle @@ -25,4 +25,4 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.6' } -//apply from: rootProject.file('gradle/gradle-bintray-push.gradle') \ No newline at end of file +//apply from: rootProject.file('gradle/gradle-bintray-push.gradle') diff --git a/android/dfu/dfu-proguard-rules.pro b/android/dfu/dfu-proguard-rules.pro index e18c5fab23ee..51ed741e1777 100644 --- a/android/dfu/dfu-proguard-rules.pro +++ b/android/dfu/dfu-proguard-rules.pro @@ -15,4 +15,4 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} --keep class no.nordicsemi.android.dfu.** { *; } \ No newline at end of file +-keep class no.nordicsemi.android.dfu.** { *; } diff --git a/android/dfu/gradle.properties b/android/dfu/gradle.properties index 08b92afa4e96..b750d0a7ecdd 100644 --- a/android/dfu/gradle.properties +++ b/android/dfu/gradle.properties @@ -1,3 +1,3 @@ POM_ARTIFACT_ID=dfu POM_NAME=DFU Library -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar diff --git a/android/dfu/src/androidTest/java/no/nordicsemi/android/dfu/ApplicationTest.java b/android/dfu/src/androidTest/java/no/nordicsemi/android/dfu/ApplicationTest.java index b0128cfe1737..dbffe5ec4f79 100644 --- a/android/dfu/src/androidTest/java/no/nordicsemi/android/dfu/ApplicationTest.java +++ b/android/dfu/src/androidTest/java/no/nordicsemi/android/dfu/ApplicationTest.java @@ -10,4 +10,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/android/dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceInitiator.java b/android/dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceInitiator.java index e2694f7529b3..8fdacf16f54b 100644 --- a/android/dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceInitiator.java +++ b/android/dfu/src/main/java/no/nordicsemi/android/dfu/DfuServiceInitiator.java @@ -865,4 +865,4 @@ public static void createDfuNotificationChannel(@NonNull final Context context) notificationManager.createNotificationChannel(channel); } } -} \ No newline at end of file +} diff --git a/android/dfu/src/main/java/no/nordicsemi/android/dfu/FileType.java b/android/dfu/src/main/java/no/nordicsemi/android/dfu/FileType.java index 4949a98176a5..5c2df83b30a0 100644 --- a/android/dfu/src/main/java/no/nordicsemi/android/dfu/FileType.java +++ b/android/dfu/src/main/java/no/nordicsemi/android/dfu/FileType.java @@ -10,4 +10,3 @@ }, flag = true) public @interface FileType {} - diff --git a/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/HexInputStream.java b/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/HexInputStream.java index 00b0efc3b0c6..76311a0d02bc 100644 --- a/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/HexInputStream.java +++ b/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/HexInputStream.java @@ -106,7 +106,7 @@ private int calculateBinSize(final int mbrSize) throws IOException { in.mark(in.available()); int b, lineSize, offset, type; - int lastBaseAddress = 0; // last Base Address, default 0 + int lastBaseAddress = 0; // last Base Address, default 0 int lastAddress; try { b = in.read(); diff --git a/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/scanner/BootloaderScannerLollipop.java b/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/scanner/BootloaderScannerLollipop.java index 262e59f7f016..07f6343d691f 100644 --- a/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/scanner/BootloaderScannerLollipop.java +++ b/android/dfu/src/main/java/no/nordicsemi/android/dfu/internal/scanner/BootloaderScannerLollipop.java @@ -120,4 +120,4 @@ public void onScanResult(final int callbackType, final ScanResult result) { } } } -} \ No newline at end of file +} diff --git a/android/dfu/src/main/res/values/strings.xml b/android/dfu/src/main/res/values/strings.xml index 8e94b5ef27f5..77d8faeaf793 100644 --- a/android/dfu/src/main/res/values/strings.xml +++ b/android/dfu/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ unnamed device - + Abort Device Firmware Update @@ -18,7 +18,7 @@ Aborted Aborting… Upload failed - + Connecting to %s… Initializing DFU process… Waiting for bootloader… @@ -31,5 +31,5 @@ DFU Shows DFU progress. - + diff --git a/android/zxinglibrary/src/main/AndroidManifest.xml b/android/zxinglibrary/src/main/AndroidManifest.xml index a7834a6bf9df..102df89fd969 100644 --- a/android/zxinglibrary/src/main/AndroidManifest.xml +++ b/android/zxinglibrary/src/main/AndroidManifest.xml @@ -23,4 +23,4 @@ android:theme="@style/Theme.AppCompat.NoActionBar" android:windowSoftInputMode="adjustPan|stateHidden" /> - \ No newline at end of file + diff --git a/android/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivityHandler.java b/android/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivityHandler.java index 663e5812280b..c880d58f5f50 100644 --- a/android/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivityHandler.java +++ b/android/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivityHandler.java @@ -165,4 +165,4 @@ public void restartPreviewAndDecode() { } } -} \ No newline at end of file +} diff --git a/android/zxinglibrary/src/main/res/layout/activity_capture.xml b/android/zxinglibrary/src/main/res/layout/activity_capture.xml index af24dcc3f871..82b534edbee9 100644 --- a/android/zxinglibrary/src/main/res/layout/activity_capture.xml +++ b/android/zxinglibrary/src/main/res/layout/activity_capture.xml @@ -210,4 +210,4 @@ - \ No newline at end of file + diff --git a/contrib/android/blacklist.txt b/contrib/android/blacklist.txt index bb689ff3267a..34d8c3757ff6 100644 --- a/contrib/android/blacklist.txt +++ b/contrib/android/blacklist.txt @@ -104,4 +104,3 @@ plat-linux3/regen #sqlite3/* #lib-dynload/_sqlite3.so # Tuple[int, int]: if not ret: return None, None #raise InvalidECPointException('public key could not be parsed or is invalid') - + pubkey_serialized = create_string_buffer(65) pubkey_size = c_size_t(65) _libsecp256k1.secp256k1_ec_pubkey_serialize( diff --git a/electrum/ecc_fast.py b/electrum/ecc_fast.py index 753b31deb723..66db440af14a 100644 --- a/electrum/ecc_fast.py +++ b/electrum/ecc_fast.py @@ -268,4 +268,3 @@ def is_using_fast_ecc(): _prepare_monkey_patching_of_python_ecdsa_internals_with_libsecp256k1() - diff --git a/electrum/gui/kivy/main.kv b/electrum/gui/kivy/main.kv index d61b4fcf49e5..46fa13bc458d 100644 --- a/electrum/gui/kivy/main.kv +++ b/electrum/gui/kivy/main.kv @@ -68,7 +68,7 @@ size_hint_x: None size: root.icon_size, root.icon_size - + background_color: 0, 0, 0, 1 canvas.before: @@ -108,7 +108,7 @@ id: lbl1 text: '[ref=%s]%s[/ref]'%(root.address, root.address) color: root.color - background_color: root.background_color + background_color: root.background_color font_size: '6pt' shorten: True size_hint_x: 0.65 diff --git a/electrum/gui/kivy/util.py b/electrum/gui/kivy/util.py index 3eaf1c3860ee..84823acf679c 100644 --- a/electrum/gui/kivy/util.py +++ b/electrum/gui/kivy/util.py @@ -3,12 +3,12 @@ def address_colors(wallet, addr): """ - Chooses the appropriate text color and background color to + Chooses the appropriate text color and background color to mark receiving, change and billing addresses. Returns: color, background_color """ - + # modified colors (textcolor, background_color) from electrum/gui/qt/util.py GREEN = ("#000000", "#8af296") YELLOW = ("#000000", "#ffff00") diff --git a/electrum/gui/qt/settings_dialog.py b/electrum/gui/qt/settings_dialog.py index 5c8ab414d124..b7f2dff35bcf 100644 --- a/electrum/gui/qt/settings_dialog.py +++ b/electrum/gui/qt/settings_dialog.py @@ -55,7 +55,7 @@ def __init__(self, parent: 'ElectrumWindow', config: 'SimpleConfig'): self.need_restart = False self.fx = self.window.fx self.wallet = self.window.wallet - + vbox = QVBoxLayout() tabs = QTabWidget() gui_widgets = [] @@ -465,7 +465,7 @@ def on_fiat_address(checked): vbox.addStretch(1) vbox.addLayout(Buttons(CloseButton(self))) self.setLayout(vbox) - + def set_alias_color(self): if not self.config.get('alias'): self.alias_e.setStyleSheet("") diff --git a/electrum/invoices.py b/electrum/invoices.py index c7879fc7e51b..f283741ec72f 100644 --- a/electrum/invoices.py +++ b/electrum/invoices.py @@ -203,4 +203,3 @@ def to_debug_json(self) -> Dict[str, Any]: # 'tags': str(lnaddr.tags), }) return d - diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py index 7226d096a971..e346b69f8e28 100644 --- a/electrum/lnchannel.py +++ b/electrum/lnchannel.py @@ -1462,4 +1462,3 @@ def is_funding_tx_mined(self, funding_height): self.logger.info('funding outpoint mismatch') return False return True - diff --git a/electrum/lnutil.py b/electrum/lnutil.py index 67af0cf6bb71..820512f27ba3 100644 --- a/electrum/lnutil.py +++ b/electrum/lnutil.py @@ -1252,4 +1252,3 @@ class OnionFailureCodeMetaFlag(IntFlag): PERM = 0x4000 NODE = 0x2000 UPDATE = 0x1000 - diff --git a/electrum/locale/zh_CN/LC_MESSAGES/electrum.po b/electrum/locale/zh_CN/LC_MESSAGES/electrum.po index 347c01055ec1..7b94f9db580a 100755 --- a/electrum/locale/zh_CN/LC_MESSAGES/electrum.po +++ b/electrum/locale/zh_CN/LC_MESSAGES/electrum.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # danielsocials , 2020 # leihao , 2020 # Yishi Wang , 2020 # JINGHUA SHAO , 2021 -# +# #, fuzzy msgid "" msgstr "" diff --git a/electrum/pem.py b/electrum/pem.py index 40390081b5b5..187e6dd5364c 100644 --- a/electrum/pem.py +++ b/electrum/pem.py @@ -46,7 +46,7 @@ def b2a_base64(b): def dePem(s, name): """Decode a PEM string into a bytearray of its payload. - + The input must contain an appropriate PEM prefix and postfix based on the input name string, e.g. for name="CERTIFICATE": @@ -54,13 +54,13 @@ def dePem(s, name): MIIBXDCCAUSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAPMQ0wCwYDVQQDEwRUQUNL ... KoZIhvcNAQEFBQADAwA5kw== - -----END CERTIFICATE----- + -----END CERTIFICATE----- The first such PEM block in the input will be found, and its payload will be base64 decoded and returned. """ prefix = "-----BEGIN %s-----" % name - postfix = "-----END %s-----" % name + postfix = "-----END %s-----" % name start = s.find(prefix) if start == -1: raise SyntaxError("Missing PEM prefix") @@ -90,7 +90,7 @@ def dePemList(s, name): YMEBdw69PUP8JB4AdqA3K6BVCWfcjN36lx6JwxmZQncS6sww7DecFO/qjSePCxwM +kdDqX/9/183nmjx6bf0ewhPXkA0nVXsDYZaydN8rJU1GaMlnjcIYxY= -----END TACK BREAK SIG----- " - + All such PEM blocks will be found, decoded, and return in an ordered list of bytearrays, which may have zero elements if not PEM blocks are found. """ @@ -111,15 +111,15 @@ def dePemList(s, name): def pem(b, name): """Encode a payload bytearray into a PEM string. - + The input will be base64 encoded, then wrapped in a PEM prefix/postfix based on the name string, e.g. for name="CERTIFICATE": - + -----BEGIN CERTIFICATE----- MIIBXDCCAUSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAPMQ0wCwYDVQQDEwRUQUNL ... KoZIhvcNAQEFBQADAwA5kw== - -----END CERTIFICATE----- + -----END CERTIFICATE----- """ s1 = b2a_base64(b)[:-1] # remove terminating \n s2 = b"" @@ -188,4 +188,3 @@ def _parseASN1PrivateKey(s): dQ = s.next_node(dP) qInv = s.next_node(dQ) return list(map(lambda x: bytesToNumber(s.get_value_of_type(x, 'INTEGER')), [n, e, d, p, q, dP, dQ, qInv])) - diff --git a/electrum/plugins/README b/electrum/plugins/README index a8e4db1a00b9..b076fecd7fe4 100644 --- a/electrum/plugins/README +++ b/electrum/plugins/README @@ -28,4 +28,3 @@ Plugin rules: without putting at risk the user's bitcoins. If we feel that a plugin cannot be removed without threatening users who rely on it, we will not merge it. - diff --git a/electrum/plugins/__init__.py b/electrum/plugins/__init__.py index c6cfe2fdbc64..477ed2c0fbc2 100644 --- a/electrum/plugins/__init__.py +++ b/electrum/plugins/__init__.py @@ -22,5 +22,3 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. - - diff --git a/electrum/plugins/audio_modem/__init__.py b/electrum/plugins/audio_modem/__init__.py index 46c2d2091e00..4ea3924b88d5 100644 --- a/electrum/plugins/audio_modem/__init__.py +++ b/electrum/plugins/audio_modem/__init__.py @@ -4,4 +4,3 @@ description = _('Provides support for air-gapped transaction signing.') requires = [('amodem', 'http://github.com/romanz/amodem/')] available_for = ['qt'] - diff --git a/electrum/plugins/coldcard/coldcard.py b/electrum/plugins/coldcard/coldcard.py index 3f170bd41cde..4680166acd04 100644 --- a/electrum/plugins/coldcard/coldcard.py +++ b/electrum/plugins/coldcard/coldcard.py @@ -95,7 +95,7 @@ def verify_connection(self, expected_xfp: int, expected_xpub=None): if expected_xpub is None: expected_xpub = self.dev.master_xpub - if ( (self._expected_device is not None) + if ( (self._expected_device is not None) or (self.dev.master_fingerprint != expected_xfp) or (self.dev.master_xpub != expected_xpub)): # probably indicating programing error, not hacking @@ -146,7 +146,7 @@ def label(self): else: lab = 'Coldcard ' + xfp2str(self.dev.master_fingerprint) - # Hack zone: during initial setup I need the xfp and master xpub but + # Hack zone: during initial setup I need the xfp and master xpub but # very few objects are passed between the various steps of base_wizard. # Solution: return a string with some hidden metadata # - see @@ -236,7 +236,7 @@ def download_file(self, length, checksum, file_number=1): # get a file return self.dev.download_file(length, checksum, file_number=file_number) - + class Coldcard_KeyStore(Hardware_KeyStore): hw_type = 'coldcard' @@ -313,7 +313,7 @@ def sign_message(self, sequence, message, password): except (UnicodeError, AssertionError): # there are other restrictions on message content, # but let the device enforce and report those - self.handler.show_error('Only short (%d max) ASCII messages can be signed.' + self.handler.show_error('Only short (%d max) ASCII messages can be signed.' % MSG_SIGNING_MAX_LENGTH) return b'' @@ -385,7 +385,7 @@ def sign_transaction(self, tx, password): break rlen, rsha = resp - + # download the resulting txn. raw_resp = client.download_file(rlen, rsha) diff --git a/electrum/plugins/coldcard/qt.py b/electrum/plugins/coldcard/qt.py index a9b8ce51a3f1..2ec2eef0a554 100644 --- a/electrum/plugins/coldcard/qt.py +++ b/electrum/plugins/coldcard/qt.py @@ -220,7 +220,7 @@ def start_upgrade(self, client): mw.show_error("Does not appear to be a Coldcard firmware file.\n\n%s" % exc) return - # TODO: + # TODO: # - detect if they are trying to downgrade; aint gonna work # - warn them about the reboot? # - length checks diff --git a/electrum/plugins/labels/__init__.py b/electrum/plugins/labels/__init__.py index 4596bcae42ed..3aca07c841e3 100644 --- a/electrum/plugins/labels/__init__.py +++ b/electrum/plugins/labels/__init__.py @@ -6,4 +6,3 @@ _("Labels, transactions IDs and addresses are encrypted before they are sent to the remote server.") ]) available_for = ['qt', 'kivy', 'cmdline'] - diff --git a/electrum/plugins/labels/cmdline.py b/electrum/plugins/labels/cmdline.py index 149306521cda..17d0b862be36 100644 --- a/electrum/plugins/labels/cmdline.py +++ b/electrum/plugins/labels/cmdline.py @@ -14,4 +14,4 @@ def on_pulled(self, wallet): self.logger.info('labels pulled from server') def ping_host(self): - self.ping_server() \ No newline at end of file + self.ping_server() diff --git a/electrum/plugins/labels/kivy.py b/electrum/plugins/labels/kivy.py index 0af93e085e09..8e7c75a06739 100644 --- a/electrum/plugins/labels/kivy.py +++ b/electrum/plugins/labels/kivy.py @@ -11,4 +11,3 @@ def load_wallet(self, wallet, window): def on_pulled(self, wallet): self.logger.info('on pulled') self.window._trigger_update_history() - diff --git a/electrum/plugins/labels/labels.py b/electrum/plugins/labels/labels.py index 3156e7440e18..1c26b772192c 100755 --- a/electrum/plugins/labels/labels.py +++ b/electrum/plugins/labels/labels.py @@ -70,7 +70,7 @@ def encode_xpub(self, xpub, msg): iv = hashlib.sha256(password).digest()[:16] encrypted = aes_encrypt_with_iv(password, iv, msg.encode('utf8')) return base64.b64encode(encrypted).decode() - + def decode_xpub(self, xpub, message): decoded = base64.b64decode(message) @@ -214,7 +214,7 @@ async def push_xpub_thread(self, wallet, wallet_type, wallet_name): if not wallet_data: raise Exception('Wallet {} not loaded'.format(wallet)) wallet_id = wallet_data[2] - + for xpub in wallet_data[3]: # xpubId = self.encode(wallet, xpub) bundle = {"xpubs": "", @@ -282,7 +282,7 @@ def pull_xpub(self, xpub): def push_xpub(self, wallet): if not wallet.network: raise Exception(_('You are offline.')) return asyncio.run_coroutine_threadsafe(self.push_xpub_thread(wallet), wallet.network.asyncio_loop).result() - + def create_new_wallet(self, wallet, wallet_type, wallet_name): if not wallet.network: return # 'offline' mode mpk = wallet.get_fingerprint() @@ -371,8 +371,3 @@ async def pull_tx_thread(self, wallet): self.logger.info(f"received {len(response)} transactions") # print("tx info is %s---" %json.dumps(out)) return json.dumps(out) - - - - - \ No newline at end of file diff --git a/electrum/plugins/ledger/auth2fa.py b/electrum/plugins/ledger/auth2fa.py index 96a9696b9bcd..edd3159cbd13 100644 --- a/electrum/plugins/ledger/auth2fa.py +++ b/electrum/plugins/ledger/auth2fa.py @@ -40,14 +40,14 @@ def __init__(self, handler, data): self.cfg = copy.deepcopy(self.handler.win.wallet.get_keystore().cfg) self.dongle = self.handler.win.wallet.get_keystore().get_client().dongle self.pin = '' - + self.devmode = self.getDevice2FAMode() if self.devmode == 0x11 or self.txdata['confirmationType'] == 1: self.cfg['mode'] = 0 - + vbox = QVBoxLayout() self.setLayout(vbox) - + def on_change_mode(idx): self.cfg['mode'] = 0 if self.devmode == 0x11 else idx if idx > 0 else 1 if self.cfg['mode'] > 0: @@ -55,11 +55,11 @@ def on_change_mode(idx): self.handler.win.wallet.save_keystore() self.update_dlg() def return_pin(): - self.pin = self.pintxt.text() if self.txdata['confirmationType'] == 1 else self.cardtxt.text() + self.pin = self.pintxt.text() if self.txdata['confirmationType'] == 1 else self.cardtxt.text() if self.cfg['mode'] == 1: self.pin = ''.join(chr(int(str(i),16)) for i in self.pin) self.accept() - + self.modebox = QWidget() modelayout = QHBoxLayout() self.modebox.setLayout(modelayout) @@ -69,7 +69,7 @@ def return_pin(): modelayout.addStretch(1) self.modebox.setMaximumHeight(50) vbox.addWidget(self.modebox) - + self.populate_modes() self.modes.currentIndexChanged.connect(on_change_mode) @@ -77,7 +77,7 @@ def return_pin(): self.helpmsg.setStyleSheet("QTextEdit { color:black; background-color: lightgray; }") self.helpmsg.setReadOnly(True) vbox.addWidget(self.helpmsg) - + self.pinbox = QWidget() pinlayout = QHBoxLayout() self.pinbox.setLayout(pinlayout) @@ -90,7 +90,7 @@ def return_pin(): pinlayout.addStretch(1) self.pinbox.setVisible(self.cfg['mode'] == 0) vbox.addWidget(self.pinbox) - + self.cardbox = QWidget() card = QVBoxLayout() self.cardbox.setLayout(card) @@ -103,7 +103,7 @@ def return_pin(): self.addrtext.setReadOnly(True) self.addrtext.setMaximumHeight(130) card.addWidget(self.addrtext) - + def pin_changed(s): if len(s) < len(self.idxs): i = self.idxs[len(s)] @@ -118,8 +118,8 @@ def pin_changed(s): self.addrtext.setHtml(str(text)) else: self.addrtext.setHtml(_("Press Enter")) - - pin_changed('') + + pin_changed('') cardpin = QHBoxLayout() cardpin.addWidget(QLabel(_("Enter PIN:"))) self.cardtxt = PasswordLineEdit() @@ -142,7 +142,7 @@ def populate_modes(self): if self.txdata['confirmationType'] > 1: self.modes.addItem(_("Security Card Challenge")) self.modes.blockSignals(False) - + def update_dlg(self): self.modes.setCurrentIndex(self.cfg['mode']) self.modebox.setVisible(True) diff --git a/electrum/plugins/revealer/LICENSE_DEJAVU.txt b/electrum/plugins/revealer/LICENSE_DEJAVU.txt index 254e2cc42a6d..8ecd49d69b64 100644 --- a/electrum/plugins/revealer/LICENSE_DEJAVU.txt +++ b/electrum/plugins/revealer/LICENSE_DEJAVU.txt @@ -46,7 +46,7 @@ Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot -org. +org. Arev Fonts Copyright ------------------------------ @@ -73,7 +73,7 @@ Fonts, only if the fonts are renamed to names not containing either the words "Tavmjong Bah" or the word "Arev". This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the +or Font Software that has been modified and is distributed under the "Tavmjong Bah Arev" names. The Font Software may be sold as part of a larger software package but diff --git a/electrum/plugins/revealer/SIL Open Font License.txt b/electrum/plugins/revealer/SIL Open Font License.txt index 295975a5d6f7..1110c749414e 100644 --- a/electrum/plugins/revealer/SIL Open Font License.txt +++ b/electrum/plugins/revealer/SIL Open Font License.txt @@ -40,4 +40,4 @@ TERMINATION This license becomes null and void if any of the above conditions are not met. DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/electrum/plugins/revealer/__init__.py b/electrum/plugins/revealer/__init__.py index beb58d30e70a..5f70a31711c9 100644 --- a/electrum/plugins/revealer/__init__.py +++ b/electrum/plugins/revealer/__init__.py @@ -8,5 +8,3 @@ " https://revealer.cc", '
', '
', ]) available_for = ['qt'] - - diff --git a/electrum/plugins/revealer/qt.py b/electrum/plugins/revealer/qt.py index da6d540b33ef..2df06b787254 100644 --- a/electrum/plugins/revealer/qt.py +++ b/electrum/plugins/revealer/qt.py @@ -757,5 +757,3 @@ def calibration_dialog(self, window): self.config.set_key('calibration_h', self.calibration_h) self.calibration_v = int(Decimal(vertical.text())) self.config.set_key('calibration_v', self.calibration_v) - - diff --git a/electrum/plugins/safe_t/__init__.py b/electrum/plugins/safe_t/__init__.py index 9bfb2d9bbfdd..6374d691f9c0 100644 --- a/electrum/plugins/safe_t/__init__.py +++ b/electrum/plugins/safe_t/__init__.py @@ -5,4 +5,3 @@ requires = [('safetlib','github.com/archos-safe-t/python-safet')] registers_keystore = ('hardware', 'safe_t', _("Safe-T mini wallet")) available_for = ['qt', 'cmdline'] - diff --git a/electrum/plugins/trezor/__init__.py b/electrum/plugins/trezor/__init__.py index 6aff1e0f480b..4d78251ce065 100644 --- a/electrum/plugins/trezor/__init__.py +++ b/electrum/plugins/trezor/__init__.py @@ -5,4 +5,3 @@ requires = [('trezorlib','pypi.org/project/trezor/')] registers_keystore = ('hardware', 'trezor', _("Trezor wallet")) available_for = ['qt', 'cmdline'] - diff --git a/electrum/plugins/trustedcoin/cmdline.py b/electrum/plugins/trustedcoin/cmdline.py index 0b2da84911ce..106ee10a1caa 100644 --- a/electrum/plugins/trustedcoin/cmdline.py +++ b/electrum/plugins/trustedcoin/cmdline.py @@ -42,4 +42,3 @@ def prompt_user_for_otp(self, wallet, tx): # FIXME this is broken else: self.logger.info("twofactor: xpub3 not needed") wallet.auth_code = auth_code - diff --git a/electrum/servers_regtest.json b/electrum/servers_regtest.json index b9e5ddee5402..a46779a8b711 100644 --- a/electrum/servers_regtest.json +++ b/electrum/servers_regtest.json @@ -5,4 +5,4 @@ "t": "51001", "version": "1.2" } -} \ No newline at end of file +} diff --git a/electrum/sql_db.py b/electrum/sql_db.py index 37fbf003dc0a..b8b94a597703 100644 --- a/electrum/sql_db.py +++ b/electrum/sql_db.py @@ -18,7 +18,7 @@ def wrapper(self, *args, **kwargs): return wrapper class SqlDB(Logger): - + def __init__(self, asyncio_loop, path, commit_interval=None): Logger.__init__(self) self.asyncio_loop = asyncio_loop diff --git a/electrum/submarine_swaps.py b/electrum/submarine_swaps.py index f0198696deda..7ebc23b32c2a 100644 --- a/electrum/submarine_swaps.py +++ b/electrum/submarine_swaps.py @@ -423,4 +423,3 @@ def get_send_amount(self, recv_amount: Optional[int], is_reverse: bool) -> Optio x = int(x * 100 / (100 - self.percentage)) + 1 x += self.normal_fee return x - diff --git a/electrum/wordlist/portuguese.txt b/electrum/wordlist/portuguese.txt index 420d3d12aa0b..2e59ad742e42 100644 --- a/electrum/wordlist/portuguese.txt +++ b/electrum/wordlist/portuguese.txt @@ -1,21 +1,21 @@ # Copyright (c) 2014, The Monero Project -# +# # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without modification, are # permitted provided that the following conditions are met: -# +# # 1. Redistributions of source code must retain the above copyright notice, this list of # conditions and the following disclaimer. -# +# # 2. Redistributions in binary form must reproduce the above copyright notice, this list # of conditions and the following disclaimer in the documentation and/or other # materials provided with the distribution. -# +# # 3. Neither the name of the copyright holder nor the names of its contributors may be # used to endorse or promote products derived from this software without specific # prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL diff --git a/electrum_gui/android/test.py b/electrum_gui/android/test.py index a854d8f9f278..3750f7a8d31c 100755 --- a/electrum_gui/android/test.py +++ b/electrum_gui/android/test.py @@ -631,4 +631,4 @@ #data = testcommond.get_tx_info('029a5002de1703279f256bb09c09c6d8fdf8f784b762c26fa6d5f7f9b5de7d6a') #print("get_tx_info = %s-===========" % data) # data = testcommond.get_default_server() -# print("11111111after data ====%s" %data) \ No newline at end of file +# print("11111111after data ====%s" %data) diff --git a/electrum_gui/android/uikit_bindings/foundation.py b/electrum_gui/android/uikit_bindings/foundation.py index 55f012ed06dd..bc80f725f998 100644 --- a/electrum_gui/android/uikit_bindings/foundation.py +++ b/electrum_gui/android/uikit_bindings/foundation.py @@ -55,4 +55,4 @@ __all__ = [ -] \ No newline at end of file +] diff --git a/electrum_gui/common/basic/dataclass/dataclass.py b/electrum_gui/common/basic/dataclass/dataclass.py index c839ffc515b7..ccfae91befd8 100644 --- a/electrum_gui/common/basic/dataclass/dataclass.py +++ b/electrum_gui/common/basic/dataclass/dataclass.py @@ -1,7 +1,7 @@ import json -from dataclasses import replace, asdict, fields -from typing import Set +from dataclasses import asdict, fields, replace from decimal import Decimal +from typing import Set from electrum.util import DecimalEncoder @@ -42,9 +42,7 @@ def _solve_decimal_fields(cls, data: dict) -> dict: decimal_fields = cls._load_decimal_fields() if decimal_fields: - data = { - k: Decimal(v) if k in decimal_fields else v for k, v in data.items() - } + data = {k: Decimal(v) if k in decimal_fields else v for k, v in data.items()} return data diff --git a/ios/CustomCode/AppDelegate.h b/ios/CustomCode/AppDelegate.h index 59f16b77c7c9..c76dc5708249 100644 --- a/ios/CustomCode/AppDelegate.h +++ b/ios/CustomCode/AppDelegate.h @@ -11,4 +11,3 @@ @property (strong, nonatomic) UIWindow * window; - (void)resetMainVCRootViewControllerSelectSetingVc:(BOOL)isSettingVC; @end - diff --git a/ios/CustomCode/Categories/NSArray+OKKeyPath.h b/ios/CustomCode/Categories/NSArray+OKKeyPath.h index 91e17de2b4f4..4ce1d1bfa89b 100644 --- a/ios/CustomCode/Categories/NSArray+OKKeyPath.h +++ b/ios/CustomCode/Categories/NSArray+OKKeyPath.h @@ -13,4 +13,3 @@ - (id)ok_objectForKeyPath:(NSString *)keyPath; @end - diff --git a/ios/CustomCode/Categories/NSArray+OKKeyPath.m b/ios/CustomCode/Categories/NSArray+OKKeyPath.m index bf1cb37692eb..506133c08f16 100644 --- a/ios/CustomCode/Categories/NSArray+OKKeyPath.m +++ b/ios/CustomCode/Categories/NSArray+OKKeyPath.m @@ -15,7 +15,7 @@ - (id)ok_objectForKeyPath:(NSString *)path { if (!path.length) { return nil; } - + NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", OKKeyPathQueryPattern]; if (![pred evaluateWithObject:path]) { return nil; @@ -28,13 +28,13 @@ - (id)ok_queryObj:(NSString *)path { if (path.length == 0) { return self; } - + if (![path hasPrefix:@"["]) { NSString *errorMsg = [NSString stringWithFormat:@"对数组使用非法查询路径: '%@'", path]; NSAssert(0, errorMsg); return nil; } - + NSInteger index = [self getIndexKey:path]; if (index >= self.count) { return nil; diff --git a/ios/CustomCode/Categories/NSDictionary+OKKeyPath.h b/ios/CustomCode/Categories/NSDictionary+OKKeyPath.h index a0499d136a36..fc41b204ffae 100644 --- a/ios/CustomCode/Categories/NSDictionary+OKKeyPath.h +++ b/ios/CustomCode/Categories/NSDictionary+OKKeyPath.h @@ -15,4 +15,3 @@ extern const NSString *OKKeyPathQueryPattern; - (id)ok_objectForKeyPath:(NSString *)keyPath; @end - diff --git a/ios/CustomCode/Categories/NSDictionary+OKKeyPath.m b/ios/CustomCode/Categories/NSDictionary+OKKeyPath.m index 9132ba9c0bfb..7ee40440c97a 100644 --- a/ios/CustomCode/Categories/NSDictionary+OKKeyPath.m +++ b/ios/CustomCode/Categories/NSDictionary+OKKeyPath.m @@ -17,11 +17,11 @@ - (id)ok_objectForKeyPath:(NSString *)path { if (!path.length) { return nil; } - + if (![path hasPrefix:@"."] && ![path hasPrefix:@"["]) { path = [NSString stringWithFormat:@".%@", path]; } - + NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", OKKeyPathQueryPattern]; if (![pred evaluateWithObject:path]) { return nil; @@ -40,7 +40,7 @@ - (id)ok_queryObj:(NSString *)path { if ([obj respondsToSelector:@selector(ok_queryObj:)]) { return [obj ok_queryObj:[path substringFromIndex:key.length + offset]]; } - + return obj; } diff --git a/ios/CustomCode/Categories/UIImage+OneKey.m b/ios/CustomCode/Categories/UIImage+OneKey.m index db90105e0892..929092a94ee1 100644 --- a/ios/CustomCode/Categories/UIImage+OneKey.m +++ b/ios/CustomCode/Categories/UIImage+OneKey.m @@ -59,33 +59,33 @@ - (UIImage *)imageWithColor:(UIColor *)color { + (UIImage *)circleImageWithImage:(UIImage *)sourceImage borderWidth:(CGFloat)borderWidth borderColor:(UIColor *)borderColor { CGFloat imageWidth = sourceImage.size.width + 2 * borderWidth; - + CGFloat imageHeight = sourceImage.size.height + 2 * borderWidth; - + UIGraphicsBeginImageContextWithOptions(CGSizeMake(imageWidth, imageHeight), NO, 0.0); - + UIGraphicsGetCurrentContext(); - + CGFloat radius = (sourceImage.size.width < sourceImage.size.height?sourceImage.size.width:sourceImage.size.height)*0.5; - + UIBezierPath *bezierPath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(imageWidth * 0.5, imageHeight * 0.5) radius:radius startAngle:0 endAngle:M_PI * 2 clockwise:YES]; - + bezierPath.lineWidth = borderWidth; - + [borderColor setStroke]; - + [bezierPath stroke]; - + [bezierPath addClip]; - + [sourceImage drawInRect:CGRectMake(borderWidth, borderWidth, sourceImage.size.width, sourceImage.size.height)]; - + UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - + UIGraphicsEndImageContext(); - + return image; - + } @end diff --git a/ios/CustomCode/Categories/UILabel+OneKey.m b/ios/CustomCode/Categories/UILabel+OneKey.m index 66543e86d79c..d04800a2c7b8 100644 --- a/ios/CustomCode/Categories/UILabel+OneKey.m +++ b/ios/CustomCode/Categories/UILabel+OneKey.m @@ -18,7 +18,7 @@ -(void)setText:(NSString*)text lineSpacing:(CGFloat)lineSpacing { [paragraphStyle setLineSpacing:lineSpacing]; //设置行间距 [paragraphStyle setLineBreakMode:self.lineBreakMode]; [paragraphStyle setAlignment:self.textAlignment]; - + NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:text]; [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [text length])]; self.attributedText = attributedString; diff --git a/ios/CustomCode/Categories/UIView+Helper.m b/ios/CustomCode/Categories/UIView+Helper.m index 8e7f1bd244cc..4b71446e075c 100644 --- a/ios/CustomCode/Categories/UIView+Helper.m +++ b/ios/CustomCode/Categories/UIView+Helper.m @@ -54,21 +54,21 @@ - (void)setLayerBorderWithColor:(UIColor *)color andWidth:(CGFloat)width -(void)addBottedlineWidth:(CGFloat)lineWidth lineColor:(UIColor *)lineColor{ CAShapeLayer *border = [CAShapeLayer layer]; - + border.strokeColor = lineColor.CGColor; - + border.fillColor = nil; - + border.path = [UIBezierPath bezierPathWithRect:self.bounds].CGPath; - + border.frame = self.bounds; - + border.lineWidth = lineWidth; - + border.lineCap = @"square"; //设置线宽和线间距 border.lineDashPattern = @[@4, @5]; - + [self.layer addSublayer:border]; } @@ -96,23 +96,23 @@ - (void)wkwebViewSnapshotImage:(void(^)(UIImage * img))block { CGSize boundsSize = self.bounds.size; CGFloat boundsWidth = boundsSize.width; CGFloat boundsHeight = boundsSize.height; - + CGSize contentSize = scrollView.contentSize; CGFloat contentHeight = contentSize.height; - + CGPoint offset = scrollView.contentOffset; - + NSMutableArray *images = [NSMutableArray array]; //创建一个view覆盖在上面 [self createPlaceholder:images]; - - + + [scrollView setContentOffset:CGPointMake(0, 0)]; - + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [self createImg:images height:contentHeight block:^{ [scrollView setContentOffset:offset]; - + CGSize imageSize = CGSizeMake(contentSize.width * scale, contentSize.height * scale); UIGraphicsBeginImageContext(imageSize); @@ -162,7 +162,7 @@ - (void)createPlaceholder:(NSMutableArray*)imgs{ [self.layer renderInContext:UIGraphicsGetCurrentContext()]; UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); UIGraphicsEndImageContext(); - + UIImageView * imgViewPlaceholder=[[UIImageView alloc] initWithImage:image]; imgViewPlaceholder.tag=100; imgViewPlaceholder.frame=self.frame; diff --git a/ios/CustomCode/Categories/UIView+Toast.h b/ios/CustomCode/Categories/UIView+Toast.h index bf1839fe016e..c0b125c6a384 100755 --- a/ios/CustomCode/Categories/UIView+Toast.h +++ b/ios/CustomCode/Categories/UIView+Toast.h @@ -35,18 +35,18 @@ extern const NSString * CSToastPositionBottom; Toast is an Objective-C category that adds toast notifications to the UIView object class. It is intended to be simple, lightweight, and easy to use. Most toast notifications can be triggered with a single line of code. - + The `makeToast:` methods create a new view and then display it as toast. - + The `showToast:` methods display any view as toast. - + */ @interface UIView (Toast) /** Creates and presents a new toast view with a message and displays it with the default duration and position. Styled using the shared style. - + @param message The message to be displayed */ - (void)makeToast:(NSString *)message; @@ -54,7 +54,7 @@ extern const NSString * CSToastPositionBottom; /** Creates and presents a new toast view with a message. Duration and position can be set explicitly. Styled using the shared style. - + @param message The message to be displayed @param duration The toast duration @param position The toast's center point. Can be one of the predefined CSToastPosition @@ -67,7 +67,7 @@ extern const NSString * CSToastPositionBottom; /** Creates and presents a new toast view with a message. Duration, position, and style can be set explicitly. - + @param message The message to be displayed @param duration The toast duration @param position The toast's center point. Can be one of the predefined CSToastPosition @@ -82,9 +82,9 @@ extern const NSString * CSToastPositionBottom; /** Creates and presents a new toast view with a message, title, and image. Duration, position, and style can be set explicitly. The completion block executes when the - toast view completes. `didTap` will be `YES` if the toast view was dismissed from + toast view completes. `didTap` will be `YES` if the toast view was dismissed from a tap. - + @param message The message to be displayed @param duration The toast duration @param position The toast's center point. Can be one of the predefined CSToastPosition @@ -108,9 +108,9 @@ extern const NSString * CSToastPositionBottom; The look and feel is configured via the style. Unlike the `makeToast:` methods, this method does not present the toast view automatically. One of the showToast: methods must be used to present the resulting view. - + @warning if message, title, and image are all nil, this method will return nil. - + @param message The message to be displayed @param title The title @param image The image @@ -124,14 +124,14 @@ extern const NSString * CSToastPositionBottom; /** Creates and displays a new toast activity indicator view at a specified position. - + @warning Only one toast activity indicator view can be presented per superview. Subsequent calls to `makeToastActivity:` will be ignored until hideToastActivity is called. - + @warning `makeToastActivity:` works independently of the showToast: methods. Toast activity views can be presented and dismissed while toast views are being displayed. `makeToastActivity:` has no effect on the queueing behavior of the showToast: methods. - + @param position The toast's center point. Can be one of the predefined CSToastPosition constants or a `CGPoint` wrapped in an `NSValue` object. @return The newly created toast view @@ -145,16 +145,16 @@ extern const NSString * CSToastPositionBottom; /** Displays any view as toast using the default duration and position. - + @param toast The view to be displayed as toast */ - (void)showToast:(UIView *)toast; /** - Displays any view as toast at a provided position and duration. The completion block - executes when the toast view completes. `didTap` will be `YES` if the toast view was + Displays any view as toast at a provided position and duration. The completion block + executes when the toast view completes. `didTap` will be `YES` if the toast view was dismissed from a tap. - + @param toast The view to be displayed as toast @param duration The notification duration @param position The toast's center point. Can be one of the predefined CSToastPosition @@ -170,10 +170,10 @@ extern const NSString * CSToastPositionBottom; @end /** - `CSToastStyle` instances define the look and feel for toast views created via the + `CSToastStyle` instances define the look and feel for toast views created via the `makeToast:` methods as well for toast views created directly with `toastViewForMessage:title:image:style:`. - + @warning `CSToastStyle` offers relatively simple styling options for the default toast view. If you require a toast view with more complex UI, it probably makes more sense to create your own custom UIView subclass and present it with the `showToast:` @@ -323,7 +323,7 @@ extern const NSString * CSToastPositionBottom; a `makeToast:` method (or `toastViewForMessage:title:image:style:`) is called with with a nil style. By default, this is set to `CSToastStyle`'s default style. - + @param sharedStyle */ + (void)setSharedStyle:(CSToastStyle *)sharedStyle; @@ -331,14 +331,14 @@ extern const NSString * CSToastPositionBottom; /** Gets the shared style from the singlton. By default, this is `CSToastStyle`'s default style. - + @return the shared style */ + (CSToastStyle *)sharedStyle; /** Enables or disables tap to dismiss on toast views. Default is `YES`. - + @param allowTapToDismiss */ + (void)setTapToDismissEnabled:(BOOL)tapToDismissEnabled; @@ -346,7 +346,7 @@ extern const NSString * CSToastPositionBottom; /** Returns `YES` if tap to dismiss is enabled, otherwise `NO`. Default is `YES`. - + @return BOOL */ + (BOOL)isTapToDismissEnabled; @@ -357,7 +357,7 @@ extern const NSString * CSToastPositionBottom; views will appear at the same time (potentially overlapping depending on their positions). This has no effect on the toast activity view, which operates independently of normal toast views. Default is `YES`. - + @param queueEnabled */ + (void)setQueueEnabled:(BOOL)queueEnabled; @@ -365,7 +365,7 @@ extern const NSString * CSToastPositionBottom; /** Returns `YES` if the queue is enabled, otherwise `NO`. Default is `YES`. - + @return BOOL */ + (BOOL)isQueueEnabled; @@ -374,14 +374,14 @@ extern const NSString * CSToastPositionBottom; Sets the default duration. Used for the `makeToast:` and `showToast:` methods that don't require an explicit duration. Default is 3.0. - + @param duration The toast duration */ + (void)setDefaultDuration:(NSTimeInterval)duration; /** Returns the default duration. Default is 3.0. - + @return duration The toast duration */ + (NSTimeInterval)defaultDuration; @@ -390,7 +390,7 @@ extern const NSString * CSToastPositionBottom; Sets the default position. Used for the `makeToast:` and `showToast:` methods that don't require an explicit position. Default is `CSToastPositionBottom`. - + @param position The default center point. Can be one of the predefined CSToastPosition constants or a `CGPoint` wrapped in an `NSValue` object. */ @@ -398,7 +398,7 @@ extern const NSString * CSToastPositionBottom; /** Returns the default toast position. Default is `CSToastPositionBottom`. - + @return position The default center point. Will be one of the predefined CSToastPosition constants or a `CGPoint` wrapped in an `NSValue` object. */ diff --git a/ios/CustomCode/Categories/UIView+Toast.m b/ios/CustomCode/Categories/UIView+Toast.m index f599cd1f16ee..5640abbd6f40 100755 --- a/ios/CustomCode/Categories/UIView+Toast.m +++ b/ios/CustomCode/Categories/UIView+Toast.m @@ -45,9 +45,9 @@ @interface UIView (ToastPrivate) /** - These private methods are being prefixed with "cs_" to reduce the likelihood of non-obvious + These private methods are being prefixed with "cs_" to reduce the likelihood of non-obvious naming conflicts with other UIView methods. - + @discussion Should the public API also use the cs_ prefix? Technically it should, but it results in code that is less legible. The current public method names seem unlikely to cause conflicts so I think we should favor the cleaner API for now. @@ -94,15 +94,15 @@ - (void)showToast:(UIView *)toast { - (void)showToast:(UIView *)toast duration:(NSTimeInterval)duration position:(id)position completion:(void(^)(BOOL didTap))completion { // sanity if (toast == nil) return; - + // store the completion block on the toast view objc_setAssociatedObject(toast, &CSToastCompletionKey, completion, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - + if ([CSToastManager isQueueEnabled] && objc_getAssociatedObject(self, &CSToastActiveToastViewKey) != nil) { // we're about to queue this toast view so we need to store the duration and position as well objc_setAssociatedObject(toast, &CSToastDurationKey, @(duration), OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(toast, &CSToastPositionKey, position, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - + // enqueue [self.cs_toastQueue addObject:toast]; } else { @@ -116,19 +116,19 @@ - (void)showToast:(UIView *)toast duration:(NSTimeInterval)duration position:(id - (void)cs_showToast:(UIView *)toast duration:(NSTimeInterval)duration position:(id)position { toast.center = [self cs_centerPointForPosition:position withToast:toast]; toast.alpha = 0.0; - + if ([CSToastManager isTapToDismissEnabled]) { UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(cs_handleToastTapped:)]; [toast addGestureRecognizer:recognizer]; toast.userInteractionEnabled = YES; toast.exclusiveTouch = YES; } - + // set the active toast objc_setAssociatedObject(self, &CSToastActiveToastViewKey, toast, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - + [self addSubview:toast]; - + [UIView animateWithDuration:[[CSToastManager sharedStyle] fadeDuration] delay:0.0 options:(UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionAllowUserInteraction) @@ -144,7 +144,7 @@ - (void)cs_showToast:(UIView *)toast duration:(NSTimeInterval)duration position: - (void)cs_hideToast:(UIView *)toast { [self cs_hideToast:toast fromTap:NO]; } - + - (void)cs_hideToast:(UIView *)toast fromTap:(BOOL)fromTap { [UIView animateWithDuration:[[CSToastManager sharedStyle] fadeDuration] delay:0.0 @@ -153,21 +153,21 @@ - (void)cs_hideToast:(UIView *)toast fromTap:(BOOL)fromTap { toast.alpha = 0.0; } completion:^(BOOL finished) { [toast removeFromSuperview]; - + // clear the active toast objc_setAssociatedObject(self, &CSToastActiveToastViewKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - + // execute the completion block, if necessary void (^completion)(BOOL didTap) = objc_getAssociatedObject(toast, &CSToastCompletionKey); if (completion) { completion(fromTap); } - + if ([self.cs_toastQueue count] > 0) { // dequeue UIView *nextToast = [[self cs_toastQueue] firstObject]; [[self cs_toastQueue] removeObjectAtIndex:0]; - + // present the next toast NSTimeInterval duration = [objc_getAssociatedObject(nextToast, &CSToastDurationKey) doubleValue]; id position = objc_getAssociatedObject(nextToast, &CSToastPositionKey); @@ -181,39 +181,39 @@ - (void)cs_hideToast:(UIView *)toast fromTap:(BOOL)fromTap { - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image style:(CSToastStyle *)style { // sanity if(message == nil && title == nil && image == nil) return nil; - + // default to the shared style if (style == nil) { style = [CSToastManager sharedStyle]; } - + // dynamically build a toast view with any combination of message, title, & image. UILabel *messageLabel = nil; UILabel *titleLabel = nil; UIImageView *imageView = nil; - + // create the parent view UIView *wrapperView = [[UIView alloc] init]; wrapperView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin); wrapperView.layer.cornerRadius = style.cornerRadius; - + if (style.displayShadow) { wrapperView.layer.shadowColor = style.shadowColor.CGColor; wrapperView.layer.shadowOpacity = style.shadowOpacity; wrapperView.layer.shadowRadius = style.shadowRadius; wrapperView.layer.shadowOffset = style.shadowOffset; } - + wrapperView.backgroundColor = style.backgroundColor; - + if(image != nil) { imageView = [[UIImageView alloc] initWithImage:image]; imageView.contentMode = UIViewContentModeScaleAspectFit; imageView.frame = CGRectMake(style.horizontalPadding, style.verticalPadding, style.imageSize.width, style.imageSize.height); } - + CGFloat imageWidth, imageHeight, imageLeft; - + // the imageView frame values will be used to size & position the other views if(imageView != nil) { imageWidth = imageView.bounds.size.width; @@ -222,7 +222,7 @@ - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title imag } else { imageWidth = imageHeight = imageLeft = 0.0; } - + if (title != nil) { titleLabel = [[UILabel alloc] init]; titleLabel.numberOfLines = style.titleNumberOfLines; @@ -233,13 +233,13 @@ - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title imag titleLabel.backgroundColor = [UIColor clearColor]; titleLabel.alpha = 1.0; titleLabel.text = title; - + // size the title label according to the length of the text CGSize maxSizeTitle = CGSizeMake((self.bounds.size.width * style.maxWidthPercentage) - imageWidth, self.bounds.size.height * style.maxHeightPercentage); CGSize expectedSizeTitle = [self cs_sizeForString:title font:titleLabel.font constrainedToSize:maxSizeTitle lineBreakMode:titleLabel.lineBreakMode]; titleLabel.frame = CGRectMake(0.0, 0.0, expectedSizeTitle.width, expectedSizeTitle.height); } - + if (message != nil) { messageLabel = [[UILabel alloc] init]; messageLabel.numberOfLines = style.messageNumberOfLines; @@ -250,16 +250,16 @@ - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title imag messageLabel.backgroundColor = [UIColor clearColor]; messageLabel.alpha = 1.0; messageLabel.text = message; - + // size the message label according to the length of the text CGSize maxSizeMessage = CGSizeMake((self.bounds.size.width * style.maxWidthPercentage) - imageWidth, self.bounds.size.height * style.maxHeightPercentage); CGSize expectedSizeMessage = [self cs_sizeForString:message font:messageLabel.font constrainedToSize:maxSizeMessage lineBreakMode:messageLabel.lineBreakMode]; messageLabel.frame = CGRectMake(0.0, 0.0, expectedSizeMessage.width, expectedSizeMessage.height); } - + // titleLabel frame values CGFloat titleWidth, titleHeight, titleTop, titleLeft; - + if(titleLabel != nil) { titleWidth = titleLabel.bounds.size.width; titleHeight = titleLabel.bounds.size.height; @@ -268,10 +268,10 @@ - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title imag } else { titleWidth = titleHeight = titleTop = titleLeft = 0.0; } - + // messageLabel frame values CGFloat messageWidth, messageHeight, messageLeft, messageTop; - + if(messageLabel != nil) { messageWidth = messageLabel.bounds.size.width; messageHeight = messageLabel.bounds.size.height; @@ -280,30 +280,30 @@ - (UIView *)toastViewForMessage:(NSString *)message title:(NSString *)title imag } else { messageWidth = messageHeight = messageLeft = messageTop = 0.0; } - + CGFloat longerWidth = MAX(titleWidth, messageWidth); CGFloat longerLeft = MAX(titleLeft, messageLeft); - + // wrapper width uses the longerWidth or the image width, whatever is larger. same logic applies to the wrapper height CGFloat wrapperWidth = MAX((imageWidth + (style.horizontalPadding * 2.0)), (longerLeft + longerWidth + style.horizontalPadding)); CGFloat wrapperHeight = MAX((messageTop + messageHeight + style.verticalPadding), (imageHeight + (style.verticalPadding * 2.0))); - + wrapperView.frame = CGRectMake(0.0, 0.0, wrapperWidth, wrapperHeight); - + if(titleLabel != nil) { titleLabel.frame = CGRectMake(titleLeft, titleTop, titleWidth, titleHeight); [wrapperView addSubview:titleLabel]; } - + if(messageLabel != nil) { messageLabel.frame = CGRectMake(messageLeft, messageTop, messageWidth, messageHeight); [wrapperView addSubview:messageLabel]; } - + if(imageView != nil) { [wrapperView addSubview:imageView]; } - + return wrapperView; } @@ -328,7 +328,7 @@ - (void)cs_handleToastTapped:(UITapGestureRecognizer *)recognizer { UIView *toast = recognizer.view; NSTimer *timer = (NSTimer *)objc_getAssociatedObject(toast, &CSToastTimerKey); [timer invalidate]; - + [self cs_hideToast:toast fromTap:YES]; } @@ -338,33 +338,33 @@ - (void)makeToastActivity:(id)position { // sanity UIView *existingActivityView = (UIView *)objc_getAssociatedObject(self, &CSToastActivityViewKey); if (existingActivityView != nil) return; - + CSToastStyle *style = [CSToastManager sharedStyle]; - + UIView *activityView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, style.activitySize.width, style.activitySize.height)]; activityView.center = [self cs_centerPointForPosition:position withToast:activityView]; activityView.backgroundColor = style.backgroundColor; activityView.alpha = 0.0; activityView.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin); activityView.layer.cornerRadius = style.cornerRadius; - + if (style.displayShadow) { activityView.layer.shadowColor = style.shadowColor.CGColor; activityView.layer.shadowOpacity = style.shadowOpacity; activityView.layer.shadowRadius = style.shadowRadius; activityView.layer.shadowOffset = style.shadowOffset; } - + UIActivityIndicatorView *activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; activityIndicatorView.center = CGPointMake(activityView.bounds.size.width / 2, activityView.bounds.size.height / 2); [activityView addSubview:activityIndicatorView]; [activityIndicatorView startAnimating]; - + // associate the activity view with self objc_setAssociatedObject (self, &CSToastActivityViewKey, activityView, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - + [self addSubview:activityView]; - + [UIView animateWithDuration:style.fadeDuration delay:0.0 options:UIViewAnimationOptionCurveEaseOut @@ -392,7 +392,7 @@ - (void)hideToastActivity { - (CGPoint)cs_centerPointForPosition:(id)point withToast:(UIView *)toast { CSToastStyle *style = [CSToastManager sharedStyle]; - + if([point isKindOfClass:[NSString class]]) { if([point caseInsensitiveCompare:CSToastPositionTop] == NSOrderedSame) { return CGPointMake(self.bounds.size.width/2, (toast.frame.size.height / 2) + style.verticalPadding); @@ -402,7 +402,7 @@ - (CGPoint)cs_centerPointForPosition:(id)point withToast:(UIView *)toast { } else if ([point isKindOfClass:[NSValue class]]) { return [point CGPointValue]; } - + // default to bottom return CGPointMake(self.bounds.size.width/2, (self.bounds.size.height - (toast.frame.size.height / 2)) - style.verticalPadding); } @@ -492,7 +492,7 @@ + (instancetype)sharedManager { dispatch_once(&oncePredicate, ^{ _sharedManager = [[self alloc] init]; }); - + return _sharedManager; } diff --git a/ios/CustomCode/Categories/UIView+YCExtension.h b/ios/CustomCode/Categories/UIView+YCExtension.h index 187f13716ebb..0098d1738fa2 100755 --- a/ios/CustomCode/Categories/UIView+YCExtension.h +++ b/ios/CustomCode/Categories/UIView+YCExtension.h @@ -69,6 +69,3 @@ @property (nonatomic, assign) CGFloat bottom; @end - - - diff --git a/ios/CustomCode/Categories/UIView+YCExtension.m b/ios/CustomCode/Categories/UIView+YCExtension.m index db0ecdb12ce5..253d1fc3c71d 100755 --- a/ios/CustomCode/Categories/UIView+YCExtension.m +++ b/ios/CustomCode/Categories/UIView+YCExtension.m @@ -16,13 +16,13 @@ -(void)setX:(CGFloat)x CGRect frame = self.frame; frame.origin.x=x; self.frame = frame; - + } -(void)setY:(CGFloat)y { - + CGRect frame = self.frame; frame.origin.y=y; self.frame = frame; @@ -30,12 +30,12 @@ -(void)setY:(CGFloat)y -(CGFloat)x{ return self.frame.origin.x; - + } -(CGFloat)y { - + return self.frame.origin.y; } - (void)setCenterX:(CGFloat)centerX{ @@ -69,16 +69,16 @@ -(void)setWidth:(CGFloat)width -(void)setHeight:(CGFloat)height { - + CGRect frame = self.frame; frame.size.height =height; self.frame = frame; - - + + } -(CGFloat)width { - + return self.frame.size.width; } @@ -92,12 +92,12 @@ -(void)setSize:(CGSize)size CGRect frame = self.frame; frame.size = size; self.frame = frame; - + } -(CGSize)size { - + return self.frame.size; } -(void)setOrigin:(CGPoint)origin @@ -105,7 +105,7 @@ -(void)setOrigin:(CGPoint)origin CGRect frame = self.frame; frame.origin = origin; self.frame = frame; - + } -(CGPoint)origin @@ -122,7 +122,7 @@ - (void)setTop:(CGFloat)top { } - (CGFloat)top { - + return self.frame.origin.y; } @@ -140,11 +140,11 @@ - (CGFloat)left { } - (void)setBottom:(CGFloat)bottom { - + CGRect frame = self.frame; frame.origin.y = bottom = frame.size.height; self.frame = frame; - + } - (CGFloat)bottom { @@ -165,4 +165,3 @@ - (CGFloat)right { return self.frame.origin.x + self.frame.size.width; } @end - diff --git a/ios/CustomCode/CommonView/OKClickTextView.m b/ios/CustomCode/CommonView/OKClickTextView.m index 65eb4d548f74..d648f3c55472 100644 --- a/ios/CustomCode/CommonView/OKClickTextView.m +++ b/ios/CustomCode/CommonView/OKClickTextView.m @@ -64,7 +64,7 @@ - (void)setUnderlineTextWithRange:(NSRange)underlineTextRange withUnderlineColor if (self.text.length < underlineTextRange.location+underlineTextRange.length) { return; } - + // 设置下划线 if (self.isShowUnderline) { [self.content addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:underlineTextRange]; @@ -74,11 +74,11 @@ - (void)setUnderlineTextWithRange:(NSRange)underlineTextRange withUnderlineColor [self.content addAttribute:NSForegroundColorAttributeName value:color range:underlineTextRange]; } self.attributedText = self.content; - + // 设置下划线文字的点击事件 // self.selectedRange 影响 self.selectedTextRange self.selectedRange = underlineTextRange; - + // 获取选中范围内的矩形框 NSArray *selectionRects = [self selectionRectsForRange:self.selectedTextRange]; // 清空选中范围 @@ -104,7 +104,7 @@ - (void)setUnderlineTextWithRange:(NSRange)underlineTextRange withUnderlineColor } // 将可能点击的范围的数组存储到总的数组中 [self.rectsArray addObject:selectedArray]; - + } // 点击textView的 touchesBegan 方法 @@ -112,7 +112,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { // 获取触摸对象 UITouch *touch = [touches anyObject]; - + // 触摸点 CGPoint point = [touch locationInView:self]; // 通过一个触摸点,查询点击的是不是在下划线对应的文字的frame diff --git a/ios/CustomCode/MainViewController.h b/ios/CustomCode/MainViewController.h index 577c6ed1d8fc..40de133439f1 100644 --- a/ios/CustomCode/MainViewController.h +++ b/ios/CustomCode/MainViewController.h @@ -10,4 +10,3 @@ @interface MainViewController : UIViewController @property (nonatomic) BOOL isTabSettingVC; @end - diff --git a/ios/CustomCode/MainViewController.m b/ios/CustomCode/MainViewController.m index 68a9a8495b76..67e122bdd0e4 100644 --- a/ios/CustomCode/MainViewController.m +++ b/ios/CustomCode/MainViewController.m @@ -30,7 +30,7 @@ - (void)viewDidLoad { [self addTabBarController]; [self tabBarAppearance]; [self tabBarResetLineColor]; - + if (self.isTabSettingVC) { [self selectLangue]; } diff --git a/ios/CustomCode/Modules/Bluetooth/View/OKBluetoothViewCell.m b/ios/CustomCode/Modules/Bluetooth/View/OKBluetoothViewCell.m index 6af231faf705..cf11fbd43f16 100644 --- a/ios/CustomCode/Modules/Bluetooth/View/OKBluetoothViewCell.m +++ b/ios/CustomCode/Modules/Bluetooth/View/OKBluetoothViewCell.m @@ -38,7 +38,7 @@ - (void)setModel:(OKBluetoothViewCellModel *)model - (void)awakeFromNib { [super awakeFromNib]; // Initialization code - + } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { diff --git a/ios/CustomCode/Modules/Hardware/Controller/OKActivateDeviceSelectViewController.m b/ios/CustomCode/Modules/Hardware/Controller/OKActivateDeviceSelectViewController.m index 2c651d5f2396..ec1f5c917b09 100644 --- a/ios/CustomCode/Modules/Hardware/Controller/OKActivateDeviceSelectViewController.m +++ b/ios/CustomCode/Modules/Hardware/Controller/OKActivateDeviceSelectViewController.m @@ -84,24 +84,24 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath - (NSArray *)walletTypeListArray { if (!_walletTypeListArray) { - + OKCreateSelectWalletTypeModel *model = [OKCreateSelectWalletTypeModel new]; model.createWalletType = MyLocalizedString(@"Add a new wallet (recommended)", nil); model.iconName = @"new_device"; model.tipsString = MyLocalizedString(@"Up to 20 derived wallets can be created, as needed", nil); model.addtype = OKAddTypeCreateHWDerived; - + OKCreateSelectWalletTypeModel *model1 = [OKCreateSelectWalletTypeModel new]; model1.createWalletType = MyLocalizedString(@"Restore the wallet that was created from this hardware device", nil); model1.iconName = @"recover_device"; model1.tipsString = MyLocalizedString(@"If you have ever deleted a wallet created by the device on your phone, you can recover it this way.", nil); model1.addtype = OKAddTypeRestoredHWWallet; - + OKCreateSelectWalletTypeModel *model2 = [OKCreateSelectWalletTypeModel new]; model2.createWalletType = MyLocalizedString(@"Create a Condominium wallet (Advanced)", nil); model2.iconName = @"multi-sig"; model2.tipsString = MyLocalizedString(@"At least 2 devices are required to cooperate. Before adding, make sure that all hardware devices that want to participate in the public pipe are activated", nil); - + _walletTypeListArray = @[model,model1]; } return _walletTypeListArray; diff --git a/ios/CustomCode/Modules/Hardware/Controller/OKDeviceSuccessViewController.m b/ios/CustomCode/Modules/Hardware/Controller/OKDeviceSuccessViewController.m index cbfcbfd0d0aa..bc9b35813d85 100644 --- a/ios/CustomCode/Modules/Hardware/Controller/OKDeviceSuccessViewController.m +++ b/ios/CustomCode/Modules/Hardware/Controller/OKDeviceSuccessViewController.m @@ -70,7 +70,7 @@ - (IBAction)completeBtnClick:(UIButton *)sender { [[NSNotificationCenter defaultCenter]postNotificationName:kNotiBackUPWalletComplete object:nil]; [[NSNotificationCenter defaultCenter]postNotificationName:kNotiHwInfoUpdate object:nil]; [self.OK_TopViewController dismissToViewControllerWithClassName:@"OKWalletViewController" animated:YES complete:^{ - + }]; } break; diff --git a/ios/CustomCode/Modules/Hardware/Controller/OKDiscoverNewDeviceViewController.m b/ios/CustomCode/Modules/Hardware/Controller/OKDiscoverNewDeviceViewController.m index 34d66bae9f90..eaf79cc133c3 100644 --- a/ios/CustomCode/Modules/Hardware/Controller/OKDiscoverNewDeviceViewController.m +++ b/ios/CustomCode/Modules/Hardware/Controller/OKDiscoverNewDeviceViewController.m @@ -30,7 +30,7 @@ - (void)viewDidLoad { self.title = MyLocalizedString(@"pairing", nil); self.titleLabel.text = MyLocalizedString(@"Discover a new device you can...", nil); self.tableView.tableFooterView = [UIView new]; - + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapClick)]; [self.toSettingLabel addGestureRecognizer:tap]; } diff --git a/ios/CustomCode/Modules/Hardware/Controller/OKMatchingInCirclesViewController.m b/ios/CustomCode/Modules/Hardware/Controller/OKMatchingInCirclesViewController.m index 81c60c07e942..ed7652009327 100644 --- a/ios/CustomCode/Modules/Hardware/Controller/OKMatchingInCirclesViewController.m +++ b/ios/CustomCode/Modules/Hardware/Controller/OKMatchingInCirclesViewController.m @@ -290,7 +290,7 @@ - (void)subscribeComplete:(NSDictionary *)jsonDict characteristic:(nonnull CBCha OKDeviceModel *deviceModel = [[OKDeviceModel alloc]initWithJson:jsonDict]; kOKBlueManager.currentDeviceID = deviceModel.deviceInfo.device_id; [[OKDevicesManager sharedInstance]addDevices:deviceModel]; - + if (deviceModel.bootloaderMode) { dispatch_async(dispatch_get_main_queue(), ^{ [MBProgressHUD hideHUDForView:self.view animated:YES]; diff --git a/ios/CustomCode/Modules/Hardware/Controller/OKSpecialEquipmentViewController.m b/ios/CustomCode/Modules/Hardware/Controller/OKSpecialEquipmentViewController.m index f3950566fdc9..fd3f04415120 100644 --- a/ios/CustomCode/Modules/Hardware/Controller/OKSpecialEquipmentViewController.m +++ b/ios/CustomCode/Modules/Hardware/Controller/OKSpecialEquipmentViewController.m @@ -29,7 +29,7 @@ @implementation OKSpecialEquipmentViewController + (instancetype)specialEquipmentViewController { return [[UIStoryboard storyboardWithName:@"Hardware" bundle:nil]instantiateViewControllerWithIdentifier:@"OKSpecialEquipmentViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; diff --git a/ios/CustomCode/Modules/Hardware/View/OK_PassWordView.m b/ios/CustomCode/Modules/Hardware/View/OK_PassWordView.m index c9f797c2448c..3fd148f55a17 100644 --- a/ios/CustomCode/Modules/Hardware/View/OK_PassWordView.m +++ b/ios/CustomCode/Modules/Hardware/View/OK_PassWordView.m @@ -30,7 +30,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder { self = [super initWithCoder:coder]; if (self) { - + } return self; } @@ -39,7 +39,7 @@ - (instancetype)init { self = [super init]; if (self) { - + } return self; } @@ -48,47 +48,47 @@ -(void)configUI{ self.bottomLineArr= @[].mutableCopy; self.dotArr = @[].mutableCopy; self.codeLArr = @[].mutableCopy; - - + + [self.bottomLineArr removeAllObjects]; [self.dotArr removeAllObjects]; [self.codeLArr removeAllObjects]; - + // passShow1,//黑点,框,没间隔 // passShow2,//显示数字,框,没间隔 // passShow3,//黑点,框,有间隔 // passShow4,//显示数字,框,有间隔 // passShow5,//显示数字,下划线,一般用做验证码 - + if (self.showType == passShow1) { [self initShow1]; }else if(self.showType == passShow2){ [self initShow2]; - + }else if(self.showType == passShow3){ [self initShow3]; - + }else if(self.showType == passShow4){ [self initShow4]; - + }else if(self.showType == passShow5){ [self initShow5]; - + } - + } // passShow1,//黑点,框,没间隔 -(void)initShow1{ CGFloat width = self.frame.size.width/self.num; - + for (int i = 0; i< self.num -1; i++) { UIView *lineV = [[UIView alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.textF.frame)+(i+1)*width, 0, 1,K_Field_Height)]; lineV.backgroundColor = self.tintColor; [self addSubview:lineV]; } - + self.dotArr = @[].mutableCopy; for (int i=0; i 0) { [self.checktopView configureData:[self getConfusedWords:self.indexTop] delegate:self]; [self.checkmidView configureData:[self getConfusedWords:self.indexMid] delegate:self]; diff --git a/ios/CustomCode/Modules/Restore/View/OKCheckWordView.m b/ios/CustomCode/Modules/Restore/View/OKCheckWordView.m index 4e3725c9d6c8..0ae210412cf1 100644 --- a/ios/CustomCode/Modules/Restore/View/OKCheckWordView.m +++ b/ios/CustomCode/Modules/Restore/View/OKCheckWordView.m @@ -70,7 +70,7 @@ - (void)configureData:(NSArray *)data delegate:(nonnull id)delegate{ if (!data || !data.count || data.count != kWordNum) { return; } - + self.delegate = delegate; // 顺序赋值 for (NSInteger i = 0; i < kWordNum; ++i) { diff --git a/ios/CustomCode/Modules/Restore/View/OKDeleteTextField.m b/ios/CustomCode/Modules/Restore/View/OKDeleteTextField.m index 47d1b2b8569a..711cb046b49d 100644 --- a/ios/CustomCode/Modules/Restore/View/OKDeleteTextField.m +++ b/ios/CustomCode/Modules/Restore/View/OKDeleteTextField.m @@ -16,7 +16,7 @@ -(void)deleteBackward { if ([_deleteDelegate respondsToSelector:@selector(deleteBackward)]) { [_deleteDelegate deleteBackward]; } - + if (length) { [super deleteBackward]; if ([_deleteDelegate respondsToSelector:@selector(AfterDeleteBackward)]) { diff --git a/ios/CustomCode/Modules/Restore/View/OKFindWalletTableViewCell.m b/ios/CustomCode/Modules/Restore/View/OKFindWalletTableViewCell.m index 58a0cc18ec0d..03bcbf2c688a 100644 --- a/ios/CustomCode/Modules/Restore/View/OKFindWalletTableViewCell.m +++ b/ios/CustomCode/Modules/Restore/View/OKFindWalletTableViewCell.m @@ -36,7 +36,7 @@ - (void)setModel:(OKFindWalletTableViewCellModel *)model self.checkBtn.selected = model.isSelected; self.walletNameLabel.text = model.label; self.balanceLabel.text = model.blance; - + if (model.exist) { self.checkBtn.hidden = YES; self.checkBtn.userInteractionEnabled = NO; diff --git a/ios/CustomCode/Modules/Restore/View/OKWordImportView.m b/ios/CustomCode/Modules/Restore/View/OKWordImportView.m index 220b29a7499a..8f117486449f 100644 --- a/ios/CustomCode/Modules/Restore/View/OKWordImportView.m +++ b/ios/CustomCode/Modules/Restore/View/OKWordImportView.m @@ -44,7 +44,7 @@ - (void)configSubviews { int column = 0; for (UIView *bgView in _stackView.subviews) { for (int i = 0; i < CountPerRow; ++i) { - + UILabel *indexLabel = [[UILabel alloc]init]; indexLabel.text = [NSString stringWithFormat:@"%d",column * CountPerRow + i + 1]; indexLabel.textColor = HexColor(0x546370); @@ -90,7 +90,7 @@ - (void)layoutSubviews { indexl.frame = CGRectMake(x, 0, width, HeightIndexL); ++j; } - + } - (void)textFieldDidBeginEditing:(UITextField *)textField { @@ -258,7 +258,7 @@ - (void)checkCompleted { } _completed(completed); } - + if (_completed) { _completed(YES); } diff --git a/ios/CustomCode/Modules/ScanQR/OKQRCodeGenerateManager.m b/ios/CustomCode/Modules/ScanQR/OKQRCodeGenerateManager.m index 7e6b4ee67c59..8bfebd56a521 100644 --- a/ios/CustomCode/Modules/ScanQR/OKQRCodeGenerateManager.m +++ b/ios/CustomCode/Modules/ScanQR/OKQRCodeGenerateManager.m @@ -17,21 +17,21 @@ @implementation OKQRCodeGenerateManager + (UIImage *)generateWithDefaultQRCodeData:(NSString *)data imageViewWidth:(CGFloat)imageViewWidth { // 1、创建滤镜对象 CIFilter *filter = [CIFilter filterWithName:@"CIQRCodeGenerator"]; - + // 恢复滤镜的默认属性 [filter setDefaults]; - + // 2、设置数据 NSString *info = data; // 将字符串转换成 NSData *infoData = [info dataUsingEncoding:NSUTF8StringEncoding]; - + // 通过KVC设置滤镜inputMessage数据 [filter setValue:infoData forKeyPath:@"inputMessage"]; - + // 3、获得滤镜输出的图像 CIImage *outputImage = [filter outputImage]; - + return [self createNonInterpolatedUIImageFormCIImage:outputImage withSize:imageViewWidth]; } @@ -39,7 +39,7 @@ + (UIImage *)generateWithDefaultQRCodeData:(NSString *)data imageViewWidth:(CGFl + (UIImage *)createNonInterpolatedUIImageFormCIImage:(CIImage *)image withSize:(CGFloat)size { CGRect extent = CGRectIntegral(image.extent); CGFloat scale = MIN(size/CGRectGetWidth(extent), size/CGRectGetHeight(extent)); - + // 1.创建bitmap; size_t width = CGRectGetWidth(extent) * scale; size_t height = CGRectGetHeight(extent) * scale; @@ -50,7 +50,7 @@ + (UIImage *)createNonInterpolatedUIImageFormCIImage:(CIImage *)image withSize:( CGContextSetInterpolationQuality(bitmapRef, kCGInterpolationNone); CGContextScaleCTM(bitmapRef, scale, scale); CGContextDrawImage(bitmapRef, extent, bitmapImage); - + // 2.保存bitmap到图片 CGImageRef scaledImage = CGBitmapContextCreateImage(bitmapRef); CGContextRelease(bitmapRef); @@ -71,34 +71,34 @@ + (UIImage *)createNonInterpolatedUIImageFormCIImage:(CIImage *)image withSize:( + (UIImage *)generateWithLogoQRCodeData:(NSString *)data logoImageName:(NSString *)logoImageName logoScaleToSuperView:(CGFloat)logoScaleToSuperView { // 1、创建滤镜对象 CIFilter *filter = [CIFilter filterWithName:@"CIQRCodeGenerator"]; - + // 恢复滤镜的默认属性 [filter setDefaults]; - + // 2、设置数据 NSString *string_data = data; // 将字符串转换成 NSdata (虽然二维码本质上是字符串, 但是这里需要转换, 不转换就崩溃) NSData *qrImageData = [string_data dataUsingEncoding:NSUTF8StringEncoding]; - + // 设置过滤器的输入值, KVC赋值 [filter setValue:qrImageData forKey:@"inputMessage"]; - + // 3、获得滤镜输出的图像 CIImage *outputImage = [filter outputImage]; - + // 图片小于(27,27),我们需要放大 outputImage = [outputImage imageByApplyingTransform:CGAffineTransformMakeScale(20, 20)]; - + // 4、将CIImage类型转成UIImage类型 UIImage *start_image = [UIImage imageWithCIImage:outputImage]; - + // - - - - - - - - - - - - - - - - 添加中间小图标 - - - - - - - - - - - - - - - - // 5、开启绘图, 获取图形上下文 (上下文的大小, 就是二维码的大小) UIGraphicsBeginImageContext(start_image.size); - + // 把二维码图片画上去 (这里是以图形上下文, 左上角为(0,0)点 [start_image drawInRect:CGRectMake(0, 0, start_image.size.width, start_image.size.height)]; - + // 再把小图片画上去 NSString *icon_imageName = logoImageName; UIImage *icon_image = [UIImage imageNamed:icon_imageName]; @@ -106,15 +106,15 @@ + (UIImage *)generateWithLogoQRCodeData:(NSString *)data logoImageName:(NSString CGFloat icon_imageH = start_image.size.height * logoScaleToSuperView; CGFloat icon_imageX = (start_image.size.width - icon_imageW) * 0.5; CGFloat icon_imageY = (start_image.size.height - icon_imageH) * 0.5; - + [icon_image drawInRect:CGRectMake(icon_imageX, icon_imageY, icon_imageW, icon_imageH)]; - + // 6、获取当前画得的这张图片 UIImage *final_image = UIGraphicsGetImageFromCurrentImageContext(); - + // 7、关闭图形上下文 UIGraphicsEndImageContext(); - + return final_image; } @@ -128,40 +128,40 @@ + (UIImage *)generateWithLogoQRCodeData:(NSString *)data logoImageName:(NSString + (UIImage *)generateWithColorQRCodeData:(NSString *)data backgroundColor:(CIColor *)backgroundColor mainColor:(CIColor *)mainColor { // 1、创建滤镜对象 CIFilter *filter = [CIFilter filterWithName:@"CIQRCodeGenerator"]; - + // 恢复滤镜的默认属性 [filter setDefaults]; - + // 2、设置数据 NSString *string_data = data; // 将字符串转换成 NSdata (虽然二维码本质上是字符串, 但是这里需要转换, 不转换就崩溃) NSData *qrImageData = [string_data dataUsingEncoding:NSUTF8StringEncoding]; - + // 设置过滤器的输入值, KVC赋值 [filter setValue:qrImageData forKey:@"inputMessage"]; - + // 3、获得滤镜输出的图像 CIImage *outputImage = [filter outputImage]; - + // 图片小于(27,27),我们需要放大 outputImage = [outputImage imageByApplyingTransform:CGAffineTransformMakeScale(9, 9)]; - + // 4、创建彩色过滤器(彩色的用的不多) CIFilter * color_filter = [CIFilter filterWithName:@"CIFalseColor"]; - + // 设置默认值 [color_filter setDefaults]; - + // 5、KVC 给私有属性赋值 [color_filter setValue:outputImage forKey:@"inputImage"]; - + // 6、需要使用 CIColor [color_filter setValue:backgroundColor forKey:@"inputColor0"]; [color_filter setValue:mainColor forKey:@"inputColor1"]; - + // 7、设置输出 CIImage *colorImage = [color_filter outputImage]; - + return [UIImage imageWithCIImage:colorImage]; } diff --git a/ios/CustomCode/Modules/ScanQR/OKQRCodeScanManager.m b/ios/CustomCode/Modules/ScanQR/OKQRCodeScanManager.m index ec6ee4389d96..3109dc8550e6 100644 --- a/ios/CustomCode/Modules/ScanQR/OKQRCodeScanManager.m +++ b/ios/CustomCode/Modules/ScanQR/OKQRCodeScanManager.m @@ -22,13 +22,13 @@ @implementation OKQRCodeScanManager - (void)setupSessionOnController:(UIViewController *)currentController { // 1、获取摄像设备 AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo]; - + // 2、创建设备输入流 AVCaptureDeviceInput *deviceInput = [AVCaptureDeviceInput deviceInputWithDevice:device error:nil]; - + // 3、创建数据输出流 AVCaptureMetadataOutput *metaDataOutput = [[AVCaptureMetadataOutput alloc] init]; - + // 4、设置代理:在主线程里刷新 [metaDataOutput setMetadataObjectsDelegate:self queue:dispatch_get_main_queue()]; // 光源输出 @@ -38,17 +38,17 @@ - (void)setupSessionOnController:(UIViewController *)currentController { // 设置扫描范围(每一个取值0~1,以屏幕右上角为坐标原点) // 注:微信二维码的扫描范围是整个屏幕,这里并没有做处理(可不用设置) // metadataOutput.rectOfInterest = CGRectMake(0.05, 0.2, 0.7, 0.6); - + // 5、创建会话对象 _session = [[AVCaptureSession alloc] init]; // 会话采集率: AVCaptureSessionPresetHigh _session.sessionPreset = AVCaptureSessionPreset1920x1080; // 推荐使用AVCaptureSessionPreset1920x1080,对于小型的二维码读取率较高 - + // 6、添加设备输入流到会话对象 if ([_session canAddInput:deviceInput]) { [_session addInput:deviceInput]; } - + // 7、添加设备输入流到会话对象 if ([_session canAddOutput:metaDataOutput]) { [_session addOutput:metaDataOutput]; @@ -57,12 +57,12 @@ - (void)setupSessionOnController:(UIViewController *)currentController { if ([_session canAddOutput:viewDataOutput]) { [_session addOutput:viewDataOutput]; } - + // 8、设置数据输出类型,需要将数据输出添加到会话后,才能指定元数据类型,否则会报错 // 设置扫码支持的编码格式(如下设置条形码和二维码兼容) // @[AVMetadataObjectTypeQRCode, AVMetadataObjectTypeEAN13Code, AVMetadataObjectTypeEAN8Code, AVMetadataObjectTypeCode128Code] metaDataOutput.metadataObjectTypes = @[AVMetadataObjectTypeQRCode, AVMetadataObjectTypeEAN13Code, AVMetadataObjectTypeEAN8Code, AVMetadataObjectTypeCode128Code]; - + // 9、实例化预览图层, 传递_session是为了告诉图层将来显示什么内容 _videoPreviewLayer = [AVCaptureVideoPreviewLayer layerWithSession:_session]; // 保持纵横比;填充层边界 @@ -100,7 +100,7 @@ - (void)playSound { } void soundCompleteCallback(SystemSoundID soundID, void *clientData){ - + } #pragma mark - - - AVCaptureMetadataOutputObjectsDelegate @@ -132,10 +132,10 @@ - (void)readQRCodeFromPhotoLibraryTo:(UIViewController *)currentController { [self.currentVC presentViewController:imagePicker animated:YES completion:nil]; }); } else { // 用户第一次拒绝了访问相册权限 - + } }]; - + } else if (status == PHAuthorizationStatusAuthorized) { // 用户允许当前应用访问相册 self.isPHAuthorization = YES; UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; @@ -148,14 +148,14 @@ - (void)readQRCodeFromPhotoLibraryTo:(UIViewController *)currentController { NSString *message = [NSString stringWithFormat:@"请前往 -> [设置 - 隐私 - 照片 - %@ 打开访问开关", appName]; UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"温馨提示" message:message preferredStyle:(UIAlertControllerStyleAlert)]; UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) { - + }]; [alertC addAction:alertA]; [self.currentVC presentViewController:alertC animated:YES completion:nil]; } else if (status == PHAuthorizationStatusRestricted) { UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"由于系统原因, 无法访问相册" preferredStyle:(UIAlertControllerStyleAlert)]; UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) { - + }]; [alertC addAction:alertA]; [self.currentVC presentViewController:alertC animated:YES completion:nil]; @@ -184,7 +184,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking NSString *message = @"暂未识别出扫描的二维码"; UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"很抱歉" message:message preferredStyle:(UIAlertControllerStyleAlert)]; UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) { - + }]; [alertC addAction:alertA]; [self.currentVC presentViewController:alertC animated:YES completion:nil]; diff --git a/ios/CustomCode/Modules/Signature/Controller/OKSignatureViewController.m b/ios/CustomCode/Modules/Signature/Controller/OKSignatureViewController.m index 90a700821a65..c8f9684a17a7 100644 --- a/ios/CustomCode/Modules/Signature/Controller/OKSignatureViewController.m +++ b/ios/CustomCode/Modules/Signature/Controller/OKSignatureViewController.m @@ -78,7 +78,7 @@ - (void)stupUI [self.confirmBtn setLayerRadius:20]; [self.confirmBtn setTitle:MyLocalizedString(@"determine", nil) forState:UIControlStateNormal]; [self.textViewBgView setLayerBoarderColor:HexColor(0xDBDEE7) width:1 radius:20]; - + } - (void)viewDidLayoutSubviews @@ -111,7 +111,7 @@ - (void)segmentStyle{ _segHead.deSelectColor = [UIColor blackColor]; _segHead.bottomLineHeight = 0; _segHead.bottomLineColor = [UIColor lightGrayColor]; - + _segHead.slideScale = 0.98; OKWeakSelf(self) [MLMSegmentManager associateHead:_segHead withScroll:nil completion:^{ @@ -305,7 +305,7 @@ - (void)hwNotiManagerDekegate:(OKHwNotiManager *)hwNoti type:(OKHWNotiType)type } }); }else if (type == OKHWNotiTypeKeyConfirm) { - + } } diff --git a/ios/CustomCode/Modules/Signature/Controller/OKVerifySignatureViewController.m b/ios/CustomCode/Modules/Signature/Controller/OKVerifySignatureViewController.m index 30689dc0b9c9..0ecef843d897 100644 --- a/ios/CustomCode/Modules/Signature/Controller/OKVerifySignatureViewController.m +++ b/ios/CustomCode/Modules/Signature/Controller/OKVerifySignatureViewController.m @@ -53,7 +53,7 @@ - (void)stupUI self.topTextView.delegate = self; self.midTextView.delegate = self; self.bottomTextView.delegate = self; - + if (self.signMessageInfo != nil) { self.topTextView.text = [self.signMessageInfo safeStringForKey:@"message"]; self.midTextView.text = [self.signMessageInfo safeStringForKey:@"address"]; diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKAboutViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKAboutViewController.m index db7fd9a0b362..450012763432 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKAboutViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKAboutViewController.m @@ -19,7 +19,7 @@ @implementation OKAboutViewController + (instancetype)aboutViewController { return [[UIStoryboard storyboardWithName:@"Tab_Mine" bundle:nil] instantiateViewControllerWithIdentifier:@"OKAboutViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; @@ -75,17 +75,17 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath - (NSArray *)allData { if (!_allData) { - + OKAboutTableViewCellModel *model1 = [[OKAboutTableViewCellModel alloc]init]; model1.titleStr = MyLocalizedString(@"Version update", nil); NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"]; model1.descStr = [NSString stringWithFormat:@"v%@",app_Version]; - + OKAboutTableViewCellModel *model2 = [[OKAboutTableViewCellModel alloc]init]; model2.titleStr = MyLocalizedString(@"User agreement", nil); model2.descStr = @""; - + _allData = @[model1,model2]; } return _allData; diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKAllAssetsViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKAllAssetsViewController.m index 355988985d82..8abd4f615e6e 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKAllAssetsViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKAllAssetsViewController.m @@ -27,7 +27,7 @@ @implementation OKAllAssetsViewController + (instancetype)allAssetsViewController { return [[UIStoryboard storyboardWithName:@"Tab_Mine" bundle:nil] instantiateViewControllerWithIdentifier:@"OKAllAssetsViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; @@ -61,7 +61,7 @@ - (void)refreshFooterViewByCount:(NSUInteger)count { self.tableView.tableFooterView = [UIView new]; return; } - + UILabel *lab = [UILabel new]; lab.font = [UIFont systemFontOfSize:21]; lab.textColor = HexColor(0x9FA6AD); @@ -69,8 +69,8 @@ - (void)refreshFooterViewByCount:(NSUInteger)count { lab.textAlignment = NSTextAlignmentCenter; [lab sizeToFit]; self.tableView.tableFooterView = lab; - - + + } #pragma mark - UITableViewDataSource ,UITableViewDelegate - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKChangePwdViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKChangePwdViewController.m index ed96d7225c1d..cc90eb75b724 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKChangePwdViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKChangePwdViewController.m @@ -35,7 +35,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath { [OKValidationPwdController showValidationPwdPageOn:self isDis:NO complete:^(NSString * _Nonnull pwd) { OKPwdViewController *pwdVc = [OKPwdViewController setPwdViewControllerPwdUseType:OKPwdUseTypeUpdatePassword setPwd:^(NSString * _Nonnull pwd) { - + }]; pwdVc.oldPwd = pwd; [weakself.OK_TopViewController.navigationController pushViewController:pwdVc animated:YES]; @@ -52,6 +52,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath default: break; } - + } @end diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKDeleteWalletTipsViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKDeleteWalletTipsViewController.m index 450a821c9805..b1be8d1fc004 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKDeleteWalletTipsViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKDeleteWalletTipsViewController.m @@ -30,7 +30,7 @@ + (instancetype)deleteWalletTipsViewController - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. - + switch (self.deleteType) { case OKWhereToDeleteTypeMine: { @@ -54,13 +54,13 @@ - (void)viewDidLoad { self.descLabel.text = MyLocalizedString(@"This will delete all the data in the App, including the currently created wallet and custom Settings. This operation is irrevocable. Please make a backup of your wallet before deleting it so that you can recover your assets", nil); [self.titleLabel setTitle:MyLocalizedString(@"⚠️ risk warning", nil) forState:UIControlStateNormal]; [self.deleteBtn setTitle:MyLocalizedString(@"Reset the App", nil) forState:UIControlStateNormal]; - + } break; default: break; } - + [self.iAgree setTitle:[NSString stringWithFormat:@" %@",MyLocalizedString(@"I am aware of the above risks", nil)] forState:UIControlStateNormal]; [self.iAgree setImage:[UIImage imageNamed:@"notselected"] forState:UIControlStateNormal]; [self.iAgree setImage:[UIImage imageNamed:@"isselected"] forState:UIControlStateSelected]; @@ -133,7 +133,7 @@ - (void)deleteWallet:(NSString *)pwd [kWalletManager clearCurrentWalletInfo]; [[NSNotificationCenter defaultCenter]postNotificationName:kNotiDeleteWalletComplete object:nil]; [kTools tipMessage:MyLocalizedString(@"Wallet deleted successfully", nil)]; - + if (weakself.deleteType == OKWhereToDeleteTypeMine) { for (int i = 0; i < weakself.navigationController.viewControllers.count; i++) { UIViewController *vc = weakself.navigationController.viewControllers[i]; @@ -161,7 +161,7 @@ - (void)resetAPP [kTools alertTips:MyLocalizedString(@"prompt", nil) desc:MyLocalizedString(@"Reset successful, please restart the application.", nil) confirm:^{ [weakself exitApplication]; } cancel:^{ - + } vc:self conLabel:MyLocalizedString(@"determine", nil) isOneBtn:YES]; } } diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKFiatSelectViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKFiatSelectViewController.m index 1e7dc042cdb0..528061951037 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKFiatSelectViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKFiatSelectViewController.m @@ -21,14 +21,14 @@ @implementation OKFiatSelectViewController + (instancetype)fiatSelectViewController { return [[UIStoryboard storyboardWithName:@"Tab_Mine" bundle:nil] instantiateViewControllerWithIdentifier:@"OKFiatSelectViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. self.title = MyLocalizedString(@"Legal tender units", nil); self.tableView.tableFooterView = [UIView new]; - + self.allData = kWalletManager.supportFiatArray; } diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKHDWalletViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKHDWalletViewController.m index e1ada736f602..c4c695962e35 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKHDWalletViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKHDWalletViewController.m @@ -62,7 +62,7 @@ - (void)stupUI self.accountDescLabel.text = MyLocalizedString(@"Support BTC, ETH and other main chain", nil); [self.countBgView setLayerRadius:10]; [self.footerBgView setLayerDefaultRadius]; - + NSString *labelText = MyLocalizedString(@"management", nil); CGFloat labelW = [labelText getWidthWithHeight:30 font:14]; CGFloat labelmargin = 10; @@ -71,16 +71,16 @@ - (void)stupUI label.text = labelText; label.font = [UIFont boldSystemFontOfSize:14]; label.textColor = HexColor(0x26CF02); - + UIView *rightView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, labelW + labelmargin * 2, labelH)]; rightView.backgroundColor = HexColorA(0x26CF02, 0.1); [rightView setLayerRadius:labelH * 0.5]; [rightView addSubview:label]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]initWithCustomView:rightView]; - + UITapGestureRecognizer *tapRightViewClick = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapRightViewClick)]; [rightView addGestureRecognizer:tapRightViewClick]; - + [self.footerBgView setLayerBoarderColor:HexColorA(0x546370, 0.3) width:1 radius:20]; } @@ -118,7 +118,7 @@ - (void)refreshListData self.countLabel.text = [NSString stringWithFormat:@"%zd",self.showList.count]; self.headerTitleLabel.text = MyLocalizedString(@"HD derived wallet", nil); self.footerBgView.hidden = self.showList.count == 0 ? YES : NO; - + if (self.showList.count == 0) { self.navigationItem.rightBarButtonItem.customView.userInteractionEnabled = NO; self.navigationItem.rightBarButtonItem.customView.alpha = 0.5; @@ -153,7 +153,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell.model = model; return cell; } - + static NSString *ID = @"OKWalletListTableViewCell"; OKWalletListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:ID]; if (cell == nil) { @@ -196,7 +196,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath }]; BaseNavigationController *baseVc = [[BaseNavigationController alloc]initWithRootViewController:pwdVc]; [weakself.OK_TopViewController presentViewController:baseVc animated:YES completion:nil]; - + } }]; } @@ -278,17 +278,17 @@ - (void)dealloc - (NSArray *)NoHDArray { if (!_NoHDArray) { - + OKWalletListNoHDTableViewCellModel *model1 = [OKWalletListNoHDTableViewCellModel new]; model1.iconName = @"retorei_add"; model1.titleStr = MyLocalizedString(@"Add HD Wallet", nil); model1.descStr = MyLocalizedString(@"Support BTC, ETH and other main chain", nil); - + OKWalletListNoHDTableViewCellModel *model2 = [OKWalletListNoHDTableViewCellModel new]; model2.iconName = @"restore_phone"; model2.titleStr = MyLocalizedString(@"Restore the purse", nil); model2.descStr = MyLocalizedString(@"Import through mnemonic", nil); - + _NoHDArray = @[model1,model2]; } return _NoHDArray; diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKLanguageViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKLanguageViewController.m index 39d264af73c3..1a5682baf0a6 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKLanguageViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKLanguageViewController.m @@ -104,19 +104,19 @@ - (NSArray *)allData { if (!_allData) { AppLanguageType type = kLocalizableManager.languageType; ; - + OKLanguageCellModel *model1 = [[OKLanguageCellModel alloc]init]; model1.titleStr = MyLocalizedString(@"Following system language", nil); model1.isSelected = type == AppLanguageTypeFollowSys; - + OKLanguageCellModel *model2 = [[OKLanguageCellModel alloc]init]; model2.titleStr = @"中文(简体)"; model2.isSelected = type == AppLanguageTypeZh_Hans; - + OKLanguageCellModel *model3 = [[OKLanguageCellModel alloc]init]; model3.titleStr = @"English"; model3.isSelected = type == AppLanguageTypeEn; - + _allData = @[model1,model2,model3]; } return _allData; diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKMonetaryUnitViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKMonetaryUnitViewController.m index d2e08ca5e7f1..1d6fb605dc43 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKMonetaryUnitViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKMonetaryUnitViewController.m @@ -24,7 +24,7 @@ @implementation OKMonetaryUnitViewController + (instancetype)monetaryUnitViewController { return [[UIStoryboard storyboardWithName:@"Tab_Mine" bundle:nil] instantiateViewControllerWithIdentifier:@"OKMonetaryUnitViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; @@ -141,9 +141,9 @@ - (NSArray *)allData { if (!_allData) { NSMutableArray *allDataM = [NSMutableArray array]; - + NSMutableArray *moneyUnitGroup = [NSMutableArray array]; - + for (int i = 0; i < 3; i++) { NSString *type = kWalletManager.supportFiatArray[i]; OKUnitTableViewCellModel *model1 = [[OKUnitTableViewCellModel alloc]init]; @@ -152,40 +152,40 @@ - (NSArray *)allData model1.type = GroupTypeFait; [moneyUnitGroup addObject:model1]; } - + [allDataM addObject:moneyUnitGroup]; - + NSMutableArray *btcUnitGroup = [NSMutableArray array]; - + OKUnitTableViewCellModel *model4 = [[OKUnitTableViewCellModel alloc]init]; model4.titleStr = @"BTC"; model4.type = GroupTypeBitcoinUnit; model4.typeString = model4.titleStr; [btcUnitGroup addObject:model4]; - + OKUnitTableViewCellModel *model5 = [[OKUnitTableViewCellModel alloc]init]; model5.titleStr = @"mBTC"; model5.descStr = @"=0.001 BTC"; model5.type = GroupTypeBitcoinUnit; model5.typeString = model5.titleStr; [btcUnitGroup addObject:model5]; - - + + OKUnitTableViewCellModel *model6 = [[OKUnitTableViewCellModel alloc]init]; model6.titleStr = @"bits"; model6.descStr = @"=0.000001 BTC"; model6.type = GroupTypeBitcoinUnit; model6.typeString = model6.titleStr; [btcUnitGroup addObject:model6]; - + OKUnitTableViewCellModel *model7 = [[OKUnitTableViewCellModel alloc]init]; model7.titleStr = @"sat"; model7.descStr = @"=0.00000001 BTC"; model7.type = GroupTypeBitcoinUnit; model7.typeString = model7.titleStr; [btcUnitGroup addObject:model7]; - - + + // NSMutableArray *ethUnitGroup = [NSMutableArray array]; // OKUnitTableViewCellModel *model8 = [[OKUnitTableViewCellModel alloc]init]; // model8.titleStr = @"ETH"; @@ -193,7 +193,7 @@ - (NSArray *)allData // model8.type = GroupTypeBitcoinETH; // [ethUnitGroup addObject:model8]; // - + [allDataM addObject:btcUnitGroup]; // [allDataM addObject:ethUnitGroup]; _allData = allDataM; diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKNetworkViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKNetworkViewController.m index 72ec703ce236..8ea71a3360f4 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKNetworkViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKNetworkViewController.m @@ -31,18 +31,18 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. self.title = MyLocalizedString(@"network", nil); - + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(userSetingSysServerComplete) name:kUserSetingSysServerComplete object:nil]; [self userSetingSysServerComplete]; - + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(userSetingBtcBComplete) name:kUserSetingBtcBComplete object:nil]; [self userSetingBtcBComplete]; - + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(userSetingMarketSource) name:kUserSetingMarketSource object:nil]; [self userSetingMarketSource]; - - + + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(userSetingElectrumServer) name:kUserSetingElectrumServer object:nil]; [self userSetingElectrumServer]; } diff --git a/ios/CustomCode/Modules/Tab_Mine/Controller/OKTradeSettingViewController.m b/ios/CustomCode/Modules/Tab_Mine/Controller/OKTradeSettingViewController.m index 06dd06fdee8e..160b65cd3b24 100644 --- a/ios/CustomCode/Modules/Tab_Mine/Controller/OKTradeSettingViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/Controller/OKTradeSettingViewController.m @@ -23,20 +23,20 @@ @implementation OKTradeSettingViewController + (instancetype)tradeSettingViewController { return [[UIStoryboard storyboardWithName:@"Tab_Mine" bundle:nil] instantiateViewControllerWithIdentifier:@"OKTradeSettingViewController"]; - + } - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. [self stupUI]; - + } - (void)stupUI { self.title = MyLocalizedString(@"Transaction Settings (Advanced)", nil); self.tableView.tableFooterView = [UIView new]; self.topTipsLabel.text = MyLocalizedString(@"The following Settings apply to the Bitcoin account for the hardware wallet", nil); - + NSString *labelText = MyLocalizedString(@"Restore the default", nil); CGFloat labelW = [labelText getWidthWithHeight:30 font:14]; CGFloat labelmargin = 10; @@ -45,13 +45,13 @@ - (void)stupUI label.text = labelText; label.font = [UIFont boldSystemFontOfSize:14]; label.textColor = HexColor(0x26CF02); - + UIView *rightView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, labelW + labelmargin * 2, labelH)]; rightView.backgroundColor = HexColorA(0x26CF02, 0.1); [rightView setLayerRadius:labelH * 0.5]; [rightView addSubview:label]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]initWithCustomView:rightView]; - + UITapGestureRecognizer *tapRightViewClick = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapRightViewClick)]; [rightView addGestureRecognizer:tapRightViewClick]; } @@ -91,13 +91,13 @@ - (NSArray *)allData model1.titleStr = MyLocalizedString(@"Use RBF (trade substitution)", nil); model1.switchOn = kUserSettingManager.rbfFlag; model1.index = 0; - + OKTradeSettingViewCellModel *model2 = [[OKTradeSettingViewCellModel alloc]init]; model2.titleStr = MyLocalizedString(@"Spend unrecognized income", nil); model2.switchOn = kUserSettingManager.unconfFlag; model2.index = 1; _allData = @[model1,model2]; - + return _allData; } @@ -122,7 +122,7 @@ - (void)switchClick:(OKTradeSettingViewCellModel *)model on:(BOOL)on [kUserSettingManager setUnconfFlag:on]; } break; - + default: break; } diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListCellModel.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListCellModel.m index ba6464780226..f2237e322f6e 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListCellModel.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListCellModel.m @@ -15,5 +15,3 @@ - (void)setName:(NSString *)name { self.title = name; } @end - - diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListViewController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListViewController.m index 68ece40d735c..5d7d3ace1955 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceList/OKDeviceListViewController.m @@ -55,7 +55,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - + static NSString *cellID = @"OKHardwareListBaseCell"; OKHardwareListBaseCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; if (cell == nil) { @@ -93,7 +93,7 @@ - (void)reloadDeviceList { [self.deviceCells removeAllObjects]; NSArray *devices = [OKDevicesManager sharedInstance].devices.allValues; - + for (OKDeviceModel *device in devices) { OKDeviceListCellModel *deviceCell = [[OKDeviceListCellModel alloc] init]; deviceCell.devcie = device; diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyController.m index b474cc325ce3..eeb31eec190b 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyController.m @@ -41,7 +41,7 @@ - (void)viewDidLoad { self.stage1Label.text = MyLocalizedString(@"hardwareWallet.verify.connectingDevice", nil); self.stage2Label.text = MyLocalizedString(@"hardwareWallet.verify.getSign", nil); self.stage3Label.text = MyLocalizedString(@"hardwareWallet.verify.submitting", nil); - + [self.tagLabel setLayerRadius:self.tagLabel.height * 0.5]; [self.processView setLayerRadius:20]; [self.stage1ImageView.layer addAnimation:self.rotationAnimation forKey:@"rotationAnimation"]; @@ -63,7 +63,7 @@ - (void)verifyHardware { BOOL pass = NO; NSDictionary *result; NSString *json = [kPyCommandsManager callInterface:kInterfacehardware_verify parameter:@{@"msg":[NSUUID UUID].UUIDString}]; - + if ([json isKindOfClass:NSString.class]) { // 非标准 json, 临时解决 json = [json stringByReplacingOccurrencesOfString:@": True" withString:@": true"]; @@ -74,7 +74,7 @@ - (void)verifyHardware { BOOL is_bixinkey = [result objectForKey:@"is_bixinkey"]; BOOL is_verified = [result objectForKey:@"is_verified"]; pass = is_bixinkey && is_verified; - + dispatch_async(dispatch_get_main_queue(), ^{ self.phase = OKDeviceVerifyPhaseSubmitting; [self showResult:pass]; @@ -119,7 +119,7 @@ - (void)setPhase:(OKDeviceVerifyPhase)phase { _phase = phase; if (phase == OKDeviceVerifyPhaseConnecting) { - + } else if (phase == OKDeviceVerifyPhaseFetching) { [self.stage1ImageView.layer removeAllAnimations]; self.stage1ImageView.image = [UIImage imageNamed:@"isselected"]; @@ -130,7 +130,7 @@ - (void)setPhase:(OKDeviceVerifyPhase)phase { [self.stage3ImageView.layer removeAllAnimations]; self.stage3ImageView.image = [UIImage imageNamed:@"isselected"]; } - + } @end diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyResultController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyResultController.m index 56048bbad4f1..821f9d5d9295 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyResultController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/DeviceVerify/OKDeviceVerifyResultController.m @@ -28,7 +28,7 @@ - (void)viewDidLoad { [super viewDidLoad]; [self setNavigationBarBackgroundColorWithClearColor]; self.navigationItem.leftBarButtonItem = [UIBarButtonItem backBarButtonItemWithTarget:self selector:@selector(back)]; - + self.title = MyLocalizedString(@"hardwareWallet.verify", nil); NSString *descLabelText; if (self.isPassed) { diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceDeleteController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceDeleteController.m index bfe3a15d3342..29e74f751df6 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceDeleteController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceDeleteController.m @@ -33,7 +33,7 @@ - (void)viewDidLoad { - (void)setupUI { [self.bgView setLayerRadius:20]; - + self.titleLabel.text = MyLocalizedString(@"hardwareWallet.delete", nil); NSString *tip = MyLocalizedString(@"hardwareWallet.delete.tip", nil); NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:tip]; @@ -41,7 +41,7 @@ - (void)setupUI { paragraphStyle.lineSpacing = 15; [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, tip.length)]; self.tipLabel.attributedText = attributedString; - + self.deleteButton.titleLabel.text = MyLocalizedString(@"hardwareWallet.delete", nil); [self.deleteButton setLayerRadius:20]; diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceLanguageViewController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceLanguageViewController.m index 118ca16e379d..191237320085 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceLanguageViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceLanguageViewController.m @@ -27,7 +27,7 @@ - (void)viewDidLoad { [super viewDidLoad]; self.title = MyLocalizedString(@"language", nil); self.descLabel.text = MyLocalizedString(@"hardwareWallet.lanuage.desc", nil); - + self.isChinese = YES; // TODO: sync with device. UITapGestureRecognizer *tapCN = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(changeLanguageCN)]; [self.chineseCell addGestureRecognizer:tapCN]; @@ -51,7 +51,7 @@ - (void)setIsChinese:(BOOL)isChinese { _isChinese = isChinese; self.chineseCheckView.hidden = !isChinese; self.englishCheckView.hidden = !self.chineseCheckView.hidden; - + // TODO: sync with device. } diff --git a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceOffController.m b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceOffController.m index 665ebc6b7214..a9a137d8660a 100644 --- a/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceOffController.m +++ b/ios/CustomCode/Modules/Tab_Mine/HardwareSetting/OKDeviceOffController.m @@ -28,13 +28,13 @@ - (void)viewDidLoad { self.descLabel.text = MyLocalizedString(@"hardwareWallet.autoOff.desc", nil); self.timeLabel.text = MyLocalizedString(@"hardwareWallet.autoOff.timeout", nil); self.unitLabel.text = MyLocalizedString(@"hardwareWallet.autoOff.second", nil); - + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(timeViewClicked)]; [self.timeView addGestureRecognizer:tap]; } - (void)timeViewClicked { - + } diff --git a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKElectrumNodeViewController.m b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKElectrumNodeViewController.m index 7d44d57e18f2..f42f0ab39e43 100644 --- a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKElectrumNodeViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKElectrumNodeViewController.m @@ -32,14 +32,14 @@ + (instancetype)electrumNodeViewController - (void)viewDidLoad { [super viewDidLoad]; - + self.title = MyLocalizedString(@"Electrum node", nil); self.titleLabel.text = MyLocalizedString(@"Electrum node selection college node traded using the open source distributed radio and access to information on the chain", nil); self.alternativeNodesLabel.text = MyLocalizedString(@"Alternative nodes", nil); self.ipRTextField.userInteractionEnabled = NO; self.portRTextField.userInteractionEnabled = NO; self.tableView.tableFooterView = [UIView new]; - + NSDictionary *dict = [kPyCommandsManager callInterface:kInterfaceget_server_list parameter:@{}]; NSArray *keys = [dict allKeys]; NSMutableArray *arrayM = [NSMutableArray array]; diff --git a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKNetSetingViewController.m b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKNetSetingViewController.m index 02b8cf1330dd..57dd658e26dc 100644 --- a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKNetSetingViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKNetSetingViewController.m @@ -31,15 +31,15 @@ + (instancetype)netSetingViewController } - (void)viewDidLoad { - + [super viewDidLoad]; - + [self.confirmBtn setLayerRadius:20]; - + self.title = MyLocalizedString(@"Synchronous server", nil); - + self.titleLabel.text = MyLocalizedString(@"The synchronous server USES the synchronous server to back up and restore multi-signature wallet, and synchronizes unsigned transactions among multiple co-signers; The synchronization server stores only public information such as the wallet public key and name, and does not store any private keys and personal information", nil); - + NSString *labelText = MyLocalizedString(@"Restore the default", nil); CGFloat labelW = [labelText getWidthWithHeight:30 font:14]; CGFloat labelmargin = 10; @@ -48,25 +48,25 @@ - (void)viewDidLoad { label.text = labelText; label.font = [UIFont boldSystemFontOfSize:14]; label.textColor = HexColor(0x26CF02); - + UIView *rightView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, labelW + labelmargin * 2, labelH)]; rightView.backgroundColor = HexColorA(0x26CF02, 0.1); [rightView setLayerRadius:labelH * 0.5]; [rightView addSubview:label]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]initWithCustomView:rightView]; - + UITapGestureRecognizer *tapRightViewClick = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapRightViewClick)]; [rightView addGestureRecognizer:tapRightViewClick]; self.defaultSeting = [kPyCommandsManager callInterface:kInterfaceget_sync_server_host parameter:@{}]; - + if (kUserSettingManager.sysServerFlag) { self.switchR.on = YES; }else{ self.switchR.on = NO; } [self.confirmBtn checkBtnStatus:self.switchR.isOn]; - - + + if (kUserSettingManager.currentSynchronousServer == nil || kUserSettingManager.currentSynchronousServer.length == 0) { [self refreshUI:self.defaultSeting]; }else{ @@ -104,7 +104,7 @@ - (void)tapRightViewClick [kPyCommandsManager callInterface:kInterfaceset_syn_server parameter:@{@"flag":flag}]; [kUserSettingManager setSysServerFlag:sender.isOn]; [self.confirmBtn checkBtnStatus:sender.isOn]; - + [self refreshUI:self.defaultSeting]; } @@ -120,18 +120,18 @@ - (IBAction)switchRClick:(UISwitch *)sender { } - (IBAction)confirmBtnClick:(UIButton *)sender { - + if (self.ipRTextField.text.length == 0) { [kTools tipMessage:MyLocalizedString(@"The IP address cannot be empty", nil)]; return; } - + if (self.portRLabel.text.length == 0) { [kTools tipMessage:MyLocalizedString(@"The port cannot be empty", nil)]; return; } - - + + [kPyCommandsManager callInterface:kInterfaceset_sync_server_host parameter:@{@"ip":self.ipRTextField.text , @"port":self.portRLabel.text}]; NSString *ipportStr = [NSString stringWithFormat:@"%@:%@",self.ipRTextField.text,self.portRLabel.text]; [kUserSettingManager setCurrentSynchronousServer:ipportStr]; diff --git a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKProxyServerTableViewController.m b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKProxyServerTableViewController.m index 9bc8bc96c3fd..fa86c4712e16 100644 --- a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKProxyServerTableViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKProxyServerTableViewController.m @@ -40,7 +40,7 @@ + (instancetype)proxyServerTableViewController } - (void)viewDidLoad { [super viewDidLoad]; - + self.title = MyLocalizedString(@"Proxy server", nil); self.serverLLabel.text = MyLocalizedString(@"Using a proxy server", nil); self.nodeTypeLabel.text = MyLocalizedString(@"The node type", nil); @@ -49,7 +49,7 @@ - (void)viewDidLoad { self.pwdLLabel.text = MyLocalizedString(@"password", nil); self.NodeTypeRLabel.text = @""; [self.confirmBtn setLayerRadius:20]; - + OKProxyServerModel *model = [OKProxyServerModel mj_objectWithKeyValues:[kUserSettingManager.currentProxyDict mj_JSONObject]]; self.currentModel = model; self.serverSwitch.on = self.currentModel.proxyOn; @@ -67,7 +67,7 @@ - (void)changetextFieldData self.portRTextField.userInteractionEnabled = YES; self.userNameTextField.userInteractionEnabled = YES; self.pwdTextField.userInteractionEnabled = YES; - + self.NodeTypeRLabel.text = self.currentModel.type; self.ipaddressTextField.text = self.currentModel.ipAddress; self.portRTextField.text = self.currentModel.port; @@ -80,7 +80,7 @@ - (void)changetextFieldData self.portRTextField.userInteractionEnabled = NO; self.userNameTextField.userInteractionEnabled = NO; self.pwdTextField.userInteractionEnabled = NO; - + self.NodeTypeRLabel.text = @""; self.ipaddressTextField.text = @""; self.portRTextField.text = @""; diff --git a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKSocketTypeSelectController.m b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKSocketTypeSelectController.m index 9019f0137b67..e636cb77b623 100644 --- a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKSocketTypeSelectController.m +++ b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKSocketTypeSelectController.m @@ -40,10 +40,10 @@ - (void)viewDidLoad { UITapGestureRecognizer *socket4Tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(socket4TapClick)]; [self.socket4BgView addGestureRecognizer:socket4Tap]; - + UITapGestureRecognizer *socket5Tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(socket5TapClick)]; [self.scoket5BgView addGestureRecognizer:socket5Tap]; - + } - (IBAction)closeBtnClick:(UIButton *)sender { diff --git a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKTheMarketViewController.m b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKTheMarketViewController.m index 3ee4c5ddf59e..4a70de50ff48 100644 --- a/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKTheMarketViewController.m +++ b/ios/CustomCode/Modules/Tab_Mine/NetSeting/OKTheMarketViewController.m @@ -27,16 +27,16 @@ + (instancetype)theMarketViewController - (void)viewDidLoad { [super viewDidLoad]; - + self.title = MyLocalizedString(@"Price quotation", nil); self.topDescLabel.text = MyLocalizedString(@"Choosing the right market source only affects the PRICE display of BTC and ETH", nil); self.tableView.dataSource = self; self.tableView.delegate = self; self.tableView.tableFooterView = [UIView new]; - + self.allData = [kPyCommandsManager callInterface:kInterfaceget_exchanges parameter:@{}]; [self.tableView reloadData]; - + } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section diff --git a/ios/CustomCode/Modules/Tab_Mine/View/OKAllAssetsTableViewCell.m b/ios/CustomCode/Modules/Tab_Mine/View/OKAllAssetsTableViewCell.m index c083b914597e..4ae769962719 100644 --- a/ios/CustomCode/Modules/Tab_Mine/View/OKAllAssetsTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Mine/View/OKAllAssetsTableViewCell.m @@ -24,19 +24,19 @@ @implementation OKAllAssetsTableViewCell - (void)setModel:(OKAllAssetsTableViewCellModel *)model { _model = model; - + self.iconImageView.image = [UIImage imageNamed:@"token_btc"]; self.cointypeLabel.text = model.name; self.balanceLabel.text = model.btc; self.moneyLabel.text = model.fiat; - + } - (void)awakeFromNib { [super awakeFromNib]; // Initialization code - + } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { diff --git a/ios/CustomCode/Modules/Tab_Mine/View/OKMineTableViewCell.m b/ios/CustomCode/Modules/Tab_Mine/View/OKMineTableViewCell.m index c206d7c05320..c4f6e722cdc1 100644 --- a/ios/CustomCode/Modules/Tab_Mine/View/OKMineTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Mine/View/OKMineTableViewCell.m @@ -23,10 +23,10 @@ @implementation OKMineTableViewCell - (void)setModel:(OKMineTableViewCellModel *)model { _model = model; - + self.iconView.image = [UIImage imageNamed:model.imageName]; self.titleLabel.text = model.menuName; - + if (_model.isAuth) { self.rightSwitch.hidden = NO; self.rightArrow.hidden = YES; diff --git a/ios/CustomCode/Modules/Tab_Mine/View/OKTradeSettingViewCell.m b/ios/CustomCode/Modules/Tab_Mine/View/OKTradeSettingViewCell.m index 313b7f6ef8d4..ff3d68caa236 100644 --- a/ios/CustomCode/Modules/Tab_Mine/View/OKTradeSettingViewCell.m +++ b/ios/CustomCode/Modules/Tab_Mine/View/OKTradeSettingViewCell.m @@ -36,7 +36,7 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated { } - (IBAction)rightSwitchClick:(UISwitch *)sender { - + if ([self.delegate respondsToSelector:@selector(switchClick:on:)]) { [self.delegate switchClick:self.model on:sender.isOn]; } diff --git a/ios/CustomCode/Modules/Tab_Mine/View/OKUnitTableViewCell.m b/ios/CustomCode/Modules/Tab_Mine/View/OKUnitTableViewCell.m index 30b81edcf0b0..0e7e6a8e36d2 100644 --- a/ios/CustomCode/Modules/Tab_Mine/View/OKUnitTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Mine/View/OKUnitTableViewCell.m @@ -22,7 +22,7 @@ - (void)setModel:(OKUnitTableViewCellModel *)model { _model = model; self.titleLabel.text = model.titleStr; - + if (model.type == GroupTypeFait) { NSString *fiat = kWalletManager.currentFiat; self.checkImageView.hidden = ![fiat isEqualToString:model.typeString]; @@ -34,8 +34,8 @@ - (void)setModel:(OKUnitTableViewCellModel *)model }else{ self.checkImageView.hidden = YES; } - - + + if (model.descStr.length == 0 || model.descStr == nil) { self.descLabel.hidden = YES; }else{ diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKDeleteWalletConfirmController.m b/ios/CustomCode/Modules/Tab_Wallet/OKDeleteWalletConfirmController.m index c4ead527e3e3..62cf963a6a8b 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKDeleteWalletConfirmController.m +++ b/ios/CustomCode/Modules/Tab_Wallet/OKDeleteWalletConfirmController.m @@ -41,7 +41,7 @@ - (void)viewDidLoad { [self.contentView setLayerRadius:20]; [self.confirmDeleteBtn setLayerRadius:20]; [self.cancleBtn setLayerBoarderColor:HexColor(0xDBDEE7) width:1 radius:20]; - + switch (self.type) { case OKDeleteTipsTypeWallet: { @@ -69,8 +69,8 @@ - (void)viewDidLoad { default: break; } - - + + } - (IBAction)closeBtnClick:(UIButton *)sender { [self dismissViewControllerAnimated:NO completion:nil]; diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKEditWalletNameViewController.m b/ios/CustomCode/Modules/Tab_Wallet/OKEditWalletNameViewController.m index de985ace2bd9..c1a3a75e525e 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKEditWalletNameViewController.m +++ b/ios/CustomCode/Modules/Tab_Wallet/OKEditWalletNameViewController.m @@ -35,7 +35,7 @@ + (instancetype)editWalletNameViewController:(ConfirmBtnClick)btnClick - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. - + [self.contentView setLayerRadius:20]; [self.confirmBtn setLayerRadius:20]; [self.textFieldBgView setLayerBoarderColor:HexColor(0xDBDEE7) width:1 radius:20]; @@ -51,17 +51,17 @@ - (IBAction)confirmBtnClick:(UIButton *)sender { [kTools tipMessage:MyLocalizedString(@"The wallet name cannot be empty", nil)]; return; } - + if ([self.textField.text isEqualToString:kWalletManager.currentWalletInfo.label]) { [self closeBtnClick:nil]; return; } - + if (![kWalletManager checkWalletName:self.textField.text]) { [kTools tipMessage:MyLocalizedString(@"Wallet names cannot exceed 15 characters", nil)]; return; } - + NSString *msg = [kPyCommandsManager callInterface:kInterfacerename_wallet parameter:@{@"old_name": kWalletManager.currentWalletInfo.name,@"new_name" : self.textField.text}]; if (msg != nil) { [kTools tipMessage:MyLocalizedString(@"Name modification successful", nil)]; diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKFirstUseViewController.m b/ios/CustomCode/Modules/Tab_Wallet/OKFirstUseViewController.m index 93bd98a3db32..cc9fcfbf16c2 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKFirstUseViewController.m +++ b/ios/CustomCode/Modules/Tab_Wallet/OKFirstUseViewController.m @@ -34,7 +34,7 @@ @implementation OKFirstUseViewController - (void)viewDidLoad { [super viewDidLoad]; [self stupUI]; - + } - (void)stupUI @@ -47,7 +47,7 @@ - (void)stupUI self.desc1Labelsub.attributedText = [NSString lineSpacing:13 content:MyLocalizedString(@"Our server will not store your private key or mnemonic in any way. Both software and hardware are open source and can be used safely", nil)]; self.desc2Label.text = MyLocalizedString(@"End-to-end encryption", nil); self.desc2Labelsub.attributedText = [NSString lineSpacing:13 content:MyLocalizedString(@"We use industry-leading encryption technology to store information locally. Only you can decrypt the information, we will not and cannot view, use or sell any of your data", nil)]; - + NSString *content = MyLocalizedString(@"By starting to use, you agree to Onekey's User Agreement and Privacy Policy", nil); // 设置文字 self.textViewClick.text = content; @@ -58,17 +58,17 @@ - (void)stupUI [self.textViewClick setUnderlineTextWithRange:range1 withUnderlineColor:HexColor(RGB_THEME_GREEN) withClickCoverColor:nil withBlock:^(NSString *clickText) { WebViewVC *webVc = [WebViewVC loadWebViewControllerWithTitle:@"OneKey" url:kTheServiceAgreement useProxy:YES]; [weakself.navigationController pushViewController:webVc animated:YES]; - + }]; NSRange range2 = [content rangeOfString:MyLocalizedString(@"Privacy policy", nil)]; [self.textViewClick setUnderlineTextWithRange:range2 withUnderlineColor:HexColor(RGB_THEME_GREEN) withClickCoverColor:nil withBlock:^(NSString *clickText) { WebViewVC *webVc = [WebViewVC loadWebViewControllerWithTitle:@"OneKey" url:kPrivacyAgreement useProxy:YES]; [weakself.navigationController pushViewController:webVc animated:YES]; }]; - + [self.startBtn setTitle:MyLocalizedString(@"Begin to use", nil) forState:UIControlStateNormal]; self.navigationController.delegate = self; - + [self checkUI]; } diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKPrivateKeyExportViewController.m b/ios/CustomCode/Modules/Tab_Wallet/OKPrivateKeyExportViewController.m index ddf3154fd93a..74b300930d0f 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKPrivateKeyExportViewController.m +++ b/ios/CustomCode/Modules/Tab_Wallet/OKPrivateKeyExportViewController.m @@ -57,10 +57,10 @@ - (void)stupUI [self.greenView setLayerRadius:2]; [self.QRBgView setLayerRadius:20]; [self.showQRImageBgView setLayerRadius:14]; - + UITapGestureRecognizer *tapp = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(privateKeyBgViewClick)]; [self.privateKeyBgView addGestureRecognizer:tapp]; - + UITapGestureRecognizer *tapshowQr = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapshowQrClick)]; [self.showQRImageBgView addGestureRecognizer:tapshowQr]; self.showQrLabel.text = MyLocalizedString(@"Display qr code", nil); diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKTxListViewController.m b/ios/CustomCode/Modules/Tab_Wallet/OKTxListViewController.m index d9ee4d3f7285..c97109a2d1bd 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKTxListViewController.m +++ b/ios/CustomCode/Modules/Tab_Wallet/OKTxListViewController.m @@ -46,7 +46,7 @@ - (void)stupUI [self setNavigationBarBackgroundColorWithClearColor]; self.title = self.coinType; self.navigationItem.rightBarButtonItem = [UIBarButtonItem barButtonItemWithImage:[UIImage imageNamed:@"token_btc"] frame:CGRectMake(0, 0, 30, 30) target:self selector:@selector(rightBarButtonItemClick)]; - + [self.sendCoinBtn setLayerRadius:15]; [self.reciveCoinBtn setLayerRadius:15]; } @@ -95,15 +95,15 @@ - (NSArray *)vcArr:(NSInteger)count { OKTxViewController *txAllVc = [OKTxViewController txViewController]; txAllVc.searchType = @""; [arr addObject:txAllVc]; - + OKTxViewController *txInVc = [OKTxViewController txViewController]; txInVc.searchType = @"receive"; [arr addObject:txInVc]; - + OKTxViewController *txOutVc = [OKTxViewController txViewController]; txOutVc.searchType = @"send"; [arr addObject:txOutVc]; - + return arr; } #pragma mark - 均分下划线 @@ -115,7 +115,7 @@ - (void)segmentStyle{ CGFloat headerH = 36; _segHead = [[MLMSegmentHead alloc] initWithFrame:CGRectMake(0,0, self.topBgView.width, (headerH)) titles:self.list headStyle:SegmentHeadStyleSlide layoutStyle:MLMSegmentLayoutDefault]; _segHead.slideCorner = 7; - + // _segHead.fontScale = 1.05; _segHead.fontSize = (15); /** @@ -150,13 +150,13 @@ - (void)segmentStyle{ * 下划线相对于正常状态下的百分比,默认为1 */ // _segHead.lineScale = 0.8; - + /** * 顶部导航栏下方的边线 */ _segHead.bottomLineHeight = 0; _segHead.bottomLineColor = [UIColor lightGrayColor]; - + _segHead.slideScale = 0.98; /** * 设置当前屏幕最多显示的按钮数,只有在默认布局样式 - MLMSegmentLayoutDefault 下使用 @@ -171,9 +171,9 @@ - (void)segmentStyle{ [self.topBgView addSubview:self.segScroll]; } selectEnd:^(NSInteger index) { if (index == 2) { - + }else{ - + } }]; } diff --git a/ios/CustomCode/Modules/Tab_Wallet/OKWalletViewController.mm b/ios/CustomCode/Modules/Tab_Wallet/OKWalletViewController.mm index 68df0b50c233..237f2c048a05 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/OKWalletViewController.mm +++ b/ios/CustomCode/Modules/Tab_Wallet/OKWalletViewController.mm @@ -118,9 +118,9 @@ - (void)viewDidLoad { [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(notiDeleteWalletComplete) name:kNotiDeleteWalletComplete object:nil]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(notiBackUPWalletComplete) name:kNotiBackUPWalletComplete object:nil]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(notiHwInfoUpdate) name:kNotiHwInfoUpdate object:nil]; - + [OKPyCommandsManager sharedInstance]; - + [kPyCommandsManager callInterface:kInterfaceLoad_all_wallet parameter:@{}]; [self loadWalletList]; @@ -143,7 +143,7 @@ - (void)setDefault }else{ [kPyCommandsManager callInterface:kInterfaceSet_currency parameter:@{@"ccy":kWalletManager.currentFiat}]; } - + //设置默认BTC单位 if (kWalletManager.currentBitcoinUnit == nil || kWalletManager.currentBitcoinUnit.length == 0) { [kWalletManager setCurrentBitcoinUnit:@"BTC"]; @@ -151,27 +151,27 @@ - (void)setDefault }else{ [kPyCommandsManager callInterface:kInterfaceSet_base_uint parameter:@{@"base_unit":kWalletManager.currentBitcoinUnit}]; } - - + + //设置默认的浏览器 if (kUserSettingManager.currentBtcBrowser == nil || kUserSettingManager.currentBtcBrowser.length == 0) { [kUserSettingManager setCurrentBtcBrowser:kUserSettingManager.btcBrowserList.firstObject]; } - + [kPyCommandsManager callInterface:kInterfaceset_rbf parameter:@{@"status_rbf":@"1"}]; [kPyCommandsManager callInterface:kInterfaceset_unconf parameter:@{@"x":@"1"}]; [kUserSettingManager setUnconfFlag:YES]; [kUserSettingManager setRbfFlag:YES]; - - + + if (kUserSettingManager.currentMarketSource == nil || kUserSettingManager.currentMarketSource.length == 0) { NSArray *marketSource = [kPyCommandsManager callInterface:kInterfaceget_exchanges parameter:@{}]; NSString *first = marketSource.firstObject; [kUserSettingManager setCurrentMarketSource:first]; [kPyCommandsManager callInterface:kInterfaceset_exchange parameter:@{@"exchange":first}]; } - + if (kUserSettingManager.electrum_server == nil || kUserSettingManager.electrum_server.length == 0) { NSDictionary *dict = [kPyCommandsManager callInterface:kInterfaceget_default_server parameter:@{}]; if (dict != nil) { @@ -193,7 +193,7 @@ - (void)selectWallet NSDictionary *dict = [kPyCommandsManager callInterface:kInterfaceSelect_wallet parameter:@{@"name":kWalletManager.currentWalletInfo.name}]; NSString *b = [dict safeStringForKey:@"balance"]; NSString *balance = [[b componentsSeparatedByString:@" "]firstObject]; - + NSString *fiatS = [kPyCommandsManager callInterface:kInterfaceget_exchange_currency parameter:@{@"type":kExchange_currencyTypeBase,@"amount":balance}]; [self updateStatus:@{@"balance":balance,@"fiat":fiatS}]; } @@ -239,9 +239,9 @@ - (void)stupUI UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapGestureClick)]; [self.leftView addGestureRecognizer:tapGesture]; self.navigationController.delegate = self; - + [self.coinImage addTarget:self action:@selector(tapGestureClick) forControlEvents:UIControlEventTouchUpInside]; - + //asset界面 [self.walletTopBgView setCornerWith:20 side:OKCornerPathTopLeft|OKCornerPathTopRight withSize:CGSizeMake(SCREEN_WIDTH - 40, 168)]; [self.srBgView setCornerWith:20 side:OKCornerPathBottomLeft|OKCornerPathBottomRight withSize:CGSizeMake(SCREEN_WIDTH - 40, 68)]; @@ -254,22 +254,22 @@ - (void)stupUI } else { // Fallback on earlier versions } - - + + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(backUpBgClick)]; [self.backupBgView addGestureRecognizer:tap]; self.assetTableView.tableFooterView = [UIView new]; - - + + UITapGestureRecognizer *tapWalletTopBgView = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapWalletTopBgViewClick)]; - + [self.walletTopBgView addGestureRecognizer:tapWalletTopBgView]; - + UITapGestureRecognizer *tapeye = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapEyeClick)]; self.eyeBtn.userInteractionEnabled = YES; [self.eyebgView addGestureRecognizer:tapeye]; [self changeEye]; - + UITapGestureRecognizer *tapBanner = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapBanner)]; self.bannerImageView.userInteractionEnabled = YES; [self.bannerImageView addGestureRecognizer:tapBanner]; @@ -307,7 +307,7 @@ - (void)refreshUI self.createBgView.hidden = NO; self.walletHomeBgView.hidden = YES; } - + if (isBackUp) { self.backupBgView.hidden = YES; self.tableViewHeaderView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 348); @@ -317,7 +317,7 @@ - (void)refreshUI [self.assetTableView setTableHeaderView:self.tableViewHeaderView]; self.backupBgView.hidden = NO; } - + if ([kWalletManager getWalletDetailType] == OKWalletTypeHardware) { self.signatureBtn.hidden = NO; self.hwBgView.hidden = NO; @@ -498,7 +498,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N return cell; } } - + //assetTableView static NSString *ID = @"OKAssetTableViewCell"; OKAssetTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:ID]; @@ -602,21 +602,21 @@ - (NSArray *)allData model1.titleStr = MyLocalizedString(@"Create HD Wallet", nil); model1.descStr = MyLocalizedString(@"easy to use", nil); model1.imageStr = @"add"; - + OKSelectCellModel *model2 = [OKSelectCellModel new]; model2.titleStr = MyLocalizedString(@"Recover HD Wallet", nil); model2.descStr = MyLocalizedString(@"Recovery by mnemonic", nil); model2.imageStr = @"import"; model2.descStrL = @""; model2.type = OKSelectCellTypeRestoreHD; - + OKSelectCellModel *model3 = [OKSelectCellModel new]; model3.titleStr = MyLocalizedString(@"Paired hardware wallet", nil); model3.descStr = MyLocalizedString(@"Support BixinKey", nil); model3.imageStr = @"match_hardware"; model3.descStrL = @""; model3.type = OKSelectCellTypeMatchHD; - + _allData = @[model1,model2,model3]; } return _allData; @@ -682,7 +682,7 @@ - (void)notiWalletCreateComplete:(NSNotification *)noti NSDictionary *dict = noti.object; BOOL showB = [[dict safeStringForKey:@"backupshow"] boolValue]; BOOL showT = [[dict safeStringForKey:@"takecareshow"]boolValue]; - + if (showB == YES) { NSString *pwd = [dict safeStringForKey:@"pwd"]; OKWeakSelf(self) @@ -757,12 +757,12 @@ -(void)viewDidAppear:(BOOL)animated { if([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) { self.navigationController.interactivePopGestureRecognizer.delegate = self; } - + } - (void)viewDidDisappear:(BOOL)animated { - + [super viewDidDisappear:animated]; - + self.isCanSideBack=YES; //开启ios右滑返回 if([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) { self.navigationController.interactivePopGestureRecognizer.delegate = nil; diff --git a/ios/CustomCode/Modules/Tab_Wallet/View/OKAssetTableViewCell.m b/ios/CustomCode/Modules/Tab_Wallet/View/OKAssetTableViewCell.m index 23a15d3a99fe..d559ddc286b5 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/View/OKAssetTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Wallet/View/OKAssetTableViewCell.m @@ -32,7 +32,7 @@ - (void)setModel:(OKAssetTableViewCellModel *)model }else{ self.moneyLabel.text = @""; } - + }else{ self.balanceLabel.text = @"****"; self.moneyLabel.text = @"****"; diff --git a/ios/CustomCode/Modules/Tab_Wallet/View/OKTxTableViewCell.m b/ios/CustomCode/Modules/Tab_Wallet/View/OKTxTableViewCell.m index d69773c9a16c..f4eba677969f 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/View/OKTxTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Wallet/View/OKTxTableViewCell.m @@ -30,7 +30,7 @@ - (void)setModel:(OKTxTableViewCellModel *)model NSString *bStr = [NSString stringWithFormat:@"%@%@",[model.is_mine boolValue] == NO ? @"+":@"-" ,[amountArray firstObject]]; self.amountLabel.text = bStr; self.addressLabel.text = model.address; - + if ([model.is_mine boolValue]) { self.amountLabel.textColor = HexColor(0x3E70F2); }else{ diff --git a/ios/CustomCode/Modules/Tab_Wallet/View/OKWalletDetailTableViewCell.m b/ios/CustomCode/Modules/Tab_Wallet/View/OKWalletDetailTableViewCell.m index 36adcae6428e..0bb858196840 100644 --- a/ios/CustomCode/Modules/Tab_Wallet/View/OKWalletDetailTableViewCell.m +++ b/ios/CustomCode/Modules/Tab_Wallet/View/OKWalletDetailTableViewCell.m @@ -26,7 +26,7 @@ - (void)setModel:(OKWalletDetailModel *)model { _model = model; self.titleLabel.text = model.titleStr; - + NSString *addr = model.rightLabelStr; if (addr.length > 12) { addr = [NSString stringWithFormat:@"%@...%@",[addr substringToIndex:6],[addr substringFromIndex:addr.length - 6]]; @@ -34,7 +34,7 @@ - (void)setModel:(OKWalletDetailModel *)model self.rightLabel.text = addr; self.rightLabel.textColor = model.rightLabelColor; self.titleLabel.textColor = model.leftLabelColor; - + if (model.isShowDesc == YES) { //显示DESC self.descLabel.hidden = NO; self.titleLabel.hidden = YES; @@ -48,7 +48,7 @@ - (void)setModel:(OKWalletDetailModel *)model self.rightLabel.hidden = NO; self.imageViewCopy.hidden = NO; } - + if (model.isShowCopy==NO &&model.isShowArrow==NO) { self.imageViewCopy.hidden = YES; }else{ diff --git a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.h b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.h index a620debde209..f958045cdc88 100755 --- a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.h +++ b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.h @@ -38,7 +38,7 @@ typedef enum : NSUInteger { * 默认均分,根据maxTitles计算宽度,均分 */ MLMSegmentLayoutDefault, - + /* * 居中(标题不足一屏时选择样式,反之设置后按照居左) */ @@ -47,7 +47,7 @@ typedef enum : NSUInteger { * 居左 */ MLMSegmentLayoutLeft - + } MLMSegmentLayoutStyle; @protocol MLMSegmentHeadDelegate diff --git a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.m b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.m index c67cc03b9acd..192aa793dd4c 100755 --- a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.m +++ b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentHead.m @@ -42,27 +42,27 @@ @implementation MLMSegmentHead NSMutableArray *buttonArray;//按钮数组 - + UIView *lineView;//下划线view CAShapeLayer *arrow_layer;//箭头layer - + // UIView *slideView;//滑块View UIButton *slideView;//滑块btn UIScrollView *slideScroll; - - + + UIView *bottomLineView;//分割线 - + NSInteger currentIndex;//当前选中的按钮 - + NSInteger isSelected;//区分点击还是滑动 - - + + //button宽度的数组,总宽度 NSMutableArray *titleWidthArray; CGFloat sum_width; - + //用来判断向左向右 CGFloat endScale; } @@ -100,31 +100,31 @@ - (void)initCustom { _headColor = [UIColor whiteColor]; _selectColor = [UIColor blackColor]; _deSelectColor = [UIColor lightGrayColor]; - + _moreButton_width = 0; - + buttonArray = [NSMutableArray array]; _showIndex = 0; - + _fontSize = 13; _fontScale = 1; - + _singleW_Add = 20; - + _lineColor = _selectColor; _lineHeight = 2.5; _lineScale = 1; - + _arrowColor = _selectColor; - + _slideHeight = SCROLL_HEIGHT - 4; _slideColor = _deSelectColor; - + _slideCorner = _slideHeight/2; - + _slideScale = 1; _maxTitles = 5.0; - + _bottomLineColor = [UIColor grayColor]; _bottomLineHeight = 1; @@ -136,36 +136,36 @@ - (void)defaultAndCreateView { titleWidthArray = [NSMutableArray arrayWithCapacity:titlesArray.count]; } [titleWidthArray removeAllObjects]; - + _maxTitles = _maxTitles>titlesArray.count?titlesArray.count:_maxTitles; - + [self titlesWidth]; if (_equalSize) { self.width = sum_width+_moreButton_width; - + if (titlesScroll) { titlesScroll.width = SCREEN_WIDTH; } - + if (slideScroll) { slideScroll.width = SCREEN_WIDTH; } } - + //判断总宽度 if (sum_width > SCROLL_WIDTH && _layoutStyle== MLMSegmentLayoutCenter) { _layoutStyle = MLMSegmentLayoutLeft; } - + _showIndex = MIN(titlesArray.count-1, MAX(0, _showIndex)); currentIndex = _showIndex; [self createView]; - - - + + + [self setSelectIndex:_showIndex]; } @@ -193,26 +193,26 @@ - (CGFloat)titleWidth:(NSString *)title { // if (_layoutStyle == MLMSegmentLayoutCenter) { // return; // } -// +// // CGFloat start_x = sum_width; // CGFloat start_index = titleWidthArray.count; -// +// // //添加到数组,并计算宽度 // for (NSInteger i = 0; i < moreTitles.count; i ++) { // NSString *title = moreTitles[i]; // CGFloat width = [self titleWidth:title]; // [titleWidthArray addObject:@(width)]; // sum_width += width; -// +// // [titlesArray addObject:title]; // } -// +// // [self createBtn:titlesArray addScroll:titlesScroll startX:start_x start_index:start_index]; // if (_headStyle == SegmentHeadStyleSlide) { // [self createBtn:titlesArray addScroll:slideScroll startX:start_x start_index:start_index]; // } -// -// +// +// // [self setSelectIndex:currentIndex]; //} @@ -223,24 +223,24 @@ - (void)createView { titlesScroll = [self customScroll]; [self scrollViewSubviews:titlesScroll]; [self addSubview:titlesScroll]; - - + + if (_moreButton) { _moreButton.frame = CGRectMake(CGRectGetMaxX(titlesScroll.frame), 0, _moreButton_width, titlesScroll.height); [self addSubview:_moreButton]; } - + if (_bottomLineHeight) { bottomLineView = [self bottomLineView]; [self addSubview:bottomLineView]; } - + switch (_headStyle) { case SegmentHeadStyleLine: { lineView = [self lineView]; [titlesScroll addSubview:lineView]; - + } break; case SegmentHeadStyleArrow: @@ -265,7 +265,7 @@ - (void)createView { default: break; } - + } #pragma mark - drow arrow @@ -302,7 +302,7 @@ - (void)scrollViewSubviews:(UIScrollView*)scroll { BOOL titles = [scroll isEqual:titlesScroll]; CGFloat start_x = 0; - + if (_layoutStyle == MLMSegmentLayoutCenter) { //计算布局的起点 start_x = SCROLL_WIDTH/2; @@ -314,7 +314,7 @@ - (void)scrollViewSubviews:(UIScrollView*)scroll { } } [self createBtn:titlesArray addScroll:scroll startX:start_x start_index:0]; - + if (titles && _headStyle != SegmentHeadStyleSlide) { UIButton *curBtn = buttonArray[_showIndex]; if (_fontScale != 1) { @@ -335,10 +335,10 @@ - (void)createBtn:(NSArray *)titlesArr addScroll:(UIScrollView*)scroll startX:(C button.titleLabel.font = [UIFont systemFontOfSize:_fontSize]; button.frame = CGRectMake(start_x, 0, width, SCROLL_HEIGHT); start_x += width; - - + + //button.backgroundColor = [UIColor colorWithRed:arc4random_uniform(244)/255.0 green:arc4random_uniform(244)/255.0 blue:arc4random_uniform(244)/255.0 alpha:1.0]; - + if (titles) { [button setTitleColor:_deSelectColor forState:UIControlStateNormal]; [button addTarget:self action:@selector(selectedHeadTitles:) forControlEvents:UIControlEventTouchUpInside]; @@ -355,9 +355,9 @@ - (void)createBtn:(NSArray *)titlesArr addScroll:(UIScrollView*)scroll startX:(C #pragma mark - create Line - (UIView *)lineView { _lineScale = fabs(_lineScale)>1?1:fabs(_lineScale); - + CGFloat line_w = CURRENT_WIDTH(currentIndex); - + UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, SCROLL_HEIGHT-_lineHeight, line_w*_lineScale, _lineHeight)]; UIButton *current_btn = buttonArray[currentIndex]; line.center = CGPointMake(current_btn.center.x, line.center.y); @@ -403,36 +403,36 @@ - (void)changeSelectIndexPage:(NSInteger)index { { //before UIButton *before_btn = buttonArray[currentIndex]; - + NSInteger selectIndex = index; - + //repeat click if (selectIndex == currentIndex) { return; } //select UIButton *select_btn = buttonArray[selectIndex]; - + [UIView animateWithDuration:animation_time animations:^{ if (_headStyle != SegmentHeadStyleSlide) { [before_btn setTitleColor:_deSelectColor forState:UIControlStateNormal]; [select_btn setTitleColor:_selectColor forState:UIControlStateNormal]; } - + if (_fontScale) { before_btn.titleLabel.font = [UIFont systemFontOfSize:_fontSize]; select_btn.titleLabel.font = [UIFont systemFontOfSize:_fontSize*_fontScale]; } - + if (lineView) { lineView.width = select_btn.width*_lineScale; lineView.center = CGPointMake(select_btn.center.x, lineView.center.y); } - + if (arrow_layer) { arrow_layer.position = CGPointMake(lineView.width/2, lineView.height/2); } - + if (slideView) { //slide位置变化 slideView.width = select_btn.width*_slideScale; @@ -444,7 +444,7 @@ - (void)changeSelectIndexPage:(NSInteger)index { } completion:^(BOOL finished) { [self setSelectIndex:selectIndex]; }]; - + isSelected = YES; if ([self.delegate respondsToSelector:@selector(didSelectedIndex:)]) { [self.delegate didSelectedIndex:selectIndex]; @@ -462,7 +462,7 @@ - (void)animationEnd { #pragma mark - set index - (void)setSelectIndex:(NSInteger)index { currentIndex = index; - + if (sum_width > SCROLL_WIDTH) { UIButton *currentBtn = buttonArray[index]; if (currentBtn.center.x scale; endScale = scale; - + //1.将scale变为对应titleScroll的titleScale //每个view所占的百分比 CGFloat per_view = 1.0/(CGFloat)titlesArray.count; @@ -596,7 +596,7 @@ - (void)colorChangeCurBtn:(UIButton *)curBtn nextBtn:(UIButton *)nextBtn changeS CGFloat de_sel_green; CGFloat de_sel_blue; CGFloat de_sel_alpha; - + if ([_selectColor getRed:&sel_red green:&sel_green blue:&sel_blue alpha:&sel_alpha] && [_deSelectColor getRed:&de_sel_red green:&de_sel_green blue:&de_sel_blue alpha:&de_sel_alpha]) { //颜色的变化的大小 CGFloat red_changge = sel_red - de_sel_red; diff --git a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentManager.m b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentManager.m index 176cb6d6fc36..d88d0d611d66 100755 --- a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentManager.m +++ b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentManager.m @@ -24,7 +24,7 @@ + (void)associateHead:(MLMSegmentHead *)head NSInteger showIndex; showIndex = head.showIndex?head.showIndex:scroll.showIndex; head.showIndex = scroll.showIndex = showIndex; - + head.selectedIndex = ^(NSInteger index) { [scroll setContentOffset:CGPointMake(index*scroll.width, 0) animated:YES]; if (selectEnd) { @@ -32,7 +32,7 @@ + (void)associateHead:(MLMSegmentHead *)head } }; [head defaultAndCreateView]; - + scroll.scrollEnd = ^(NSInteger index) { [head setSelectIndex:index]; if (selectEnd) { @@ -45,12 +45,12 @@ + (void)associateHead:(MLMSegmentHead *)head scroll.offsetScale = ^(CGFloat scale) { [head changePointScale:scale]; }; - + if (completion) { completion(); } [scroll createView]; - + UIView *view = head.nextResponder?head:scroll; UIViewController *currentVC = [view viewController]; currentVC.automaticallyAdjustsScrollViewInsets = NO; diff --git a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentScroll.m b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentScroll.m index 1f2d5f462cd3..1298c104b031 100755 --- a/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentScroll.m +++ b/ios/CustomCode/Modules/Third/MLMSegmentPageView/MLMSegmentScroll.m @@ -36,7 +36,7 @@ - (void)defaultSet { self.bounces = NO; self.delegate = self; [self setContentSize:CGSizeMake(viewsArray.count *self.width, self.height)]; - + _countLimit = viewsArray.count; } @@ -52,11 +52,11 @@ - (NSCache *)viewsCache { } -#pragma mark - default add View +#pragma mark - default add View - (void)createView { _showIndex = MIN(viewsArray.count-1, MAX(0, _showIndex)); [self setContentOffset:CGPointMake(_showIndex * self.frame.size.width, 0)]; - + if (_loadAll) { NSInteger startIndex; if (viewsArray.count-_showIndex > _countLimit) { @@ -74,7 +74,7 @@ - (void)createView { //- (void)addVcOrViews:(NSArray *)sources { // NSInteger startIndex = viewsArray.count; -// +// // [viewsArray addObjectsFromArray:sources]; // // if (_loadAll) { @@ -110,7 +110,7 @@ - (void)addViewCacheIndex:(NSInteger)index { NSLog(@"this class was not found!"); } } - + } #pragma mark - addvc @@ -158,7 +158,7 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { [self addViewCacheIndex:currentIndex]; } } - + } - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView { diff --git a/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.h b/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.h index 1a8fd6bff6e0..c2d845659a12 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.h +++ b/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.h @@ -3,21 +3,21 @@ // // Copyright (C) 2012 http://moqod.com Andrew Kopanev // -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -// of the Software, and to permit persons to whom the Software is furnished to do so, +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is furnished to do so, // subject to the following conditions: // -// The above copyright notice and this permission notice shall be included in all +// The above copyright notice and this permission notice shall be included in all // copies or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. // diff --git a/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.m b/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.m index ddf1e67ad569..51f0dd7c7e8a 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.m +++ b/ios/CustomCode/Modules/Third/libqrencode/QRCodeGenerator.m @@ -3,21 +3,21 @@ // // Copyright (C) 2012 http://moqod.com Andrew Kopanev // -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -// of the Software, and to permit persons to whom the Software is furnished to do so, +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +// of the Software, and to permit persons to whom the Software is furnished to do so, // subject to the following conditions: // -// The above copyright notice and this permission notice shall be included in all +// The above copyright notice and this permission notice shall be included in all // copies or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. // @@ -37,7 +37,7 @@ + (void)drawQRCode:(QRcode *)code context:(CGContextRef)ctx size:(CGFloat)size { width = code->width; float zoom = (double)size / (code->width + 2.0 * qr_margin); CGRect rectDraw = CGRectMake(0, 0, zoom, zoom); - + // draw CGContextSetFillColor(ctx, CGColorGetComponents([UIColor blackColor].CGColor)); for(int i = 0; i < width; ++i) { @@ -66,35 +66,35 @@ + (UIImage *)qrImageForString:(NSString *)string imageSize:(CGFloat)size topImag if (!code) { return nil; } - + // create context CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); CGContextRef ctx = CGBitmapContextCreate(0, size, size, 8, size * 4, colorSpace, kCGImageAlphaPremultipliedLast); - + CGAffineTransform translateTransform = CGAffineTransformMakeTranslation(0, -size); CGAffineTransform scaleTransform = CGAffineTransformMakeScale(1, -1); CGContextConcatCTM(ctx, CGAffineTransformConcat(translateTransform, scaleTransform)); - + // draw QR on this context [self drawQRCode:code context:ctx size:size withPointType:0 withPositionType:0 withColor:[UIColor blackColor]]; - + // get image CGImageRef qrCGImage = CGBitmapContextCreateImage(ctx); UIImage * qrImage = [UIImage imageWithCGImage:qrCGImage]; - + if(topimg) { UIGraphicsBeginImageContext(qrImage.size); - + //Draw image2 [qrImage drawInRect:CGRectMake(0, 0, qrImage.size.width, qrImage.size.height)]; - + //Draw image1 float r=qrImage.size.width*45/240.0; [topimg drawInRect:CGRectMake((qrImage.size.width-r)/2, (qrImage.size.height-r)/2 ,r, r)]; qrImage=UIGraphicsGetImageFromCurrentImageContext(); - + UIGraphicsEndImageContext(); } // some releases @@ -102,7 +102,7 @@ + (UIImage *)qrImageForString:(NSString *)string imageSize:(CGFloat)size topImag CGImageRelease(qrCGImage); CGColorSpaceRelease(colorSpace); QRcode_free(code); - + return qrImage; } + (void)drawQRCode:(QRcode *)code context:(CGContextRef)ctx size:(CGFloat)size withPointType:(NSInteger)pointType withPositionType:(NSInteger)positionType withColor:(UIColor *)color { @@ -112,7 +112,7 @@ + (void)drawQRCode:(QRcode *)code context:(CGContextRef)ctx size:(CGFloat)size w width = code->width; float zoom = (double)size / (code->width + 2.0 * qr_margin); CGRect rectDraw = CGRectMake(0, 0, zoom, zoom); - + // draw const CGFloat *components; if (color) { @@ -122,7 +122,7 @@ + (void)drawQRCode:(QRcode *)code context:(CGContextRef)ctx size:(CGFloat)size w } CGContextSetRGBFillColor(ctx, 0, 0, 0, 1.0); NSLog(@"aad :%f bbd :%f ccd:%f",components[0],components[1],components[2]); - + for(int i = 0; i < width; ++i) { for(int j = 0; j < width; ++j) { if(*data & 1) { diff --git a/ios/CustomCode/Modules/Third/libqrencode/qrencode.h b/ios/CustomCode/Modules/Third/libqrencode/qrencode.h index 342df3bd6ed5..0907edcfd8de 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/qrencode.h +++ b/ios/CustomCode/Modules/Third/libqrencode/qrencode.h @@ -23,8 +23,8 @@ * symbology. * * \section encoding Encoding - * - * There are two ways to encode data: encoding a string or + * + * There are two ways to encode data: encoding a string or * encoding a structured data. * * \subsection encoding-string Encoding a string @@ -68,7 +68,7 @@ * to generate structured-appended symbols. This functions returns an instance * of ::QRcode_List. The returned list is a singly-linked list of QRcode: you * can retrieve each QR code in this way: - * + * * \code * QRcode_List *qrcodes; * QRcode_List *entry; diff --git a/ios/CustomCode/Modules/Third/libqrencode/qrinput.c b/ios/CustomCode/Modules/Third/libqrencode/qrinput.c index f9b105dd5e1c..914f2eebd542 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/qrinput.c +++ b/ios/CustomCode/Modules/Third/libqrencode/qrinput.c @@ -343,7 +343,7 @@ static int QRinput_encodeModeNum(QRinput_List *entry, int version) val = 0x1; ret = BitStream_appendNum(entry->bstream, 4, val); if(ret < 0) goto ABORT; - + val = entry->size; ret = BitStream_appendNum(entry->bstream, QRspec_lengthIndicator(QR_MODE_NUM, version), val); if(ret < 0) goto ABORT; @@ -447,7 +447,7 @@ static int QRinput_encodeModeAn(QRinput_List *entry, int version) val = 0x2; ret = BitStream_appendNum(entry->bstream, 4, val); if(ret < 0) goto ABORT; - + val = entry->size; ret = BitStream_appendNum(entry->bstream, QRspec_lengthIndicator(QR_MODE_AN, version), val); if(ret < 0) goto ABORT; @@ -507,7 +507,7 @@ static int QRinput_encodeMode8(QRinput_List *entry, int version) val = 0x4; ret = BitStream_appendNum(entry->bstream, 4, val); if(ret < 0) goto ABORT; - + val = entry->size; ret = BitStream_appendNum(entry->bstream, QRspec_lengthIndicator(QR_MODE_8, version), val); if(ret < 0) goto ABORT; @@ -582,7 +582,7 @@ static int QRinput_encodeModeKanji(QRinput_List *entry, int version) val = 0x8; ret = BitStream_appendNum(entry->bstream, 4, val); if(ret < 0) goto ABORT; - + val = entry->size / 2; ret = BitStream_appendNum(entry->bstream, QRspec_lengthIndicator(QR_MODE_KANJI, version), val); if(ret < 0) goto ABORT; @@ -1152,7 +1152,7 @@ int QRinput_Struct_appendInput(QRinput_Struct *s, QRinput *input) void QRinput_Struct_free(QRinput_Struct *s) { QRinput_InputList *list, *next; - + if(s != NULL) { list = s->head; while(list != NULL) { diff --git a/ios/CustomCode/Modules/Third/libqrencode/qrspec.c b/ios/CustomCode/Modules/Third/libqrencode/qrspec.c index 4ee60189df90..8cd8e11bb475 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/qrspec.c +++ b/ios/CustomCode/Modules/Third/libqrencode/qrspec.c @@ -1,13 +1,13 @@ /* * qrencode - QR Code encoder * - * QR Code specification in convenient format. + * QR Code specification in convenient format. * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi * * The following data / specifications are taken from * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004) * or - * "Automatic identification and data capture techniques -- + * "Automatic identification and data capture techniques -- * QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006) * * This library is free software; you can redistribute it and/or diff --git a/ios/CustomCode/Modules/Third/libqrencode/qrspec.h b/ios/CustomCode/Modules/Third/libqrencode/qrspec.h index a544e9b10728..edc64d8f0d67 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/qrspec.h +++ b/ios/CustomCode/Modules/Third/libqrencode/qrspec.h @@ -1,7 +1,7 @@ /* * qrencode - QR Code encoder * - * QR Code specification in convenient format. + * QR Code specification in convenient format. * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi * * This library is free software; you can redistribute it and/or diff --git a/ios/CustomCode/Modules/Third/libqrencode/rscode.c b/ios/CustomCode/Modules/Third/libqrencode/rscode.c index c92f6f23fcfd..d2184f2eb03f 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/rscode.c +++ b/ios/CustomCode/Modules/Third/libqrencode/rscode.c @@ -67,7 +67,7 @@ static inline int modnn(RS *rs, int x){ #define MM (rs->mm) #define NN (rs->nn) -#define ALPHA_TO (rs->alpha_to) +#define ALPHA_TO (rs->alpha_to) #define INDEX_OF (rs->index_of) #define GENPOLY (rs->genpoly) #define NROOTS (rs->nroots) @@ -254,7 +254,7 @@ void free_rs_cache(void) * NROOTS - the number of roots in the RS code generator polynomial, * which is the same as the number of parity symbols in a block. Integer variable or literal. - * + * * NN - the total number of symbols in a RS block. Integer variable or literal. * PAD - the number of pad symbols in a block. Integer variable or literal. * ALPHA_TO - The address of an array of NN elements to convert Galois field diff --git a/ios/CustomCode/Modules/Third/libqrencode/split.c b/ios/CustomCode/Modules/Third/libqrencode/split.c index 4bb8e55b1c13..7c8820946a49 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/split.c +++ b/ios/CustomCode/Modules/Third/libqrencode/split.c @@ -7,7 +7,7 @@ * The following data / specifications are taken from * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004) * or - * "Automatic identification and data capture techniques -- + * "Automatic identification and data capture techniques -- * QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006) * * This library is free software; you can redistribute it and/or diff --git a/ios/CustomCode/Modules/Third/libqrencode/split.h b/ios/CustomCode/Modules/Third/libqrencode/split.h index 6a495e491015..6178da6fe616 100755 --- a/ios/CustomCode/Modules/Third/libqrencode/split.h +++ b/ios/CustomCode/Modules/Third/libqrencode/split.h @@ -7,7 +7,7 @@ * The following data / specifications are taken from * "Two dimensional symbol -- QR-code -- Basic Specification" (JIS X0510:2004) * or - * "Automatic identification and data capture techniques -- + * "Automatic identification and data capture techniques -- * QR Code 2005 bar code symbology specification" (ISO/IEC 18004:2006) * * This library is free software; you can redistribute it and/or diff --git a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.h b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.h index 56deecc3e1c9..899f8970fe15 100644 --- a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.h +++ b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.h @@ -4,9 +4,9 @@ // // Created by Gurpartap Singh on 06/05/12. (Edited by afon on 13-8-5.) // Copyright (c) 2012 Gurpartap Singh -// +// // MIT License -// +// // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the // "Software"), to deal in the Software without restriction, including @@ -14,10 +14,10 @@ // distribute, sublicense, and/or sell copies of the Software, and to // permit persons to whom the Software is furnished to do so, subject to // the following conditions: -// +// // The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.m b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.m index 4c5eaafa7325..e11908f1884a 100644 --- a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.m +++ b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/AESCrypt.m @@ -4,9 +4,9 @@ // // Created by Gurpartap Singh on 06/05/12. (Edited by afon on 13-8-5.) // Copyright (c) 2012 Gurpartap Singh -// +// // MIT License -// +// // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the // "Software"), to deal in the Software without restriction, including @@ -14,10 +14,10 @@ // distribute, sublicense, and/or sell copies of the Software, and to // permit persons to whom the Software is furnished to do so, subject to // the following conditions: -// +// // The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/Base64.m b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/Base64.m index 0dffdb087af3..def9ce6d2f0b 100644 --- a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/Base64.m +++ b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/Base64.m @@ -47,42 +47,42 @@ @implementation NSData (Base64) + (NSData *)dataWithBase64EncodedString:(NSString *)string { if (![string length]) return nil; - + NSData *decoded = nil; - + #if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0 - + if (![NSData instancesRespondToSelector:@selector(initWithBase64EncodedString:options:)]) { decoded = [[self alloc] initWithBase64Encoding:[string stringByReplacingOccurrencesOfString:@"[^A-Za-z0-9+/=]" withString:@"" options:NSRegularExpressionSearch range:NSMakeRange(0, [string length])]]; } else - + #endif - + { decoded = [[self alloc] initWithBase64EncodedString:string options:NSDataBase64DecodingIgnoreUnknownCharacters]; } - + return [decoded length]? decoded: nil; } - (NSString *)base64EncodedStringWithWrapWidth:(NSUInteger)wrapWidth { if (![self length]) return nil; - + NSString *encoded = nil; - + #if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0 - + if (![NSData instancesRespondToSelector:@selector(base64EncodedStringWithOptions:)]) { encoded = [self base64Encoding]; } else - + #endif - + { switch (wrapWidth) { @@ -100,12 +100,12 @@ - (NSString *)base64EncodedStringWithWrapWidth:(NSUInteger)wrapWidth } } } - + if (!wrapWidth || wrapWidth >= [encoded length]) { return encoded; } - + wrapWidth = (wrapWidth / 4) * 4; NSMutableString *result = [NSMutableString string]; for (NSUInteger i = 0; i < [encoded length]; i+= wrapWidth) @@ -118,7 +118,7 @@ - (NSString *)base64EncodedStringWithWrapWidth:(NSUInteger)wrapWidth [result appendString:[encoded substringWithRange:NSMakeRange(i, wrapWidth)]]; [result appendString:@"\r\n"]; } - + return result; } diff --git a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.h b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.h index 95cce9989313..7c1f7ca9a4fa 100644 --- a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.h +++ b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.h @@ -6,32 +6,32 @@ * * Copyright (c) 2008-2009, Jim Dovey * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * Neither the name of this project's author nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ @@ -109,4 +109,4 @@ extern NSString * const kCommonCryptoErrorDomain; - (NSData *) HMACWithAlgorithm: (CCHmacAlgorithm) algorithm; - (NSData *) HMACWithAlgorithm: (CCHmacAlgorithm) algorithm key: (id) key; -@end \ No newline at end of file +@end diff --git a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.m b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.m index 47dbd3d05a3f..967d61357ee4 100644 --- a/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.m +++ b/ios/CustomCode/Modules/Tools/AESCrypt-ObjC/NSData+CommonCrypto.m @@ -6,32 +6,32 @@ * * Copyright (c) 2008-2009, Jim Dovey * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * Neither the name of this project's author nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ @@ -49,59 +49,59 @@ @implementation NSError (CommonCryptoErrorDomain) + (NSError *) errorWithCCCryptorStatus: (CCCryptorStatus) status { NSString * description = nil, * reason = nil; - + switch ( status ) { case kCCSuccess: description = NSLocalizedString(@"Success", @"Error description"); break; - + case kCCParamError: description = NSLocalizedString(@"Parameter Error", @"Error description"); reason = NSLocalizedString(@"Illegal parameter supplied to encryption/decryption algorithm", @"Error reason"); break; - + case kCCBufferTooSmall: description = NSLocalizedString(@"Buffer Too Small", @"Error description"); reason = NSLocalizedString(@"Insufficient buffer provided for specified operation", @"Error reason"); break; - + case kCCMemoryFailure: description = NSLocalizedString(@"Memory Failure", @"Error description"); reason = NSLocalizedString(@"Failed to allocate memory", @"Error reason"); break; - + case kCCAlignmentError: description = NSLocalizedString(@"Alignment Error", @"Error description"); reason = NSLocalizedString(@"Input size to encryption algorithm was not aligned correctly", @"Error reason"); break; - + case kCCDecodeError: description = NSLocalizedString(@"Decode Error", @"Error description"); reason = NSLocalizedString(@"Input data did not decode or decrypt correctly", @"Error reason"); break; - + case kCCUnimplemented: description = NSLocalizedString(@"Unimplemented Function", @"Error description"); reason = NSLocalizedString(@"Function not implemented for the current algorithm", @"Error reason"); break; - + default: description = NSLocalizedString(@"Unknown Error", @"Error description"); break; } - + NSMutableDictionary * userInfo = [[NSMutableDictionary alloc] init]; [userInfo setObject: description forKey: NSLocalizedDescriptionKey]; - + if ( reason != nil ) [userInfo setObject: reason forKey: NSLocalizedFailureReasonErrorKey]; - + NSError * result = [NSError errorWithDomain: kCommonCryptoErrorDomain code: status userInfo: userInfo]; #if !__has_feature(objc_arc) [userInfo release]; #endif - + return ( result ); } @@ -178,13 +178,13 @@ - (NSData *) AES256EncryptedDataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -195,13 +195,13 @@ - (NSData *) decryptedAES256DataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -212,13 +212,13 @@ - (NSData *) DESEncryptedDataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -229,13 +229,13 @@ - (NSData *) decryptedDESDataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -246,13 +246,13 @@ - (NSData *) CASTEncryptedDataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -263,13 +263,13 @@ - (NSData *) decryptedCASTDataUsingKey: (id) key error: (NSError **) error key: key options: kCCOptionPKCS7Padding error: &status]; - + if ( result != nil ) return ( result ); - + if ( error != NULL ) *error = [NSError errorWithCCCryptorStatus: status]; - + return ( nil ); } @@ -294,22 +294,22 @@ static void FixKeyLengths( CCAlgorithm algorithm, NSMutableData * keyData, NSMut { [keyData setLength: 32]; } - + break; } - + case kCCAlgorithmDES: { [keyData setLength: 8]; break; } - + case kCCAlgorithm3DES: { [keyData setLength: 24]; break; } - + case kCCAlgorithmCAST: { if ( keyLength < 5 ) @@ -320,21 +320,21 @@ static void FixKeyLengths( CCAlgorithm algorithm, NSMutableData * keyData, NSMut { [keyData setLength: 16]; } - + break; } - + case kCCAlgorithmRC4: { if ( keyLength > 512 ) [keyData setLength: 512]; break; } - + default: break; } - + [ivData setLength: [keyData length]]; } @@ -346,16 +346,16 @@ - (NSData *) _runCryptor: (CCCryptorRef) cryptor result: (CCCryptorStatus *) sta void * buf = malloc( bufsize ); size_t bufused = 0; size_t bytesTotal = 0; - *status = CCCryptorUpdate( cryptor, [self bytes], (size_t)[self length], + *status = CCCryptorUpdate( cryptor, [self bytes], (size_t)[self length], buf, bufsize, &bufused ); if ( *status != kCCSuccess ) { free( buf ); return ( nil ); } - + bytesTotal += bufused; - + // From Brent Royal-Gordon (Twitter: architechies): // Need to update buf ptr past used bytes when calling CCCryptorFinal() *status = CCCryptorFinal( cryptor, buf + bufused, bufsize - bufused, &bufused ); @@ -364,9 +364,9 @@ - (NSData *) _runCryptor: (CCCryptorRef) cryptor result: (CCCryptorStatus *) sta free( buf ); return ( nil ); } - + bytesTotal += bufused; - + return ( [NSData dataWithBytesNoCopy: buf length: bytesTotal] ); } @@ -401,45 +401,45 @@ - (NSData *) dataEncryptedUsingAlgorithm: (CCAlgorithm) algorithm { CCCryptorRef cryptor = NULL; CCCryptorStatus status = kCCSuccess; - + NSParameterAssert([key isKindOfClass: [NSData class]] || [key isKindOfClass: [NSString class]]); NSParameterAssert(iv == nil || [iv isKindOfClass: [NSData class]] || [iv isKindOfClass: [NSString class]]); - + NSMutableData * keyData, * ivData; if ( [key isKindOfClass: [NSData class]] ) keyData = (NSMutableData *) [key mutableCopy]; else keyData = [[key dataUsingEncoding: NSUTF8StringEncoding] mutableCopy]; - + if ( [iv isKindOfClass: [NSString class]] ) ivData = [[iv dataUsingEncoding: NSUTF8StringEncoding] mutableCopy]; else ivData = (NSMutableData *) [iv mutableCopy]; // data or nil - + #if !__has_feature(objc_arc) [keyData autorelease]; [ivData autorelease]; #endif // ensure correct lengths for key and iv data, based on algorithms FixKeyLengths( algorithm, keyData, ivData ); - + status = CCCryptorCreate( kCCEncrypt, algorithm, options, [keyData bytes], [keyData length], [ivData bytes], &cryptor ); - + if ( status != kCCSuccess ) { if ( error != NULL ) *error = status; return ( nil ); } - + NSData * result = [self _runCryptor: cryptor result: &status]; if ( (result == nil) && (error != NULL) ) *error = status; - + CCCryptorRelease( cryptor ); - + return ( result ); } @@ -474,46 +474,46 @@ - (NSData *) decryptedDataUsingAlgorithm: (CCAlgorithm) algorithm { CCCryptorRef cryptor = NULL; CCCryptorStatus status = kCCSuccess; - + NSParameterAssert([key isKindOfClass: [NSData class]] || [key isKindOfClass: [NSString class]]); NSParameterAssert(iv == nil || [iv isKindOfClass: [NSData class]] || [iv isKindOfClass: [NSString class]]); - + NSMutableData * keyData, * ivData; if ( [key isKindOfClass: [NSData class]] ) keyData = (NSMutableData *) [key mutableCopy]; else keyData = [[key dataUsingEncoding: NSUTF8StringEncoding] mutableCopy]; - + if ( [iv isKindOfClass: [NSString class]] ) ivData = [[iv dataUsingEncoding: NSUTF8StringEncoding] mutableCopy]; else ivData = (NSMutableData *) [iv mutableCopy]; // data or nil - + #if !__has_feature(objc_arc) [keyData autorelease]; [ivData autorelease]; #endif - + // ensure correct lengths for key and iv data, based on algorithms FixKeyLengths( algorithm, keyData, ivData ); - + status = CCCryptorCreate( kCCDecrypt, algorithm, options, [keyData bytes], [keyData length], [ivData bytes], &cryptor ); - + if ( status != kCCSuccess ) { if ( error != NULL ) *error = status; return ( nil ); } - + NSData * result = [self _runCryptor: cryptor result: &status]; if ( (result == nil) && (error != NULL) ) *error = status; - + CCCryptorRelease( cryptor ); - + return ( result ); } @@ -529,18 +529,18 @@ - (NSData *) HMACWithAlgorithm: (CCHmacAlgorithm) algorithm - (NSData *) HMACWithAlgorithm: (CCHmacAlgorithm) algorithm key: (id) key { NSParameterAssert(key == nil || [key isKindOfClass: [NSData class]] || [key isKindOfClass: [NSString class]]); - + NSData * keyData = nil; if ( [key isKindOfClass: [NSString class]] ) keyData = [key dataUsingEncoding: NSUTF8StringEncoding]; else keyData = (NSData *) key; - + // this could be either CC_SHA1_DIGEST_LENGTH or CC_MD5_DIGEST_LENGTH. SHA1 is larger. unsigned char buf[CC_SHA1_DIGEST_LENGTH]; CCHmac( algorithm, [keyData bytes], [keyData length], [self bytes], [self length], buf ); - + return ( [NSData dataWithBytes: buf length: (algorithm == kCCHmacAlgMD5 ? CC_MD5_DIGEST_LENGTH : CC_SHA1_DIGEST_LENGTH)] ); } -@end \ No newline at end of file +@end diff --git a/ios/CustomCode/Modules/Tools/OKSystemShareView.m b/ios/CustomCode/Modules/Tools/OKSystemShareView.m index fb4df0db71e9..0723aa734f05 100644 --- a/ios/CustomCode/Modules/Tools/OKSystemShareView.m +++ b/ios/CustomCode/Modules/Tools/OKSystemShareView.m @@ -16,7 +16,7 @@ +(UIActivityViewController *)showSystemShareViewWithActivityItems:(NSArray *)ite if ([UIDevice currentDevice].systemVersion.floatValue >= 8.0) { UIActivityViewControllerCompletionWithItemsHandler itemsBlock = ^(UIActivityType __nullable activityType, BOOL completed, NSArray * __nullable returnedItems, NSError * __nullable activityError){ [vc dismissViewControllerAnimated:YES completion:nil]; - + if (completed) { if (shareCompletion) { shareCompletion(); @@ -43,9 +43,9 @@ +(UIActivityViewController *)showSystemShareViewWithActivityItems:(NSArray *)ite }; activityVC.completionHandler = handlerBlock; } - + [vc presentViewController:activityVC animated:YES completion:nil]; - + return activityVC; } diff --git a/ios/CustomCode/Modules/Tools/Sha256.h b/ios/CustomCode/Modules/Tools/Sha256.h index f5a2a5298e33..04be5825068c 100755 --- a/ios/CustomCode/Modules/Tools/Sha256.h +++ b/ios/CustomCode/Modules/Tools/Sha256.h @@ -10,7 +10,7 @@ @interface Sha256 : NSObject @property(nonatomic, strong) NSData *mHashBytesData; -// sha256result with hex encoding +// sha256result with hex encoding @property(nonatomic, strong) NSString *sha256; - (instancetype)initWithData:(NSData *)bytesData; diff --git a/ios/CustomCode/Modules/Tools/Sha256.m b/ios/CustomCode/Modules/Tools/Sha256.m index 96eb4cbcf2bb..e100a98e590b 100755 --- a/ios/CustomCode/Modules/Tools/Sha256.m +++ b/ios/CustomCode/Modules/Tools/Sha256.m @@ -16,13 +16,13 @@ - (instancetype)initWithData:(NSData *)bytesData { self = [super init]; if (self) { - + uint8_t digest[CC_SHA256_DIGEST_LENGTH]; CC_SHA256(bytesData.bytes, (CC_LONG)bytesData.length, digest); self.mHashBytesData = [NSData dataWithBytes:digest length:CC_SHA256_DIGEST_LENGTH]; - + NSMutableString* outputSha256_Digest = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2]; - + for(int i = 0; i < CC_SHA256_DIGEST_LENGTH; i++){ [outputSha256_Digest appendFormat:@"%02x", digest[i]]; } diff --git a/ios/CustomCode/Modules/WalletList/Model/OKSelectCellModel.h b/ios/CustomCode/Modules/WalletList/Model/OKSelectCellModel.h index 6bbc638d4413..2181f26fe16e 100644 --- a/ios/CustomCode/Modules/WalletList/Model/OKSelectCellModel.h +++ b/ios/CustomCode/Modules/WalletList/Model/OKSelectCellModel.h @@ -13,7 +13,7 @@ typedef enum { OKSelectCellTypeCreateHD, //创建钱包 OKSelectCellTypeRestoreHD, //恢复钱包 OKSelectCellTypeMatchHD //配对硬件钱包 - + }OKSelectCellType; @interface OKSelectCellModel : NSObject diff --git a/ios/CustomCode/Modules/WalletList/View/OKWalletListCollectionViewCell.m b/ios/CustomCode/Modules/WalletList/View/OKWalletListCollectionViewCell.m index 03c7c0d5c8f8..6935715fb323 100644 --- a/ios/CustomCode/Modules/WalletList/View/OKWalletListCollectionViewCell.m +++ b/ios/CustomCode/Modules/WalletList/View/OKWalletListCollectionViewCell.m @@ -23,7 +23,7 @@ - (void)setModel:(OKWalletListCollectionViewCellModel *)model iconName = [model.iconName stringByAppendingString:@"_selected"]; } self.iconImageView.image = [UIImage imageNamed:iconName]; - + } @end diff --git a/ios/CustomCode/Modules/WalletList/ViewController/OKCreateSelectWalletTypeController.m b/ios/CustomCode/Modules/WalletList/ViewController/OKCreateSelectWalletTypeController.m index 07af47be8ef0..fd20cb8e23fe 100644 --- a/ios/CustomCode/Modules/WalletList/ViewController/OKCreateSelectWalletTypeController.m +++ b/ios/CustomCode/Modules/WalletList/ViewController/OKCreateSelectWalletTypeController.m @@ -59,13 +59,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath - (NSArray *)walletTypeListArray { if (!_walletTypeListArray) { - + OKCreateSelectWalletTypeModel *model = [OKCreateSelectWalletTypeModel new]; model.createWalletType = MyLocalizedString(@"Derivations based on HD Root Mnemonics (recommended)", nil); model.iconName = @"id_wallet"; model.tipsString = MyLocalizedString(@"With the HD logo, derived from the wallet root mnemonic (the mnemonic you copied when you first created your wallet), a mnemonic can create an infinite number of wallets in multiple currencies. It can also be used to recover all derived wallets, save time, effort and security, is the core bitcoin protocol BIP44 implementation", nil); model.addtype = OKAddTypeCreateHDDerived; - + OKCreateSelectWalletTypeModel *model1 = [OKCreateSelectWalletTypeModel new]; model1.createWalletType = MyLocalizedString(@"Independent wallet", nil); model1.iconName = @"solo_wallet"; diff --git a/ios/CustomCode/Modules/WalletList/ViewController/OKWalletListViewController.m b/ios/CustomCode/Modules/WalletList/ViewController/OKWalletListViewController.m index 9d1286586fc3..71e950706232 100644 --- a/ios/CustomCode/Modules/WalletList/ViewController/OKWalletListViewController.m +++ b/ios/CustomCode/Modules/WalletList/ViewController/OKWalletListViewController.m @@ -119,7 +119,7 @@ - (void)viewWillAppear:(BOOL)animated - (void)refreshListData { NSArray *listDictArray = [kPyCommandsManager callInterface:kInterfaceList_wallets parameter:@{}]; - + NSMutableArray *walletArray = [NSMutableArray arrayWithCapacity:listDictArray.count]; for (int i = 0; i < listDictArray.count; i++) { NSDictionary *outerModelDict = listDictArray[i]; @@ -151,7 +151,7 @@ - (void)refreshListData predicate = [NSPredicate predicateWithFormat:@"walletType contains %@",[walletType lowercaseString]]; } self.showList = [self.walletListArray filteredArrayUsingPredicate:predicate]; - + self.countLabel.text = [NSString stringWithFormat:@"%zd",self.showList.count]; self.headerWalletTypeLabel.text = [self headerWalletType:walletType]; if([kWalletManager.currentSelectCoinType isEqualToString:kDefaultType]){ @@ -159,7 +159,7 @@ - (void)refreshListData }else{ self.footBgView.hidden = YES; } - + if ([walletType isEqualToString:kDefaultType]) { self.detailBtn.hidden = self.showList.count== 0 ? YES:NO; self.detailLabel.hidden = self.showList.count== 0 ? YES:NO; @@ -376,19 +376,19 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa - (NSArray *)allCoinTypeArray { if (!_allCoinTypeArray) { - + OKWalletListCollectionViewCellModel *model0 = [OKWalletListCollectionViewCellModel new]; model0.coinType = @"HD"; model0.iconName = @"cointype_hd"; model0.isSelected = [kWalletManager.currentSelectCoinType isEqualToString:model0.coinType]; model0.headerWaletType = MyLocalizedString(@"HD derived wallet", nil); - + OKWalletListCollectionViewCellModel *model1 = [OKWalletListCollectionViewCellModel new]; model1.coinType = @"BTC"; model1.iconName = @"cointype_btc"; model1.isSelected = [kWalletManager.currentSelectCoinType isEqualToString:model1.coinType]; model1.headerWaletType = MyLocalizedString(@"BTC wallet", nil); - + // OKWalletListCollectionViewCellModel *model2 = [OKWalletListCollectionViewCellModel new]; // model2.coinType = @"ETH"; // model2.iconName = @"cointype_eth"; @@ -403,17 +403,17 @@ - (NSArray *)allCoinTypeArray - (NSArray *)NoHDArray { if (!_NoHDArray) { - + OKWalletListNoHDTableViewCellModel *model1 = [OKWalletListNoHDTableViewCellModel new]; model1.iconName = @"retorei_add"; model1.titleStr = MyLocalizedString(@"Add HD Wallet", nil); model1.descStr = MyLocalizedString(@"Support BTC, ETH and other main chain", nil); - + OKWalletListNoHDTableViewCellModel *model2 = [OKWalletListNoHDTableViewCellModel new]; model2.iconName = @"restore_phone"; model2.titleStr = MyLocalizedString(@"Restore the purse", nil); model2.descStr = MyLocalizedString(@"Import through mnemonic", nil); - + _NoHDArray = @[model1,model2]; } return _NoHDArray; diff --git a/ios/CustomCode/Modules/Web/WebViewVC.h b/ios/CustomCode/Modules/Web/WebViewVC.h index db3d46fcce27..8712ef6fc684 100644 --- a/ios/CustomCode/Modules/Web/WebViewVC.h +++ b/ios/CustomCode/Modules/Web/WebViewVC.h @@ -41,14 +41,14 @@ typedef void(^RightItemClickBlock)(void); /** 加载纯外部链接网页 - + @param string URL地址 */ - (void)loadWebURLSring:(NSString *)string; /** 加载本地网页 - + @param string 本地HTML文件名 */ - (void)loadWebHTMLSring:(NSString *)string; diff --git a/ios/CustomCode/Modules/Web/WebViewVC.m b/ios/CustomCode/Modules/Web/WebViewVC.m index 77348f6268b8..cde23b60bc77 100644 --- a/ios/CustomCode/Modules/Web/WebViewVC.m +++ b/ios/CustomCode/Modules/Web/WebViewVC.m @@ -98,7 +98,7 @@ - (void)changeNavagationbar{ + (WebViewVC *)loadWebViewControllerWithTitle:(NSString *)title url:(NSString *)url { WebViewVC *vc = [self loadWebViewControllerWithTitle:title url:url rightItemTitle:nil rightItemBlock:nil]; - + return vc; } @@ -134,7 +134,7 @@ - (void)viewDidLoad { self.progressView.y = [UIApplication sharedApplication].statusBarFrame.size.height + self.navigationController.navigationBar.height; } } - + if (@available(iOS 11.0, *)) { // 解决UIScrollView自动预留空白问题 self.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } else { @@ -161,7 +161,7 @@ -(void)viewWillAppear:(BOOL)animated - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - + _isShouldReload = YES; } @@ -294,12 +294,12 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati //KVO监听进度条 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - + if ([keyPath isEqualToString:NSStringFromSelector(@selector(estimatedProgress))] && object == self.wkWebView) { [self.progressView setAlpha:1.0f]; BOOL animated = self.wkWebView.estimatedProgress > self.progressView.progress; [self.progressView setProgress:self.wkWebView.estimatedProgress animated:animated]; - + // Once complete, fade out UIProgressView if(self.wkWebView.estimatedProgress >= 1.0f) { [UIView animateWithDuration:0.3f delay:0.3f options:UIViewAnimationOptionCurveEaseOut animations:^{ @@ -377,9 +377,9 @@ - (WKWebView *)wkWebView{ WKUserScript *dsbridgeJs = [[WKUserScript alloc]initWithSource:[NSString stringWithContentsOfURL:[NSURL fileURLWithPath:[[NSBundle mainBundle]pathForResource:@"dsbridge" ofType:@"js"]] encoding:NSUTF8StringEncoding error:nil] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]; [userContentController addUserScript:dsbridgeJs]; - + config.userContentController = userContentController; - + if (self.useProxy) { [config setURLSchemeHandler:[OKURLSchemeHandler new] forURLScheme:@"https"]; [config setURLSchemeHandler:[OKURLSchemeHandler new] forURLScheme:@"http"]; diff --git a/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.h b/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.h index ea05f48ccf39..8bcd8de53070 100755 --- a/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.h +++ b/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.h @@ -26,7 +26,7 @@ * Add a Javascript Object to dsBridge with namespace. * @param object * which implemented the javascript interfaces - * @param namespace + * @param namespace * if empty, the object have no namespace. **/ - (void)addJavascriptObject:(id _Nullable ) object namespace:(NSString * _Nullable) namespaces; diff --git a/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.m b/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.m index 67e4f93155f1..36b2cdc30566 100755 --- a/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.m +++ b/ios/CustomCode/Modules/Web/dsbridge/DWKWebView.m @@ -53,7 +53,7 @@ -(instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]; [configuration.userContentController addUserScript:script]; - self = [super initWithFrame:frame configuration: configuration]; + self = [super initWithFrame:frame configuration: configuration]; if (self) { super.UIDelegate=self; } @@ -83,7 +83,7 @@ - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSSt } } completionHandler(result); - + }else { if(!jsDialogBlock){ completionHandler(nil); @@ -272,12 +272,12 @@ -(NSString *)call:(NSString*) method :(NSString*) argStr } value=[JSBUtil objToJsonString:result]; value=[value stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; - + if(complete){ del=[@"delete window." stringByAppendingString:cb]; } NSString*js=[NSString stringWithFormat:@"try {%@(JSON.parse(decodeURIComponent(\"%@\")).data);%@; } catch(e){};",cb,(value == nil) ? @"" : value,del]; - + @synchronized(self) { UInt64 t=[[NSDate date] timeIntervalSince1970]*1000; @@ -291,13 +291,13 @@ -(NSString *)call:(NSString*) method :(NSString*) argStr [self evalJavascript:0]; } } - + }; SuppressPerformSelectorLeakWarning( [JavascriptInterfaceObject performSelector:selasyn withObject:arg withObject:completionHandler]; - + ); - + break; } }else if([JavascriptInterfaceObject respondsToSelector:sel]){ @@ -305,7 +305,7 @@ -(NSString *)call:(NSString*) method :(NSString*) argStr SuppressPerformSelectorLeakWarning( ret=[JavascriptInterfaceObject performSelector:sel withObject:arg]; ); - + [result setValue:@0 forKey:@"code"]; if(ret!=nil){ [result setValue:ret forKey:@"data"]; @@ -484,5 +484,3 @@ - (void)hasJavascriptMethod:(NSString *)handlerName methodExistCallback:(void (^ } @end - - diff --git a/ios/CustomCode/Modules/Web/dsbridge/InternalApis.h b/ios/CustomCode/Modules/Web/dsbridge/InternalApis.h index 9f32148eadf4..7e8f94b1448b 100755 --- a/ios/CustomCode/Modules/Web/dsbridge/InternalApis.h +++ b/ios/CustomCode/Modules/Web/dsbridge/InternalApis.h @@ -12,5 +12,3 @@ @interface InternalApis : NSObject @property (nullable, nonatomic, weak) DWKWebView* webview; @end - - diff --git a/ios/CustomCode/Modules/Web/dsbridge/JSBUtil.m b/ios/CustomCode/Modules/Web/dsbridge/JSBUtil.m index 50dac4aebe73..8d87d8b820aa 100755 --- a/ios/CustomCode/Modules/Web/dsbridge/JSBUtil.m +++ b/ios/CustomCode/Modules/Web/dsbridge/JSBUtil.m @@ -66,7 +66,7 @@ + (NSArray *)parseNamespace: (NSString *) method{ method=[method substringFromIndex:range.location+1]; } return @[namespace,method]; - + } @@ -75,7 +75,7 @@ + (id )jsonStringToObject:(NSString *)jsonString if (jsonString == nil) { return nil; } - + NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; NSError *err; NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData diff --git a/ios/Resources/OneKeyImages.xcassets/QRCodeScan/QRCode_Light.imageset/Contents.json b/ios/Resources/OneKeyImages.xcassets/QRCodeScan/QRCode_Light.imageset/Contents.json index dad3517b42bc..913be6f830ac 100644 --- a/ios/Resources/OneKeyImages.xcassets/QRCodeScan/QRCode_Light.imageset/Contents.json +++ b/ios/Resources/OneKeyImages.xcassets/QRCodeScan/QRCode_Light.imageset/Contents.json @@ -18,4 +18,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/ios/Resources/en.lproj/Localizable.strings b/ios/Resources/en.lproj/Localizable.strings index 03fea341e7e4..39ad55aff782 100644 --- a/ios/Resources/en.lproj/Localizable.strings +++ b/ios/Resources/en.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* +/* Localizable.strings OneKey @@ -322,4 +322,3 @@ // Hardware Wallet Associated - start "hardwareWallet.update.currentDesc" = "Current framework version \n当前蓝牙固件版本 \n升级固件前务必备份好钱包,否则可能造成资产损失"; // Hardware Wallet Associated - end - diff --git a/ios/Support/OneKey-Prefix.pch b/ios/Support/OneKey-Prefix.pch index b5a7df90bc93..ab12ada1b60c 100644 --- a/ios/Support/OneKey-Prefix.pch +++ b/ios/Support/OneKey-Prefix.pch @@ -17,4 +17,3 @@ #import "OneKeyImport.h" #endif - diff --git a/ios/Support/main.m b/ios/Support/main.m index ec9a602b6629..bb2f80d2ada2 100644 --- a/ios/Support/main.m +++ b/ios/Support/main.m @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) { putenv((char *)[python_path UTF8String]); NSString *documentPath = [NSString stringWithFormat:@"iOS_DATA=%@",[OKStorageManager getDocumentDirectoryPath]]; putenv((char *)[documentPath UTF8String]); - + NSString *DYLIB_PATH = [NSString stringWithFormat:@"DYLIB_PATH=%@/Frameworks",resourcePath]; putenv((char *)[DYLIB_PATH UTF8String]); // iOS provides a specific directory for temp files. diff --git a/ios/Support/site-package/Cryptodome/Cipher/AES.py b/ios/Support/site-package/Cryptodome/Cipher/AES.py index dd2671a69487..566a2079a142 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/AES.py +++ b/ios/Support/site-package/Cryptodome/Cipher/AES.py @@ -111,7 +111,7 @@ def _create_base_cipher(dict_parameters): def _derive_Poly1305_key_pair(key, nonce): """Derive a tuple (r, s, nonce) for a Poly1305 MAC. - + If nonce is ``None``, a new 16-byte nonce is generated. """ @@ -180,7 +180,7 @@ def new(key, mode, *args, **kwargs): For ``MODE_CTR``, its length must be in the range **[0..15]** (recommended: **8**). - + For ``MODE_SIV``, the nonce is optional, if it is not specified, then no nonce is being used, which renders the encryption deterministic. diff --git a/ios/Support/site-package/Cryptodome/Cipher/PKCS1_OAEP.py b/ios/Support/site-package/Cryptodome/Cipher/PKCS1_OAEP.py index 3207bbeb2a7b..54ae5b58a5b4 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/PKCS1_OAEP.py +++ b/ios/Support/site-package/Cryptodome/Cipher/PKCS1_OAEP.py @@ -236,4 +236,3 @@ def new(key, hashAlgo=None, mgfunc=None, label=b'', randfunc=None): if randfunc is None: randfunc = Random.get_random_bytes return PKCS1OAEP_Cipher(key, hashAlgo, mgfunc, label, randfunc) - diff --git a/ios/Support/site-package/Cryptodome/Cipher/PKCS1_v1_5.py b/ios/Support/site-package/Cryptodome/Cipher/PKCS1_v1_5.py index 1fd1626bad6d..c5fb914a738a 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/PKCS1_v1_5.py +++ b/ios/Support/site-package/Cryptodome/Cipher/PKCS1_v1_5.py @@ -196,4 +196,3 @@ def new(key, randfunc=None): if randfunc is None: randfunc = Random.get_random_bytes return PKCS115_Cipher(key, randfunc) - diff --git a/ios/Support/site-package/Cryptodome/Cipher/Salsa20.py b/ios/Support/site-package/Cryptodome/Cipher/Salsa20.py index 79e670175d3b..9a9c7d486f40 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/Salsa20.py +++ b/ios/Support/site-package/Cryptodome/Cipher/Salsa20.py @@ -92,15 +92,15 @@ def encrypt(self, plaintext, output=None): If ``output`` is ``None``, the ciphertext is returned as ``bytes``. Otherwise, ``None``. """ - + if output is None: ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -120,7 +120,7 @@ def encrypt(self, plaintext, output=None): def decrypt(self, ciphertext, output=None): """Decrypt a piece of data. - + Args: ciphertext(bytes/bytearray/memoryview): The data to decrypt, of any size. Keyword Args: @@ -164,4 +164,3 @@ def new(key, nonce=None): # Size of a key (in bytes) key_size = (16, 32) - diff --git a/ios/Support/site-package/Cryptodome/Cipher/_EKSBlowfish.py b/ios/Support/site-package/Cryptodome/Cipher/_EKSBlowfish.py index c1c3249a9adc..ec759cd5b7c5 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_EKSBlowfish.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_EKSBlowfish.py @@ -93,7 +93,7 @@ def _create_base_cipher(dict_parameters): def new(key, mode, salt, cost, invert): """Create a new EKSBlowfish cipher - + Args: key (bytes, bytearray, memoryview): diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_cbc.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_cbc.py index edc29ca61c17..2347ba32741f 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_cbc.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_cbc.py @@ -161,15 +161,15 @@ def encrypt(self, plaintext, output=None): if self.encrypt not in self._next: raise TypeError("encrypt() cannot be called after decrypt()") self._next = [ self.encrypt ] - + if output is None: ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -224,7 +224,7 @@ def decrypt(self, ciphertext, output=None): if self.decrypt not in self._next: raise TypeError("decrypt() cannot be called after encrypt()") self._next = [ self.decrypt ] - + if output is None: plaintext = create_string_buffer(len(ciphertext)) else: @@ -232,7 +232,7 @@ def decrypt(self, ciphertext, output=None): if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(ciphertext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_cfb.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_cfb.py index b790dd4368e8..0dcc26511dc7 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_cfb.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_cfb.py @@ -157,15 +157,15 @@ def encrypt(self, plaintext, output=None): if self.encrypt not in self._next: raise TypeError("encrypt() cannot be called after decrypt()") self._next = [ self.encrypt ] - + if output is None: ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -218,7 +218,7 @@ def decrypt(self, ciphertext, output=None): if self.decrypt not in self._next: raise TypeError("decrypt() cannot be called after encrypt()") self._next = [ self.decrypt ] - + if output is None: plaintext = create_string_buffer(len(ciphertext)) else: @@ -226,11 +226,11 @@ def decrypt(self, ciphertext, output=None): if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(ciphertext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) - + result = raw_cfb_lib.CFB_decrypt(self._state.get(), c_uint8_ptr(ciphertext), c_uint8_ptr(plaintext), diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_ctr.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_ctr.py index 99712d051a16..2e71b76def83 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_ctr.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_ctr.py @@ -184,15 +184,15 @@ def encrypt(self, plaintext, output=None): if self.encrypt not in self._next: raise TypeError("encrypt() cannot be called after decrypt()") self._next = [self.encrypt] - + if output is None: ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -206,7 +206,7 @@ def encrypt(self, plaintext, output=None): raise OverflowError("The counter has wrapped around in" " CTR mode") raise ValueError("Error %X while encrypting in CTR mode" % result) - + if output is None: return get_raw_buffer(ciphertext) else: @@ -248,7 +248,7 @@ def decrypt(self, ciphertext, output=None): if self.decrypt not in self._next: raise TypeError("decrypt() cannot be called after encrypt()") self._next = [self.decrypt] - + if output is None: plaintext = create_string_buffer(len(ciphertext)) else: @@ -256,7 +256,7 @@ def decrypt(self, ciphertext, output=None): if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(ciphertext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -271,7 +271,7 @@ def decrypt(self, ciphertext, output=None): raise OverflowError("The counter has wrapped around in" " CTR mode") raise ValueError("Error %X while decrypting in CTR mode" % result) - + if output is None: return get_raw_buffer(plaintext) else: @@ -337,7 +337,7 @@ def _create_ctr_cipher(factory, **kwargs): else: if len(nonce) >= factory.block_size: raise ValueError("Nonce is too long") - + # What is not nonce is counter counter_len = factory.block_size - len(nonce) diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_ecb.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_ecb.py index 4c381f7647fd..5ed19103aaa9 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_ecb.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_ecb.py @@ -123,10 +123,10 @@ def encrypt(self, plaintext, output=None): ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -139,7 +139,7 @@ def encrypt(self, plaintext, output=None): if result == 3: raise ValueError("Data must be aligned to block boundary in ECB mode") raise ValueError("Error %d while encrypting in ECB mode" % result) - + if output is None: return get_raw_buffer(ciphertext) else: @@ -173,7 +173,7 @@ def decrypt(self, ciphertext, output=None): If ``output`` is ``None``, the plaintext is returned as ``bytes``. Otherwise, ``None``. """ - + if output is None: plaintext = create_string_buffer(len(ciphertext)) else: @@ -181,7 +181,7 @@ def decrypt(self, ciphertext, output=None): if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(ciphertext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_gcm.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_gcm.py index c90061bcb9b7..70b2925ec55d 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_gcm.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_gcm.py @@ -186,7 +186,7 @@ def __init__(self, factory, key, nonce, mac_len, cipher_params, ghash_c): if len(nonce) == 0: raise ValueError("Nonce cannot be empty") - + if not is_buffer(nonce): raise TypeError("Nonce must be bytes, bytearray or memoryview") diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_ofb.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_ofb.py index 04aaccf88298..ef061251998d 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_ofb.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_ofb.py @@ -154,15 +154,15 @@ def encrypt(self, plaintext, output=None): if self.encrypt not in self._next: raise TypeError("encrypt() cannot be called after decrypt()") self._next = [ self.encrypt ] - + if output is None: ciphertext = create_string_buffer(len(plaintext)) else: ciphertext = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(plaintext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) @@ -215,7 +215,7 @@ def decrypt(self, ciphertext, output=None): if self.decrypt not in self._next: raise TypeError("decrypt() cannot be called after encrypt()") self._next = [ self.decrypt ] - + if output is None: plaintext = create_string_buffer(len(ciphertext)) else: @@ -223,7 +223,7 @@ def decrypt(self, ciphertext, output=None): if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(ciphertext) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(plaintext)) diff --git a/ios/Support/site-package/Cryptodome/Cipher/_mode_siv.py b/ios/Support/site-package/Cryptodome/Cipher/_mode_siv.py index d10c4dceb66a..1d1ad51ebe49 100644 --- a/ios/Support/site-package/Cryptodome/Cipher/_mode_siv.py +++ b/ios/Support/site-package/Cryptodome/Cipher/_mode_siv.py @@ -290,7 +290,7 @@ def encrypt_and_digest(self, plaintext, output=None): The first item becomes ``None`` when the ``output`` parameter specified a location for the result. """ - + if self.encrypt not in self._next: raise TypeError("encrypt() can only be called after" " initialization or an update()") @@ -302,7 +302,7 @@ def encrypt_and_digest(self, plaintext, output=None): self._kdf.update(self.nonce) self._kdf.update(plaintext) self._mac_tag = self._kdf.derive() - + cipher = self._create_ctr_cipher(self._mac_tag) return cipher.encrypt(plaintext, output=output), self._mac_tag @@ -350,7 +350,7 @@ def decrypt_and_verify(self, ciphertext, mac_tag, output=None): self._kdf.update(self.nonce) self._kdf.update(plaintext if output is None else output) self.verify(mac_tag) - + return plaintext diff --git a/ios/Support/site-package/Cryptodome/Hash/CMAC.py b/ios/Support/site-package/Cryptodome/Hash/CMAC.py index df69f0008c69..4db787dc8e0f 100644 --- a/ios/Support/site-package/Cryptodome/Hash/CMAC.py +++ b/ios/Support/site-package/Cryptodome/Hash/CMAC.py @@ -147,7 +147,7 @@ def update(self, msg): def _update(self, data_block): """Update a block aligned to the block boundary""" - + bs = self._block_size assert len(data_block) % bs == 0 @@ -294,10 +294,10 @@ def new(key, msg=None, ciphermod=None, cipher_params=None, mac_len=None, if mac_len is None: mac_len = ciphermod.block_size - + if mac_len < 4: raise ValueError("MAC tag length must be at least 4 bytes long") - + if mac_len > ciphermod.block_size: raise ValueError("MAC tag length cannot be larger than a cipher block (%d) bytes" % ciphermod.block_size) diff --git a/ios/Support/site-package/Cryptodome/Hash/Poly1305.py b/ios/Support/site-package/Cryptodome/Hash/Poly1305.py index c03f52292857..84bf53828a44 100644 --- a/ios/Support/site-package/Cryptodome/Hash/Poly1305.py +++ b/ios/Support/site-package/Cryptodome/Hash/Poly1305.py @@ -114,7 +114,7 @@ def digest(self): if self._mac_tag: return self._mac_tag - + bfr = create_string_buffer(16) result = _raw_poly1305.poly1305_digest(self._state.get(), bfr, @@ -206,12 +206,12 @@ def new(**kwargs): nonce = kwargs.pop("nonce", None) data = kwargs.pop("data", None) - + if kwargs: raise TypeError("Unknown parameters: " + str(kwargs)) r, s, nonce = cipher._derive_Poly1305_key_pair(cipher_key, nonce) - + new_mac = Poly1305_MAC(r, s, data) new_mac.nonce = _copy_bytes(None, None, nonce) # nonce may still be just a memoryview return new_mac diff --git a/ios/Support/site-package/Cryptodome/Math/Primality.py b/ios/Support/site-package/Cryptodome/Math/Primality.py index 08ea3ff186dc..d957e8a3ab6e 100644 --- a/ios/Support/site-package/Cryptodome/Math/Primality.py +++ b/ios/Support/site-package/Cryptodome/Math/Primality.py @@ -67,7 +67,7 @@ def miller_rabin_test(candidate, iterations, randfunc=None): if candidate in (1, 2, 3, 5): return PROBABLY_PRIME - + if candidate.is_even(): return COMPOSITE diff --git a/ios/Support/site-package/Cryptodome/Math/_IntegerBase.py b/ios/Support/site-package/Cryptodome/Math/_IntegerBase.py index f8cf3335f2e1..5cc731a545e1 100644 --- a/ios/Support/site-package/Cryptodome/Math/_IntegerBase.py +++ b/ios/Support/site-package/Cryptodome/Math/_IntegerBase.py @@ -228,7 +228,7 @@ def lcm(self, term): @abc.abstractmethod def jacobi_symbol(a, n): pass - + @staticmethod def _tonelli_shanks(n, p): """Tonelli-shanks algorithm for computing the square root @@ -389,4 +389,3 @@ def random_range(cls, **kwargs): randfunc=randfunc ) return norm_candidate + min_inclusive - diff --git a/ios/Support/site-package/Cryptodome/Math/_IntegerGMP.py b/ios/Support/site-package/Cryptodome/Math/_IntegerGMP.py index c8600204308f..d47ac0ef0497 100644 --- a/ios/Support/site-package/Cryptodome/Math/_IntegerGMP.py +++ b/ios/Support/site-package/Cryptodome/Math/_IntegerGMP.py @@ -157,7 +157,7 @@ def __init__(self, value): raise ValueError("A floating point type is not a natural number") self._initialized = True - + if is_native_int(value): _gmp.mpz_init(self._mpz_p) result = _gmp.gmp_sscanf(tobytes(str(value)), b"%Zd", self._mpz_p) diff --git a/ios/Support/site-package/Cryptodome/Protocol/KDF.py b/ios/Support/site-package/Cryptodome/Protocol/KDF.py index 4baa27687643..4a39690b352d 100644 --- a/ios/Support/site-package/Cryptodome/Protocol/KDF.py +++ b/ios/Support/site-package/Cryptodome/Protocol/KDF.py @@ -201,10 +201,10 @@ def __init__(self, key, ciphermod, cipher_params=None): self._key = _copy_bytes(None, None, key) self._ciphermod = ciphermod self._last_string = self._cache = b'\x00' * ciphermod.block_size - + # Max number of update() call we can process self._n_updates = ciphermod.block_size * 8 - 1 - + if cipher_params is None: self._cipher_params = {} else: diff --git a/ios/Support/site-package/Cryptodome/Random/__init__.py b/ios/Support/site-package/Cryptodome/Random/__init__.py index fd18d864083f..c28b8a9e5783 100644 --- a/ios/Support/site-package/Cryptodome/Random/__init__.py +++ b/ios/Support/site-package/Cryptodome/Random/__init__.py @@ -41,7 +41,7 @@ def reinit(self): def close(self): """Method provided for backward compatibility only.""" pass - + def new(*args, **kwargs): """Return a file-like object that outputs cryptographically random bytes.""" @@ -54,4 +54,3 @@ def atfork(): #: Function that returns a random byte string of the desired size. get_random_bytes = urandom - diff --git a/ios/Support/site-package/Cryptodome/Signature/PKCS1_v1_5.py b/ios/Support/site-package/Cryptodome/Signature/PKCS1_v1_5.py index d560663c6ae1..cfbb16916f47 100644 --- a/ios/Support/site-package/Cryptodome/Signature/PKCS1_v1_5.py +++ b/ios/Support/site-package/Cryptodome/Signature/PKCS1_v1_5.py @@ -50,4 +50,3 @@ def new(rsa_key): pkcs1._verify = pkcs1.verify pkcs1.verify = types.MethodType(_pycrypto_verify, pkcs1) return pkcs1 - diff --git a/ios/Support/site-package/Cryptodome/Signature/pkcs1_15.py b/ios/Support/site-package/Cryptodome/Signature/pkcs1_15.py index f572f859eeb7..8d4260c22531 100644 --- a/ios/Support/site-package/Cryptodome/Signature/pkcs1_15.py +++ b/ios/Support/site-package/Cryptodome/Signature/pkcs1_15.py @@ -219,4 +219,3 @@ def new(rsa_key): :return: a :class:`PKCS115_SigScheme` signature object """ return PKCS115_SigScheme(rsa_key) - diff --git a/ios/Support/site-package/Cryptodome/Signature/pss.py b/ios/Support/site-package/Cryptodome/Signature/pss.py index 0b05ed276a9d..1df2276693cd 100644 --- a/ios/Support/site-package/Cryptodome/Signature/pss.py +++ b/ios/Support/site-package/Cryptodome/Signature/pss.py @@ -178,7 +178,7 @@ def MGF1(mgfSeed, maskLen, hash_gen): :return: the mask, as a *byte string* """ - + T = b"" for counter in iter_range(ceil_div(maskLen, hash_gen.digest_size)): c = long_to_bytes(counter, 4) diff --git a/ios/Support/site-package/Cryptodome/Util/Padding.py b/ios/Support/site-package/Cryptodome/Util/Padding.py index 1c353d1e9561..d4cdd288e932 100644 --- a/ios/Support/site-package/Cryptodome/Util/Padding.py +++ b/ios/Support/site-package/Cryptodome/Util/Padding.py @@ -103,4 +103,3 @@ def unpad(padded_data, block_size, style='pkcs7'): else: raise ValueError("Unknown padding style") return padded_data[:-padding_len] - diff --git a/ios/Support/site-package/Cryptodome/Util/__init__.py b/ios/Support/site-package/Cryptodome/Util/__init__.py index 1862b82837db..9f12ed50501d 100644 --- a/ios/Support/site-package/Cryptodome/Util/__init__.py +++ b/ios/Support/site-package/Cryptodome/Util/__init__.py @@ -38,4 +38,3 @@ """ __all__ = ['RFC1751', 'number', 'strxor', 'asn1', 'Counter', 'Padding'] - diff --git a/ios/Support/site-package/Cryptodome/Util/_file_system.py b/ios/Support/site-package/Cryptodome/Util/_file_system.py index df08b8750e32..986fa040db77 100644 --- a/ios/Support/site-package/Cryptodome/Util/_file_system.py +++ b/ios/Support/site-package/Cryptodome/Util/_file_system.py @@ -51,4 +51,3 @@ def pycryptodome_filename(dir_comps, filename): path_so = dylib_path + "/" + dir_comps[1].split(".")[0] + ".framework" + "/" + dir_comps[1] return path_so # return os.path.join(root_lib, *dir_comps) - diff --git a/ios/Support/site-package/Cryptodome/Util/_raw_api.py b/ios/Support/site-package/Cryptodome/Util/_raw_api.py index e8dafbcd9efc..50ad14bbdf34 100644 --- a/ios/Support/site-package/Cryptodome/Util/_raw_api.py +++ b/ios/Support/site-package/Cryptodome/Util/_raw_api.py @@ -311,7 +311,7 @@ def load_pycryptodome_raw_lib(name, cdecl): if sys.version_info[:2] != (2, 6): - + def is_buffer(x): """Return True if object x supports the buffer interface""" return isinstance(x, (bytes, bytearray, memoryview)) diff --git a/ios/Support/site-package/Cryptodome/Util/asn1.py b/ios/Support/site-package/Cryptodome/Util/asn1.py index cbb1eb4a2a3e..d3d7605a3c64 100644 --- a/ios/Support/site-package/Cryptodome/Util/asn1.py +++ b/ios/Support/site-package/Cryptodome/Util/asn1.py @@ -137,7 +137,7 @@ def __init__(self, asn1Id=None, payload=b'', implicit=None, self._tag_octet = 0xA0 | self._convertTag(explicit) self._inner_tag_octet = 0x20 * constructed | asn1Id return - + self._tag_octet = 0x20 * constructed | asn1Id def _convertTag(self, tag): @@ -442,7 +442,7 @@ def hasInts(self, only_non_negative=True): only_non_negative (boolean): If ``True``, negative integers are not counted in. """ - + items = [x for x in self._seq if _is_number(x, only_non_negative)] return len(items) diff --git a/ios/Support/site-package/Cryptodome/Util/py3compat.py b/ios/Support/site-package/Cryptodome/Util/py3compat.py index 40ef752eec9a..c8e7ec17572f 100644 --- a/ios/Support/site-package/Cryptodome/Util/py3compat.py +++ b/ios/Support/site-package/Cryptodome/Util/py3compat.py @@ -95,7 +95,7 @@ def byte_string(s): _memoryview = types.NoneType else: _memoryview = memoryview - + iter_range = xrange def is_native_int(x): diff --git a/ios/Support/site-package/Cryptodome/Util/strxor.py b/ios/Support/site-package/Cryptodome/Util/strxor.py index 91fb4c9638bc..fbf1ca1492fc 100644 --- a/ios/Support/site-package/Cryptodome/Util/strxor.py +++ b/ios/Support/site-package/Cryptodome/Util/strxor.py @@ -46,7 +46,7 @@ def strxor(term1, term2, output=None): """XOR two byte strings. - + Args: term1 (bytes/bytearray/memoryview): The first term of the XOR operation. @@ -62,16 +62,16 @@ def strxor(term1, term2, output=None): if len(term1) != len(term2): raise ValueError("Only byte strings of equal length can be xored") - + if output is None: result = create_string_buffer(len(term1)) else: # Note: output may overlap with either input result = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(term1) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(term1)) @@ -105,16 +105,16 @@ def strxor_c(term, c, output=None): if not 0 <= c < 256: raise ValueError("c must be in range(256)") - + if output is None: result = create_string_buffer(len(term)) else: # Note: output may overlap with either input result = output - + if not is_writeable_buffer(output): raise TypeError("output must be a bytearray or a writeable memoryview") - + if len(term) != len(output): raise ValueError("output must have the same length as the input" " (%d bytes)" % len(term)) @@ -134,4 +134,3 @@ def strxor_c(term, c, output=None): def _strxor_direct(term1, term2, result): """Very fast XOR - check conditions!""" _raw_strxor.strxor(term1, term2, result, c_size_t(len(term1))) - diff --git a/ios/Support/site-package/ens-0.6.1.dist-info/DESCRIPTION.rst b/ios/Support/site-package/ens-0.6.1.dist-info/DESCRIPTION.rst index ee155c24871a..e962662100b3 100644 --- a/ios/Support/site-package/ens-0.6.1.dist-info/DESCRIPTION.rst +++ b/ios/Support/site-package/ens-0.6.1.dist-info/DESCRIPTION.rst @@ -336,7 +336,7 @@ In Python: :: from ens import ENS - from web3 import IPCProvider + from web3 import IPCProvider ens = ENS(IPCProvider('/your/custom/ipc/path')) @@ -402,5 +402,3 @@ if you're going to develop on top of Ethereum. Your ETH depends on it! .. |Join the chat at https://gitter.im/ens-py/Lobby| image:: https://badges.gitter.im/ens-py/Lobby.svg :target: https://gitter.im/ens-py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge - - diff --git a/ios/Support/site-package/ens-0.6.1.dist-info/METADATA b/ios/Support/site-package/ens-0.6.1.dist-info/METADATA index fc22a27f37ac..fb59e6c9562f 100644 --- a/ios/Support/site-package/ens-0.6.1.dist-info/METADATA +++ b/ios/Support/site-package/ens-0.6.1.dist-info/METADATA @@ -363,7 +363,7 @@ In Python: :: from ens import ENS - from web3 import IPCProvider + from web3 import IPCProvider ens = ENS(IPCProvider('/your/custom/ipc/path')) @@ -429,5 +429,3 @@ if you're going to develop on top of Ethereum. Your ETH depends on it! .. |Join the chat at https://gitter.im/ens-py/Lobby| image:: https://badges.gitter.im/ens-py/Lobby.svg :target: https://gitter.im/ens-py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge - - diff --git a/ios/Support/site-package/ens-0.6.1.dist-info/WHEEL b/ios/Support/site-package/ens-0.6.1.dist-info/WHEEL index bb7f7dba612b..f1c0b224cedf 100644 --- a/ios/Support/site-package/ens-0.6.1.dist-info/WHEEL +++ b/ios/Support/site-package/ens-0.6.1.dist-info/WHEEL @@ -2,4 +2,3 @@ Wheel-Version: 1.0 Generator: bdist_wheel (0.29.0) Root-Is-Purelib: true Tag: py3-none-any - diff --git a/ios/Support/site-package/ens-0.6.1.dist-info/metadata.json b/ios/Support/site-package/ens-0.6.1.dist-info/metadata.json index 8cb1b8e738fb..48a349c893bd 100644 --- a/ios/Support/site-package/ens-0.6.1.dist-info/metadata.json +++ b/ios/Support/site-package/ens-0.6.1.dist-info/metadata.json @@ -1 +1 @@ -{"classifiers": ["Development Status :: 4 - Beta", "Intended Audience :: Information Technology", "Topic :: Database :: Front-Ends", "Topic :: Internet :: Finger", "Topic :: Internet :: Name Service (DNS)", "Topic :: Security :: Cryptography", "Topic :: System :: Distributed Computing", "Topic :: System :: Systems Administration :: Authentication/Directory", "Topic :: Utilities", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5"], "description_content_type": "UNKNOWN", "extensions": {"python.details": {"contacts": [{"email": "ut96caarrs@snkmail.com", "name": "Jason Carver", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "https://github.com/carver/ens.py"}}}, "extras": [], "generator": "bdist_wheel (0.29.0)", "keywords": ["ethereum", "eth", "web3", "web3.py", "ENS"], "license": "MIT", "metadata_version": "2.0", "name": "ens", "requires_python": ">=3.5", "run_requires": [{"requires": ["pytz", "web3 (<4,>=3.16.1)"]}], "summary": "Ethereum Name Service, made easy in Python", "version": "0.6.1"} \ No newline at end of file +{"classifiers": ["Development Status :: 4 - Beta", "Intended Audience :: Information Technology", "Topic :: Database :: Front-Ends", "Topic :: Internet :: Finger", "Topic :: Internet :: Name Service (DNS)", "Topic :: Security :: Cryptography", "Topic :: System :: Distributed Computing", "Topic :: System :: Systems Administration :: Authentication/Directory", "Topic :: Utilities", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5"], "description_content_type": "UNKNOWN", "extensions": {"python.details": {"contacts": [{"email": "ut96caarrs@snkmail.com", "name": "Jason Carver", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "https://github.com/carver/ens.py"}}}, "extras": [], "generator": "bdist_wheel (0.29.0)", "keywords": ["ethereum", "eth", "web3", "web3.py", "ENS"], "license": "MIT", "metadata_version": "2.0", "name": "ens", "requires_python": ">=3.5", "run_requires": [{"requires": ["pytz", "web3 (<4,>=3.16.1)"]}], "summary": "Ethereum Name Service, made easy in Python", "version": "0.6.1"} diff --git a/ios/Support/site-package/eth_account-0.5.4.dist-info/METADATA b/ios/Support/site-package/eth_account-0.5.4.dist-info/METADATA index 6d504400f11b..37010df438b9 100644 --- a/ios/Support/site-package/eth_account-0.5.4.dist-info/METADATA +++ b/ios/Support/site-package/eth_account-0.5.4.dist-info/METADATA @@ -163,5 +163,3 @@ If you are in a beta version, `make release bump=stage` will switch to a stable. To issue an unstable version when the current version is stable, specify the new version explicitly, like `make release bump="--new-version 4.0.0-alpha.1 devnum"` - - diff --git a/ios/Support/site-package/eth_account-0.5.4.dist-info/WHEEL b/ios/Support/site-package/eth_account-0.5.4.dist-info/WHEEL index b552003ff90e..9313fc8fa704 100644 --- a/ios/Support/site-package/eth_account-0.5.4.dist-info/WHEEL +++ b/ios/Support/site-package/eth_account-0.5.4.dist-info/WHEEL @@ -2,4 +2,3 @@ Wheel-Version: 1.0 Generator: bdist_wheel (0.34.2) Root-Is-Purelib: true Tag: py3-none-any - diff --git a/ios/Support/site-package/eth_hash-0.2.0.dist-info/METADATA b/ios/Support/site-package/eth_hash-0.2.0.dist-info/METADATA index 15ccc063ac9f..6ca52fdbd83b 100644 --- a/ios/Support/site-package/eth_hash-0.2.0.dist-info/METADATA +++ b/ios/Support/site-package/eth_hash-0.2.0.dist-info/METADATA @@ -181,5 +181,3 @@ the new version explicitly, like :target: https://pypi.python.org/pypi/eth-hash .. |Docs build| image:: https://readthedocs.org/projects/eth-hash/badge/?version=latest :target: http://eth-hash.readthedocs.io/en/latest/?badge=latest - - diff --git a/ios/Support/site-package/eth_hash-0.2.0.dist-info/WHEEL b/ios/Support/site-package/eth_hash-0.2.0.dist-info/WHEEL index bff023edf224..a728cfe39836 100644 --- a/ios/Support/site-package/eth_hash-0.2.0.dist-info/WHEEL +++ b/ios/Support/site-package/eth_hash-0.2.0.dist-info/WHEEL @@ -2,4 +2,3 @@ Wheel-Version: 1.0 Generator: bdist_wheel (0.31.1) Root-Is-Purelib: true Tag: py3-none-any - diff --git a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/DESCRIPTION.rst b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/DESCRIPTION.rst index 6b6d685be9b4..2cbf2e3c41a9 100644 --- a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/DESCRIPTION.rst +++ b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/DESCRIPTION.rst @@ -190,5 +190,3 @@ password for the keyfile. Returns the private key as a bytestring. >>> extract_key_from_keyfile('path/to-my-keystore/keyfile.json', b'foo') b'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01' - - diff --git a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/METADATA b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/METADATA index c5d939603db8..253541f91324 100644 --- a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/METADATA +++ b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/METADATA @@ -215,5 +215,3 @@ password for the keyfile. Returns the private key as a bytestring. >>> extract_key_from_keyfile('path/to-my-keystore/keyfile.json', b'foo') b'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01' - - diff --git a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/WHEEL b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/WHEEL index 6261a26e7a4c..de70ba085dd2 100644 --- a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/WHEEL +++ b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/WHEEL @@ -2,4 +2,3 @@ Wheel-Version: 1.0 Generator: bdist_wheel (0.30.0) Root-Is-Purelib: true Tag: py3-none-any - diff --git a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/metadata.json b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/metadata.json index 97fefe155770..3fee6972699e 100644 --- a/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/metadata.json +++ b/ios/Support/site-package/eth_keyfile-0.5.1.dist-info/metadata.json @@ -1 +1 @@ -{"classifiers": ["Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5"], "description_content_type": "UNKNOWN", "extensions": {"python.details": {"contacts": [{"email": "pipermerriam@gmail.com", "name": "Piper Merriam", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "https://github.com/ethereum/eth-keyfile"}}}, "extras": [], "generator": "bdist_wheel (0.30.0)", "keywords": ["ethereum"], "license": "MIT", "metadata_version": "2.0", "name": "eth-keyfile", "run_requires": [{"requires": ["cytoolz (<1.0.0,>=0.9.0)", "eth-keys (<1.0.0,>=0.1.0-beta.4)", "eth-utils (<2.0.0,>=1.0.0-beta.1)", "pycryptodome (<4.0.0,>=3.4.7)"]}], "summary": "A library for handling the encrypted keyfiles used to store ethereum private keys.", "version": "0.5.1"} \ No newline at end of file +{"classifiers": ["Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5"], "description_content_type": "UNKNOWN", "extensions": {"python.details": {"contacts": [{"email": "pipermerriam@gmail.com", "name": "Piper Merriam", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "https://github.com/ethereum/eth-keyfile"}}}, "extras": [], "generator": "bdist_wheel (0.30.0)", "keywords": ["ethereum"], "license": "MIT", "metadata_version": "2.0", "name": "eth-keyfile", "run_requires": [{"requires": ["cytoolz (<1.0.0,>=0.9.0)", "eth-keys (<1.0.0,>=0.1.0-beta.4)", "eth-utils (<2.0.0,>=1.0.0-beta.1)", "pycryptodome (<4.0.0,>=3.4.7)"]}], "summary": "A library for handling the encrypted keyfiles used to store ethereum private keys.", "version": "0.5.1"} diff --git a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/LICENSE.rst b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/LICENSE.rst index 23f8f3347605..0dd77fe4229d 100644 --- a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/LICENSE.rst +++ b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/LICENSE.rst @@ -63,9 +63,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OCB license =========== -The OCB cipher mode is patented in the US under patent numbers 7,949,129 and -8,321,675. The directory Doc/ocb contains three free licenses for implementors -and users. As a general statement, OCB can be freely used for software not meant +The OCB cipher mode is patented in the US under patent numbers 7,949,129 and +8,321,675. The directory Doc/ocb contains three free licenses for implementors +and users. As a general statement, OCB can be freely used for software not meant for military purposes. Contact your attorney for further information. Apache 2.0 license (Wycheproof) diff --git a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/METADATA b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/METADATA index 0309cc4daf1a..a1548332cdf3 100644 --- a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/METADATA +++ b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/METADATA @@ -79,5 +79,3 @@ All the code can be downloaded from `GitHub`_. .. _pycryptodome: https://pypi.python.org/pypi/pycryptodome .. _`homepage`: http://www.pycryptodome.org .. _GitHub: https://github.com/Legrandin/pycryptodome - - diff --git a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/WHEEL b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/WHEEL index 25e94cbc3d88..7fe92918de58 100644 --- a/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/WHEEL +++ b/ios/Support/site-package/pycryptodomex-3.9.8.dist-info/WHEEL @@ -2,4 +2,3 @@ Wheel-Version: 1.0 Generator: bdist_wheel (0.34.2) Root-Is-Purelib: false Tag: cp38-cp38-macosx_10_9_x86_64 - diff --git a/ios/overrides/OneKey/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/overrides/OneKey/Images.xcassets/AppIcon.appiconset/Contents.json index 0ac5e35157f0..397deea80d27 100644 --- a/ios/overrides/OneKey/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/overrides/OneKey/Images.xcassets/AppIcon.appiconset/Contents.json @@ -113,4 +113,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/ios/recompile_python.sh b/ios/recompile_python.sh index 3bf8e384e5bc..c0b19b7cab10 100755 --- a/ios/recompile_python.sh +++ b/ios/recompile_python.sh @@ -12,7 +12,7 @@ fi if [ "$1" == "-k" ]; then - find "$dir1" "$dir2" -type d -name __pycache__ -exec rm -fvr {} \; + find "$dir1" "$dir2" -type d -name __pycache__ -exec rm -fvr {} \; find "$dir1" "$dir2" -type f -name \*.pyc -exec rm -fvr {} \; elif [ -n "$1" ]; then echo "Usage: $0 [-k]" @@ -22,13 +22,10 @@ elif [ -n "$1" ]; then echo "" else originaldir=`pwd` - cd "$dir1" + cd "$dir1" python3.6 -m compileall . || exit 1 - cd "$originaldir" + cd "$originaldir" cd "$dir2" python3.6 -m compileall . || exit 1 cd "$originaldir" fi - - - diff --git a/ios/update_project.rb b/ios/update_project.rb index c777a868caf5..a191f81ae751 100755 --- a/ios/update_project.rb +++ b/ios/update_project.rb @@ -27,5 +27,3 @@ # Save the project project.save(); - - diff --git a/regnet.md b/regnet.md index a9b17dde972e..fd0bb1a7421a 100644 --- a/regnet.md +++ b/regnet.md @@ -17,7 +17,7 @@ exit guitar chalk discover ring pluck avocado limb example volcano snap interest Vpub5fULw6tvH6udtVSXtU1fc2dRYumVPEb2VS9AjFeqrt4MbE5qxduJur8jgGMt1AhiFv2NTgvrc4KbrwGEvLSqDDcCQvTBMw2ir4DgA2WZwme -# run +# run ./run_electrum --regtest