Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 107 additions & 107 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
echo "$(( ${{ secrets.DEV_ENV_FILE_CONTENT }} + 67 ))" > .env
shell: bash

- uses: reasje/action-flutter-build-android@main
- uses: sheenhx/action-flutter-build-android@main
with:
keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }}
keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}"
Expand All @@ -52,117 +52,117 @@ jobs:
source-dir: build/app/outputs/flutter-apk
destination-dir: app

build-macos:
name: Build-ios
# https://github.com/actions/runner-images
# https://xcodereleases.com/
runs-on: macos-15
steps:
- name: Select Xcode version 16.3
run: sudo xcode-select -s /Applications/Xcode_16.3.app
# build-macos:
# name: Build-ios
# # https://github.com/actions/runner-images
# # https://xcodereleases.com/
# runs-on: macos-15
# steps:
# - name: Select Xcode version 16.3
# run: sudo xcode-select -s /Applications/Xcode_16.3.app


- name: Checkout code with submodules
uses: actions/checkout@v4
with:
submodules: recursive
# - name: Checkout code with submodules
# uses: actions/checkout@v4
# with:
# submodules: recursive

- name: Setup .env file
run: |
echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
shell: bash

- uses: sheenhx/action-flutter-build-ios@main
with:
# always use --export-options-plist=ios/GithubActionsExportOptions.plist
build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist
certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}

