Skip to content

Commit

Permalink
renamed to strasi
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelCoding committed Nov 24, 2023
1 parent 33ed821 commit cabca0c
Show file tree
Hide file tree
Showing 23 changed files with 76 additions and 76 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# - name: Building IPA
# run: flutter build ipa --release --export-options-plist=ios/Runner/Info.plist
#
# # Collect the file and upload as artifact
# # Collect the file and upload as artifact
# - name: collect ipa artifacts
# uses: actions/upload-artifact@v2
# with:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

- uses: actions/upload-artifact@v3
with:
name: stasi apk
name: strasi apk
path: "build/app/outputs/flutter-apk/app-*.apk"

- uses: alexellis/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Stasi
# Strasi

**Sta**ndortverfolgungssystem für **S**traßenbahnen mit **I**dentifikation.
Strasi - **S**tandortverfolgungssystem für **T**rams und **R**egionalbusse mit **a**utomatisierter **S**atelliten**i**dentifikation
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "solutions.tlm.stasi"
applicationId "solutions.tlm.strasi"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion getProperty('flutter.minSdkVersion').toInteger()
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="solutions.tlm.stasi">
package="solutions.tlm.strasi">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="solutions.tlm.stasi">
package="solutions.tlm.strasi">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
Expand All @@ -15,7 +15,7 @@
</intent>
</queries>
<application
android:label="stasi"
android:label="strasi"
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 solutions.tlm.stasi
package solutions.tlm.strasi

import io.flutter.embedding.android.FlutterActivity

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="solutions.tlm.stasi">
package="solutions.tlm.strasi">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.stasi;
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.strasi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -422,7 +422,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.stasi;
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.strasi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -444,7 +444,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.stasi;
PRODUCT_BUNDLE_IDENTIFIER = solutions.tlm.strasi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
4 changes: 2 additions & 2 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Stasi</string>
<string>Strasi</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>stasi</string>
<string>strasi</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
6 changes: 3 additions & 3 deletions lib/db/database_bloc.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:async';

import 'package:stasi/db/database_repository.dart';
import 'package:stasi/model/recording.dart';
import 'package:stasi/model/coordinate.dart';
import 'package:strasi/db/database_repository.dart';
import 'package:strasi/model/recording.dart';
import 'package:strasi/model/coordinate.dart';


