Skip to content

Commit 1903c19

Browse files
reasjereasje
authored
Merge pull request #57 from JDI-Group/pre_main_qa
Pre main qa
2 parents 64b051d + b3c3e9c commit 1903c19

File tree

11 files changed

+132
-136
lines changed

11 files changed

+132
-136
lines changed

‎.github/workflows/compile.yml‎

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "$(( ${{ secrets.DEV_ENV_FILE_CONTENT }} + 67 ))" > .env
2727
shell: bash
2828

29-
- uses: reasje/action-flutter-build-android@main
29+
- uses: sheenhx/action-flutter-build-android@main
3030
with:
3131
keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }}
3232
keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}"
@@ -52,117 +52,117 @@ jobs:
5252
source-dir: build/app/outputs/flutter-apk
5353
destination-dir: app
5454

55-
build-macos:
56-
name: Build-ios
57-
# https://github.com/actions/runner-images
58-
# https://xcodereleases.com/
59-
runs-on: macos-15
60-
steps:
61-
- name: Select Xcode version 16.3
62-
run: sudo xcode-select -s /Applications/Xcode_16.3.app
55+
# build-macos:
56+
# name: Build-ios
57+
# # https://github.com/actions/runner-images
58+
# # https://xcodereleases.com/
59+
# runs-on: macos-15
60+
# steps:
61+
# - name: Select Xcode version 16.3
62+
# run: sudo xcode-select -s /Applications/Xcode_16.3.app
6363

6464

65-
- name: Checkout code with submodules
66-
uses: actions/checkout@v4
67-
with:
68-
submodules: recursive
65+
# - name: Checkout code with submodules
66+
# uses: actions/checkout@v4
67+
# with:
68+
# submodules: recursive
6969