- name: Archive IPA
uses: actions/upload-artifact@v4
with:
name: release-ipa
# Try running the build locally with the build command to be sure of this path
path: build/ios/ipa/*.ipa

build-macos-simulator:
name: Build-ios-simulator
# https://github.com/actions/runner-images
# https://xcodereleases.com/
runs-on: macos-15

steps:
- name: Select Xcode version 16.3
run: sudo xcode-select -s /Applications/Xcode_16.3.app
# - name: Setup .env file
# run: |
# echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
# shell: bash

# - uses: sheenhx/action-flutter-build-ios@main
# with:
# # always use --export-options-plist=ios/GithubActionsExportOptions.plist
# build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist
# certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
# certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
# provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
# keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}

# - name: Archive IPA
# uses: actions/upload-artifact@v4
# with:
# name: release-ipa
# # Try running the build locally with the build command to be sure of this path
# path: build/ios/ipa/*.ipa

# build-macos-simulator:
# name: Build-ios-simulator
# # https://github.com/actions/runner-images
# # https://xcodereleases.com/
# runs-on: macos-15

# steps:
# - name: Select Xcode version 16.3
# run: sudo xcode-select -s /Applications/Xcode_16.3.app

- name: Checkout code with submodules
uses: actions/checkout@v4
with:
submodules: recursive
# - name: Checkout code with submodules
# uses: actions/checkout@v4
# with:
# submodules: recursive

- name: Setup .env file
run: |
echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
shell: bash

- uses: sheenhx/action-flutter-build-ios@main
with:
# always use --export-options-plist=ios/GithubActionsExportOptions.plist
build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug
certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}

- name: Archive .app
uses: actions/upload-artifact@v4
with:
name: simulator-app
# Try running the build locally with the build command to be sure of this path
path: build/ios/iphonesimulator/*.app

upload-combined:
permissions: write-all
name: Combine and Upload Builds
needs: [build-apk, build-macos]
runs-on: ubuntu-latest
steps:
- name: Download Ubuntu artifact
uses: actions/download-artifact@v4
with:
name: release-apk
path: combined-builds/android

- name: Download macOS artifact
uses: actions/download-artifact@v4
with:
name: release-ipa
path: combined-builds/iOS

- name: Upload combined artifacts
uses: actions/upload-artifact@v4
with:
name: combined-builds
path: combined-builds

- name: Generate
id: generate
uses: AcmeSoftwareLLC/app-build-number@v1
with:
timezone: Asia/Kathmandu
# - name: Setup .env file
# run: |
# echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env
# shell: bash

# - uses: sheenhx/action-flutter-build-ios@main
# with:
# # always use --export-options-plist=ios/GithubActionsExportOptions.plist
# build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug
# certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
# certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
# provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
# keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}

# - name: Archive .app
# uses: actions/upload-artifact@v4
# with:
# name: simulator-app
# # Try running the build locally with the build command to be sure of this path
# path: build/ios/iphonesimulator/*.app

# upload-combined:
# permissions: write-all
# name: Combine and Upload Builds
# needs: [build-apk, build-macos]
# runs-on: ubuntu-latest
# steps:
# - name: Download Ubuntu artifact
# uses: actions/download-artifact@v4
# with:
# name: release-apk
# path: combined-builds/android

# - name: Download macOS artifact
# uses: actions/download-artifact@v4
# with:
# name: release-ipa
# path: combined-builds/iOS

# - name: Upload combined artifacts
# uses: actions/upload-artifact@v4
# with:
# name: combined-builds
# path: combined-builds

# - name: Generate
# id: generate
# uses: AcmeSoftwareLLC/app-build-number@v1
# with:
# timezone: Asia/Kathmandu

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


- uses: ncipollo/release-action@v1
with:
artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa"
tag: ${{ steps.generate.outputs.build-number }}
name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com"
generateReleaseNotes: true
body: >
<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>
# - uses: ncipollo/release-action@v1
# with:
# artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa"
# tag: ${{ steps.generate.outputs.build-number }}
# name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com"
# generateReleaseNotes: true
# body: >
# <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>
2 changes: 1 addition & 1 deletion .github/workflows/submit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
echo "$(( ${{ secrets.PROD_ENV_FILE_CONTENT }} + 67 ))" > .env
shell: bash

- uses: reasje/action-flutter-build-android@main
- uses: sheenhx/action-flutter-build-android@main
with:
keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }}
keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}"
Expand Down
6 changes: 1 addition & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.moonchain.app"

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion "33.0.1"
ndkVersion flutter.ndkVersion
Expand All @@ -63,10 +63,6 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 21
minSdk 21
manifestPlaceholders = [
minSdkVersion: "21",
applicationName: "android.app.Application"
]
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode System.getenv('VERSION_CODE')?.hashCode()?.abs() ?: 404
versionName flutterVersionName
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />

<application tools:replace="android:label" android:label="MoonBase" android:name="${applicationName}" android:icon="@mipmap/launcher_icon" android:theme="@style/LaunchTheme" android:requestLegacyExternalStorage="true">

# This is line is to disable Impeller
<meta-data
android:name="io.flutter.embedding.android.EnableImpeller"
Expand Down
3 changes: 1 addition & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
kotlin.jvm.target.validation.mode = IGNORE
android.ndk.suppressMinSdkVersionError=21
kotlin.jvm.target.validation.mode = IGNORE
6 changes: 3 additions & 3 deletions lib/common/components/snackbar/snackbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ void showSnackBar({
? MediaQuery.of(
context,
).size.height -
285
350
: 0,
top: SnackBarPosition.top == snackBarPosition
? MediaQuery.of(context).padding.top
? MediaQuery.of(context).viewInsets.bottom +
MediaQuery.of(context).padding.bottom
: 0.0,
),
duration: const Duration(seconds: 4),
Expand Down Expand Up @@ -223,6 +224,5 @@ void showSnackBar({
);

RootScaffoldMessenger.key.currentState?.clearSnackBars();
ScaffoldMessenger.of(context).clearSnackBars();
RootScaffoldMessenger.showSnackBar(snackBar);
}
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class DAppHooksUseCase extends ReactiveUseCase {

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

final hexagonBigInt = h3.geoToH3(
final hexagonBigInt = h3.geoToCell(
GeoCoord(
lon: currentLocation.longitude, lat: currentLocation.latitude),
Config.h3Resolution);
Expand Down
2 changes: 1 addition & 1 deletion packages/shared
26 changes: 13 additions & 13 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -941,10 +941,10 @@ packages:
dependency: transitive
description:
name: geojson2h3
sha256: "9786d9fa144f1a64063b63cfaf8e7b3ddec40d64f873f3ae9773500593080cd9"
sha256: "54305801c0bac29dc2c192dcfe30d2bd95830fa0935b695423187741bb18d300"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.1"
version: "0.7.0"
geolocator:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1149,34 +1149,34 @@ packages:
dependency: transitive
description:
name: h3_common
sha256: "1d92424c97c0db1a2f4bd1ccd51f865934d01f211be9d33edaf12a2c68f8427f"
sha256: "974d33d58c49ccaaf9cb1eb0bf860a21dbe25a8708c26e00fb742ba85525a905"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.1"
version: "0.7.0"
h3_ffi:
dependency: transitive
description:
name: h3_ffi
sha256: "9b13cf77ad867d3ef3362d86771f4930398cd88b657d9e154aba4ca0bda93540"
sha256: e8d1b3abfb74242f71750fe909c3dd4c571f90185b3fe9fd25a776a382e878df
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.2"
version: "0.7.0"
h3_flutter:
dependency: "direct main"
description:
name: h3_flutter
sha256: ccc62394641c43fccf87fec063a639a851ba0f30ec0caa0afeb455aebe581297
sha256: "78cd5f179e6d9dd5c9785568f3f74ee7ff059e88c446c7a8768daa9a59cfa8a1"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.6"
version: "0.7.0"
h3_web:
dependency: transitive
description:
name: h3_web
sha256: "0997e3bcebefd2dcecbb3396b9e0a9dc6d9619c5eb2dfe6809b4046e05c7b0ac"
sha256: beeb3c07ebff03b74f3f1d2ea1494428132b076a2866c080084fc6308ee4c8f3
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.1"
version: "0.7.0"
hashcodes:
dependency: transitive
description:
Expand Down Expand Up @@ -1306,13 +1306,13 @@ packages:
source: hosted
version: "2.0.0"
js:
dependency: transitive
dependency: "direct overridden"
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.7"
version: "0.7.2"
json_annotation:
dependency: transitive
description:
Expand Down
Loading
Loading