Skip to content
Closed
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
22 changes: 9 additions & 13 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
name: Deploy to GitHub Pages
name: Deploy to Play Store

on:
push:
branches:
- main

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: "deploy"
cancel-in-progress: false
- jsrastreamento

jobs:
build:
Expand Down Expand Up @@ -48,14 +39,19 @@ jobs:
export BUILD_NUMBER="${{ github.run_number }}"
export GOOGLE_MAPS_CLIENT_ID="${{ secrets.GOOGLE_MAPS_CLIENT_ID }}"
export GOOGLE_MAPS_SIGNING_SECRET="${{ secrets.GOOGLE_MAPS_SIGNING_SECRET }}"
export TRACCAR_BASE_URL="${{vars.TRACCAR_BASE_URL}}"
export TRACCAR_BASE_URL="https://jsrastreamento.com"
./build.sh appbundle
- name: Upload AAB artifact
uses: actions/upload-artifact@v4
with:
name: app-release
path: build/app/outputs/bundle/release/app-release.aab
- name: Upload to Play Store
uses: r0adkll/upload-google-play@v1
continue-on-error: true
with:
serviceAccountJsonPlainText: ${{ secrets.PLAY_STORE_AUTH }}
packageName: com.fleetmap.fleetmanager
packageName: com.fleetmap.jsrastreamento
releaseFiles: build/app/outputs/bundle/release/app-release.aab
track: internal
status: draft
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# fleetmanager
# jsrastreamento

Attempt to make a nice traccar manager app in flutter
4 changes: 2 additions & 2 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

android {
namespace = "com.fleetmap.fleetmanager"
namespace = "com.fleetmap.jsrastreamento"
compileSdk = 36 // Explicitly set for Android 16 compatibility
ndkVersion = "28.1.13356709"

Expand All @@ -32,7 +32,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.fleetmap.fleetmanager"
applicationId = "com.fleetmap.jsrastreamento"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion // Android 5.0+
Expand Down
4 changes: 2 additions & 2 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:218052201497:android:edec3d546b747e82766e88",
"android_client_info": {
"package_name": "com.fleetmap.fleetmanager"
"package_name": "com.fleetmap.jsrastreamento"
}
},
"oauth_client": [
Expand Down Expand Up @@ -267,4 +267,4 @@
}
],
"configuration_version": "1"
}
}
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<application
android:label="Track Fleet"
android:label="JS Rastreamento"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fleetmap.fleetmanager
package com.fleetmap.jsrastreamento

import io.flutter.embedding.android.FlutterActivity

Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ flutter build $1 \
--build-number "$BUILD_NUMBER" \
--dart-define GOOGLE_MAPS_CLIENT_ID="$GOOGLE_MAPS_CLIENT_ID" \
--dart-define GOOGLE_MAPS_SIGNING_SECRET="$GOOGLE_MAPS_SIGNING_SECRET" \
--dart-define TRACCAR_BASE_URL="$TRACCAR_BASE_URL"
--dart-define TRACCAR_BASE_URL="https://jsrastreamento.com"
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -519,7 +519,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -537,7 +537,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
Expand All @@ -553,7 +553,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager.RunnerTests;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
Expand Down Expand Up @@ -686,7 +686,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -710,7 +710,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.fleetmanager;
PRODUCT_BUNDLE_IDENTIFIER = com.fleetmap.jsrastreamento;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/Runner/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.fleetmap.fleetmanager</string>
<string>com.fleetmap.jsrastreamento</string>
<key>PROJECT_ID</key>
<string>fleetmap-fe45f</string>
<key>STORAGE_BUCKET</key>
Expand All @@ -27,6 +27,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:218052201497:ios:0d02e81f62b32d28766e88</string>
<string>1:218052201497:ios:75ccfc41b0340f55766e88</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Track Fleet</string>
<string>JS Rastreamento</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>fleetmanager</string>
<string>jsrastreamento</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app_identifier("com.fleetmap.fleetmanager") # The bundle identifier of your app
app_identifier("com.fleetmap.jsrastreamento") # The bundle identifier of your app
apple_id("admin@fleetmap.io") # Your Apple Developer Portal username
itc_team_id("122303819") # App Store Connect Team ID
team_id("57X9MD32BX") # Developer Portal Team ID
team_id("57X9MD32BX") # Developer Portal Team ID
2 changes: 1 addition & 1 deletion ios/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platform :ios do
match
update_code_signing_settings(
code_sign_identity: "iPhone Distribution",
profile_name: "match AppStore com.fleetmap.fleetmanager"
profile_name: "match AppStore com.fleetmap.jsrastreamento"
)
build_app
api_key = app_store_connect_api_key(key_id: "6BZAC5HXRJ")
Expand Down
2 changes: 1 addition & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@@locale": "en",

"appTitle": "Track Fleet",
"appTitle": "JS Rastreamento",
"@appTitle": {
"description": "Application title"
},
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: manager
description: "Track Fleet"
description: "JS Rastreamento"
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 3.16.3+1
Expand Down
Binary file modified web/favicon.png
Binary file modified web/icons/Icon-192.png
Binary file modified web/icons/Icon-512.png
Binary file modified web/icons/Icon-maskable-192.png
Binary file modified web/icons/Icon-maskable-512.png
4 changes: 2 additions & 2 deletions web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<!-- iOS meta tags & icons -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="fleetmanager">
<meta name="apple-mobile-web-app-title" content="jsrastreamento">
<link rel="apple-touch-icon" href="icons/Icon-192.png">

<!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png"/>

<title>fleetmanager</title>
<title>jsrastreamento</title>
<link rel="manifest" href="manifest.json">
<script src="https://unpkg.com/maplibre-gl@^4.7.1/dist/maplibre-gl.js"></script>
<link href="https://unpkg.com/maplibre-gl@^4.7.1/dist/maplibre-gl.css" rel="stylesheet" />
Expand Down
4 changes: 2 additions & 2 deletions web/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fleetmanager",
"short_name": "fleetmanager",
"name": "jsrastreamento",
"short_name": "jsrastreamento",
"start_url": ".",
"display": "standalone",
"background_color": "#0175C2",
Expand Down
Loading