class DatabaseBloc {
Expand Down
18 changes: 9 additions & 9 deletions lib/db/database_dao.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:stasi/db/database_provider.dart';
import 'package:stasi/model/recording.dart';
import 'package:stasi/model/coordinate.dart';
import 'package:strasi/db/database_provider.dart';
import 'package:strasi/model/recording.dart';
import 'package:strasi/model/coordinate.dart';


class DatabaseDao {
Expand Down Expand Up @@ -92,10 +92,10 @@ class DatabaseDao {
return await db.rawUpdate(
"""
UPDATE recordings
SET
SET
start_cord_id = (
SELECT cords.id
FROM cords
SELECT cords.id
FROM cords
WHERE NOT DATETIME(?) > cords.time
ORDER BY cords.time
),
Expand All @@ -114,7 +114,7 @@ class DatabaseDao {
]
);
}

Future<int> cleanRecording(int recordingId) async {
final db = await dbProvider.db;

Expand Down Expand Up @@ -174,12 +174,12 @@ class DatabaseDao {
return _cordMapListToCoordinates(await db.rawQuery(
"""
SELECT
cords.id, cords.time, cords.latitude, cords.longitude,
cords.id, cords.time, cords.latitude, cords.longitude,
cords.altitude, cords.speed, cords.recording_id
FROM cords
LEFT JOIN recordings AS rec ON cords.recording_id = rec.id
WHERE
rec.id = ?
rec.id = ?
AND (
(cords.id >= rec.start_cord_id OR rec.start_cord_id IS NULL) AND
(cords.id <= rec.end_cord_id OR rec.end_cord_id IS NULL)
Expand Down
6 changes: 3 additions & 3 deletions lib/db/database_repository.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:stasi/db/database_dao.dart';
import 'package:stasi/model/recording.dart';
import 'package:stasi/model/coordinate.dart';
import 'package:strasi/db/database_dao.dart';
import 'package:strasi/model/recording.dart';
import 'package:strasi/model/coordinate.dart';


class DatabaseRepository {
Expand Down
22 changes: 11 additions & 11 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import 'package:introduction_screen/introduction_screen.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

import 'package:stasi/db/database_bloc.dart';
import 'package:stasi/notifiers/tracking_state_notifier.dart';
import 'package:stasi/pages/live_view.dart';
import 'package:stasi/util/theme.dart';
import 'package:stasi/pages/recording_manager.dart';
import 'package:stasi/pages/vehicle_selection.dart';
import 'package:stasi/util/app_version.dart';
import 'package:strasi/db/database_bloc.dart';
import 'package:strasi/notifiers/tracking_state_notifier.dart';
import 'package:strasi/pages/live_view.dart';
import 'package:strasi/util/theme.dart';
import 'package:strasi/pages/recording_manager.dart';
import 'package:strasi/pages/vehicle_selection.dart';
import 'package:strasi/util/app_version.dart';


void main() async {
Expand All @@ -27,7 +27,7 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Stasi',
title: 'Strasi',
theme: appTheme,
home: Builder(
builder: (context) {
Expand Down Expand Up @@ -113,7 +113,7 @@ class _BoardingPageState extends State<BoardingPage> {
],
onDone: () {
Navigator.of(context).pushAndRemoveUntil(
MaterialPageRoute(builder: (_) => MyHomePage(title: 'Stasi', databaseBloc: widget.databaseBloc)),
MaterialPageRoute(builder: (_) => MyHomePage(title: 'Strasi', databaseBloc: widget.databaseBloc)),
(Route <dynamic> route) => false,
);
},
Expand All @@ -122,7 +122,7 @@ class _BoardingPageState extends State<BoardingPage> {
);
}

return MyHomePage(title: 'Stasi', databaseBloc: widget.databaseBloc);
return MyHomePage(title: 'Strasi', databaseBloc: widget.databaseBloc);
}
);

Expand Down Expand Up @@ -182,7 +182,7 @@ class _MyHomePageState extends State<MyHomePage> {
final commitId = snapshot.data!.trim().substring(0, 8);

return LicensePage(
applicationName: "Stasi ($commitId)",
applicationName: "Strasi ($commitId)",
applicationLegalese: """Copyright 2023 TLM Solutions
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/model/recording.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:stasi/api_model/run.dart';
import 'package:strasi/api_model/run.dart';

class Recording {
Recording({
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/live_view.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:convert';

import 'package:flutter/material.dart';
import 'package:stasi/util/api_client.dart';
import 'package:stasi/widgets/live_view_map.dart';
import 'package:strasi/util/api_client.dart';
import 'package:strasi/widgets/live_view_map.dart';
import 'package:web_socket_channel/web_socket_channel.dart';


Expand Down
6 changes: 3 additions & 3 deletions lib/pages/recording_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:latlong2/latlong.dart';

import 'package:stasi/db/database_bloc.dart';
import 'package:stasi/widgets/recording_map.dart';
import 'package:stasi/model/recording.dart';
import 'package:strasi/db/database_bloc.dart';
import 'package:strasi/widgets/recording_map.dart';
import 'package:strasi/model/recording.dart';


class RecordingEditor extends StatefulWidget {
Expand Down
20 changes: 10 additions & 10 deletions lib/pages/recording_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import 'package:gpx/gpx.dart';
import 'package:intl/intl.dart';
import 'package:http/http.dart' as http;

import 'package:stasi/db/database_bloc.dart';
import 'package:stasi/routes/recording_editor_route.dart';
import 'package:stasi/notifiers/tracking_state_notifier.dart';
import 'package:stasi/util/theme.dart';
import 'package:stasi/util/api_client.dart';
import 'package:stasi/model/recording.dart';
import 'package:strasi/db/database_bloc.dart';
import 'package:strasi/routes/recording_editor_route.dart';
import 'package:strasi/notifiers/tracking_state_notifier.dart';
import 'package:strasi/util/theme.dart';
import 'package:strasi/util/api_client.dart';
import 'package:strasi/model/recording.dart';


class RecordingManager extends StatefulWidget {
Expand Down Expand Up @@ -249,8 +249,8 @@ Future<Gpx> _getCoordinatesAsGpx(DatabaseBloc databaseBloc, Recording recording)
final gpx = Gpx()
..metadata = Metadata(
name: DateFormat("y-M-d_H-m-s").format(DateTime.now().toUtc()),
desc: "Tracked by your friendly stasi comrades.",
keywords: "stasi",
desc: "Tracked by your friendly strasi comrades.",
keywords: "strasi",
time: DateTime.now().toUtc(),
extensions: {
"line": "${recording.lineNumber}",
Expand All @@ -260,7 +260,7 @@ Future<Gpx> _getCoordinatesAsGpx(DatabaseBloc databaseBloc, Recording recording)
"stop": recordingEnd.toIso8601String(),
},
)
..creator = "Stasi for ${io.Platform.operatingSystem} - https://github.com/tlm-solutions/stasi"
..creator = "Strasi for ${io.Platform.operatingSystem} - https://github.com/tlm-solutions/strasi"
..version = "1.1"
..trks = [Trk(
trksegs: [Trkseg(
Expand All @@ -281,7 +281,7 @@ Future<Gpx> _getCoordinatesAsGpx(DatabaseBloc databaseBloc, Recording recording)
/// Returns filepath or null if user canceled export.
Future<String?> _exportCoordinatesToFile(DatabaseBloc databaseBloc, Recording recording) async {
final gpxData = await _getCoordinatesAsGpx(databaseBloc, recording);
final fileName = "stasi-export_${recording.id}_${recording.lineNumber}_${recording.runNumber}.gpx";
final fileName = "strasi-export_${recording.id}_${recording.lineNumber}_${recording.runNumber}.gpx";
final gpxFileContents = GpxWriter().asString(gpxData, pretty: true);

// store using the dialog so the files are independent from the app
Expand Down
12 changes: 6 additions & 6 deletions lib/pages/vehicle_selection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:stasi/api_model/live_gps_point.dart';
import 'package:strasi/api_model/live_gps_point.dart';

import 'package:stasi/notifiers/tracking_state_notifier.dart';
import 'package:stasi/db/database_bloc.dart';
import 'package:stasi/util/api_client.dart';
import 'package:stasi/util/location_client.dart';
import 'package:strasi/notifiers/tracking_state_notifier.dart';
import 'package:strasi/db/database_bloc.dart';
import 'package:strasi/util/api_client.dart';
import 'package:strasi/util/location_client.dart';

import '../api_model/run.dart';

Expand Down Expand Up @@ -237,7 +237,7 @@ class _VehicleSelectionState extends State<VehicleSelection> with AutomaticKeepA
debugPrint("Too inaccurate location: ${position.accuracy} (> $_minimumAccuracy)");
return;
}

await apiClient.sendLiveCords(trekkieUuid, LiveGpsPoint(
time: position.timestamp!,
latitude: position.latitude,
Expand Down
10 changes: 5 additions & 5 deletions lib/util/api_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:http/http.dart' as http;
import 'package:http_parser/http_parser.dart';
import 'package:gpx/gpx.dart';
import 'package:stasi/api_model/live_gps_point.dart';
import 'package:stasi/api_model/login_data.dart';
import 'package:stasi/api_model/run.dart';
import 'package:stasi/util/app_version.dart';
import 'package:strasi/api_model/live_gps_point.dart';
import 'package:strasi/api_model/login_data.dart';
import 'package:strasi/api_model/run.dart';
import 'package:strasi/util/app_version.dart';


class ApiClient {
Expand Down Expand Up @@ -128,7 +128,7 @@ class ApiClient {
"run": run.runNumber,
"region": run.regionId,
"app_commit": await AppVersion.getCommitId(),
"app_name": "stasi",
"app_name": "strasi",
"finished": !live,
};

Expand Down
4 changes: 2 additions & 2 deletions lib/util/location_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ LocationSettings _getLocationSettings() {
forceLocationManager: false,
intervalDuration: const Duration(milliseconds: 500),
foregroundNotificationConfig: const ForegroundNotificationConfig(
notificationTitle: "Stasi",
notificationText: "Stasi is watching you!",
notificationTitle: "Strasi",
notificationText: "Strasi is watching you!",
enableWakeLock: true,
setOngoing: true,
),
Expand Down
Loading

0 comments on commit cabca0c

Please sign in to comment.