70-
- name: Setup .env file
71-
run: |
72-
echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
73-
shell: bash
74-
75-
- uses: sheenhx/action-flutter-build-ios@main
76-
with:
77-
# always use --export-options-plist=ios/GithubActionsExportOptions.plist
78-
build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist
79-
certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
80-
certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
81-
provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
82-
keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
83-
84-
- name: Archive IPA
85-
uses: actions/upload-artifact@v4
86-
with:
87-
name: release-ipa
88-
# Try running the build locally with the build command to be sure of this path
89-
path: build/ios/ipa/*.ipa
90-
91-
build-macos-simulator:
92-
name: Build-ios-simulator
93-
# https://github.com/actions/runner-images
94-
# https://xcodereleases.com/
95-
runs-on: macos-15
96-
97-
steps:
98-
- name: Select Xcode version 16.3
99-
run: sudo xcode-select -s /Applications/Xcode_16.3.app
70+
# - name: Setup .env file
71+
# run: |
72+
# echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
73+
# shell: bash
74+
75+
# - uses: sheenhx/action-flutter-build-ios@main
76+
# with:
77+
# # always use --export-options-plist=ios/GithubActionsExportOptions.plist
78+
# build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist
79+
# certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
80+
# certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
81+
# provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
82+
# keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
83+
84+
# - name: Archive IPA
85+
# uses: actions/upload-artifact@v4
86+
# with:
87+
# name: release-ipa
88+
# # Try running the build locally with the build command to be sure of this path
89+
# path: build/ios/ipa/*.ipa
90+
91+
# build-macos-simulator:
92+
# name: Build-ios-simulator
93+
# # https://github.com/actions/runner-images
94+
# # https://xcodereleases.com/
95+
# runs-on: macos-15
96+
97+
# steps:
98+
# - name: Select Xcode version 16.3
99+
# run: sudo xcode-select -s /Applications/Xcode_16.3.app
100100

101-
- name: Checkout code with submodules
102-
uses: actions/checkout@v4
103-
with:
104-
submodules: recursive
101+
# - name: Checkout code with submodules
102+
# uses: actions/checkout@v4
103+
# with:
104+
# submodules: recursive
105105

106-
- name: Setup .env file
107-
run: |
108-
echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
109-
shell: bash
110-
111-
- uses: sheenhx/action-flutter-build-ios@main
112-
with:
113-
# always use --export-options-plist=ios/GithubActionsExportOptions.plist
114-
build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug
115-
certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
116-
certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
117-
provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
118-
keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
119-
120-
- name: Archive .app
121-
uses: actions/upload-artifact@v4
122-
with:
123-
name: simulator-app
124-
# Try running the build locally with the build command to be sure of this path
125-
path: build/ios/iphonesimulator/*.app
126-
127-
upload-combined:
128-
permissions: write-all
129-
name: Combine and Upload Builds
130-
needs: [build-apk, build-macos]
131-
runs-on: ubuntu-latest
132-
steps:
133-
- name: Download Ubuntu artifact
134-
uses: actions/download-artifact@v4
135-
with:
136-
name: release-apk
137-
path: combined-builds/android
138-
139-
- name: Download macOS artifact
140-
uses: actions/download-artifact@v4
141-
with:
142-
name: release-ipa
143-
path: combined-builds/iOS
144-
145-
- name: Upload combined artifacts
146-
uses: actions/upload-artifact@v4
147-
with:
148-
name: combined-builds
149-
path: combined-builds
150-
151-
- name: Generate
152-
id: generate
153-
uses: AcmeSoftwareLLC/app-build-number@v1
154-
with:
155-
timezone: Asia/Kathmandu
106+
# - name: Setup .env file
107+
# run: |
108+
# echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
109+
# shell: bash
110+
111+
# - uses: sheenhx/action-flutter-build-ios@main
112+
# with:
113+
# # always use --export-options-plist=ios/GithubActionsExportOptions.plist
114+
# build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug
115+
# certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
116+
# certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
117+
# provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
118+
# keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
119+
120+
# - name: Archive .app
121+
# uses: actions/upload-artifact@v4
122+
# with:
123+
# name: simulator-app
124+
# # Try running the build locally with the build command to be sure of this path
125+
# path: build/ios/iphonesimulator/*.app
126+
127+
# upload-combined:
128+
# permissions: write-all
129+
# name: Combine and Upload Builds
130+
# needs: [build-apk, build-macos]
131+
# runs-on: ubuntu-latest
132+
# steps:
133+
# - name: Download Ubuntu artifact
134+
# uses: actions/download-artifact@v4
135+
# with:
136+
# name: release-apk
137+
# path: combined-builds/android
138+
139+
# - name: Download macOS artifact
140+
# uses: actions/download-artifact@v4
141+
# with:
142+
# name: release-ipa
143+
# path: combined-builds/iOS
144+
145+
# - name: Upload combined artifacts
146+
# uses: actions/upload-artifact@v4
147+
# with:
148+
# name: combined-builds
149+
# path: combined-builds
150+
151+
# - name: Generate
152+
# id: generate
153+
# uses: AcmeSoftwareLLC/app-build-number@v1
154+
# with:
155+
# timezone: Asia/Kathmandu
156156

157-
- name: Display the generated build number
158-
run: echo "Build Number > ${{ steps.generate.outputs.build-number }}"
157+
# - name: Display the generated build number
158+
# run: echo "Build Number > ${{ steps.generate.outputs.build-number }}"
159159

160160

161-
- uses: ncipollo/release-action@v1
162-
with:
163-
artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa"
164-
tag: ${{ steps.generate.outputs.build-number }}
165-
name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com"
166-
generateReleaseNotes: true
167-
body: >
168-
<a href="https://play.google.com/store/apps/details?id=com.moonchain.app" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/802b4fa6-8978-4b01-8de7-68207a5f8d77"></a><a href="https://apps.apple.com/app/moonbase-the-mining-hub/id6736371768" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/ed4678e2-4099-498c-92ee-94b88b620c21"></a>
161+
# - uses: ncipollo/release-action@v1
162+
# with:
163+
# artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa"
164+
# tag: ${{ steps.generate.outputs.build-number }}
165+
# name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com"
166+
# generateReleaseNotes: true
167+
# body: >
168+
# <a href="https://play.google.com/store/apps/details?id=com.moonchain.app" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/802b4fa6-8978-4b01-8de7-68207a5f8d77"></a><a href="https://apps.apple.com/app/moonbase-the-mining-hub/id6736371768" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/ed4678e2-4099-498c-92ee-94b88b620c21"></a>

‎.github/workflows/submit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "$(( ${{ secrets.PROD_ENV_FILE_CONTENT }} + 67 ))" > .env
2525
shell: bash
2626

27-
- uses: reasje/action-flutter-build-android@main
27+
- uses: sheenhx/action-flutter-build-android@main
2828
with:
2929
keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }}
3030
keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}"

‎android/app/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3636

3737
android {
3838
namespace "com.moonchain.app"
39-
39+
4040
compileSdkVersion rootProject.ext.compileSdkVersion
4141
buildToolsVersion "33.0.1"
4242
ndkVersion flutter.ndkVersion
@@ -63,10 +63,6 @@ android {
6363
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
6464
minSdkVersion 21
6565
minSdk 21
66-
manifestPlaceholders = [
67-
minSdkVersion: "21",
68-
applicationName: "android.app.Application"
69-
]
7066
targetSdkVersion rootProject.ext.targetSdkVersion
7167
versionCode System.getenv('VERSION_CODE')?.hashCode()?.abs() ?: 404
7268
versionName flutterVersionName

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
5353

5454
<application tools:replace="android:label" android:label="MoonBase" android:name="${applicationName}" android:icon="@mipmap/launcher_icon" android:theme="@style/LaunchTheme" android:requestLegacyExternalStorage="true">
55-
55+
5656
# This is line is to disable Impeller
5757
<meta-data
5858
android:name="io.flutter.embedding.android.EnableImpeller"

‎android/app/src/main/kotlin/com/example/datadashwallet/MainActivity.kt‎ renamed to ‎android/app/src/main/kotlin/com/moonchain/app/MainActivity.kt‎

File renamed without changes.

‎android/gradle.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
kotlin.jvm.target.validation.mode = IGNORE
5-
android.ndk.suppressMinSdkVersionError=21
4+
kotlin.jvm.target.validation.mode = IGNORE

‎lib/common/components/snackbar/snackbar.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ void showSnackBar({
9898
? MediaQuery.of(
9999
context,
100100
).size.height -
101-
285
101+
350
102102
: 0,
103103
top: SnackBarPosition.top == snackBarPosition
104-
? MediaQuery.of(context).padding.top
104+
? MediaQuery.of(context).viewInsets.bottom +
105+
MediaQuery.of(context).padding.bottom
105106
: 0.0,
106107
),
107108
duration: const Duration(seconds: 4),
@@ -223,6 +224,5 @@ void showSnackBar({
223224
);
224225

225226
RootScaffoldMessenger.key.currentState?.clearSnackBars();
226-
ScaffoldMessenger.of(context).clearSnackBars();
227227
RootScaffoldMessenger.showSnackBar(snackBar);
228228
}

‎lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
170170

171171
final h3 = const H3Factory().load();
172172

173-
final hexagonBigInt = h3.geoToH3(
173+
final hexagonBigInt = h3.geoToCell(
174174
GeoCoord(
175175
lon: currentLocation.longitude, lat: currentLocation.latitude),
176176
Config.h3Resolution);

‎packages/shared‎

‎pubspec.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -941,10 +941,10 @@ packages:
941941
dependency: transitive
942942
description:
943943
name: geojson2h3
944-
sha256: "9786d9fa144f1a64063b63cfaf8e7b3ddec40d64f873f3ae9773500593080cd9"
944+
sha256: "54305801c0bac29dc2c192dcfe30d2bd95830fa0935b695423187741bb18d300"
945945
url: "https://pub.flutter-io.cn"
946946
source: hosted
947-
version: "0.6.1"
947+
version: "0.7.0"
948948
geolocator:
949949
dependency: "direct main"
950950
description:
@@ -1149,34 +1149,34 @@ packages:
11491149
dependency: transitive
11501150
description:
11511151
name: h3_common
1152-
sha256: "1d92424c97c0db1a2f4bd1ccd51f865934d01f211be9d33edaf12a2c68f8427f"
1152+
sha256: "974d33d58c49ccaaf9cb1eb0bf860a21dbe25a8708c26e00fb742ba85525a905"
11531153
url: "https://pub.flutter-io.cn"
11541154
source: hosted
1155-
version: "0.6.1"
1155+
version: "0.7.0"
11561156
h3_ffi:
11571157
dependency: transitive
11581158
description:
11591159
name: h3_ffi
1160-
sha256: "9b13cf77ad867d3ef3362d86771f4930398cd88b657d9e154aba4ca0bda93540"
1160+
sha256: e8d1b3abfb74242f71750fe909c3dd4c571f90185b3fe9fd25a776a382e878df
11611161
url: "https://pub.flutter-io.cn"
11621162
source: hosted
1163-
version: "0.6.2"
1163+
version: "0.7.0"
11641164
h3_flutter:
11651165
dependency: "direct main"
11661166
description:
11671167
name: h3_flutter
1168-
sha256: ccc62394641c43fccf87fec063a639a851ba0f30ec0caa0afeb455aebe581297
1168+
sha256: "78cd5f179e6d9dd5c9785568f3f74ee7ff059e88c446c7a8768daa9a59cfa8a1"
11691169
url: "https://pub.flutter-io.cn"
11701170
source: hosted
1171-
version: "0.6.6"
1171+
version: "0.7.0"
11721172
h3_web:
11731173
dependency: transitive
11741174
description:
11751175
name: h3_web
1176-
sha256: "0997e3bcebefd2dcecbb3396b9e0a9dc6d9619c5eb2dfe6809b4046e05c7b0ac"
1176+
sha256: beeb3c07ebff03b74f3f1d2ea1494428132b076a2866c080084fc6308ee4c8f3
11771177
url: "https://pub.flutter-io.cn"
11781178
source: hosted
1179-
version: "0.6.1"
1179+
version: "0.7.0"
11801180
hashcodes:
11811181
dependency: transitive
11821182
description:
@@ -1306,13 +1306,13 @@ packages:
13061306
source: hosted
13071307
version: "2.0.0"
13081308
js:
1309-
dependency: transitive
1309+
dependency: "direct overridden"
13101310
description:
13111311
name: js
1312-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
1312+
sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
13131313
url: "https://pub.flutter-io.cn"
13141314
source: hosted
1315-
version: "0.6.7"
1315+
version: "0.7.2"
13161316
json_annotation:
13171317
dependency: transitive
13181318
description:

0 commit comments

Comments
 (0)