diff --git a/frontend/.github/workflows/build_app_android.yaml b/frontend/.github/workflows/build_app_android.yaml index cb008bc..1248aaf 100644 --- a/frontend/.github/workflows/build_app_android.yaml +++ b/frontend/.github/workflows/build_app_android.yaml @@ -44,7 +44,7 @@ jobs: echo "${{ secrets.ANDROID_SECRET_PROPERTIES }}" > secrets.properties echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON }}" > google-key.json # decode the base64 encoded google key - echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d - > release.keystore + echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > release.keystore working-directory: android - name: Install fastlane diff --git a/frontend/lib/constants.dart b/frontend/lib/constants.dart index d4e756c..3475d02 100644 --- a/frontend/lib/constants.dart +++ b/frontend/lib/constants.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; const String APP_NAME = 'AnyWay'; String API_URL_BASE = 'https://anyway.anydev.info'; +String API_URL_DEBUG = 'https://anyway.anydev.info'; String PRIVACY_URL = 'https://anydev.info/privacy'; const String MAP_ID = '41c21ac9b81dbfd8'; diff --git a/frontend/lib/modules/new_trip_button.dart b/frontend/lib/modules/new_trip_button.dart index d966abf..ebc1c5b 100644 --- a/frontend/lib/modules/new_trip_button.dart +++ b/frontend/lib/modules/new_trip_button.dart @@ -34,7 +34,7 @@ class _NewTripButtonState extends State { } return FloatingActionButton.extended( onPressed: onPressed, - icon: const Icon(Icons.add), + icon: const Icon(Icons.directions), label: AutoSizeText('Start planning!'), ); } diff --git a/frontend/lib/pages/new_trip_preferences.dart b/frontend/lib/pages/new_trip_preferences.dart index 9f60055..882cb53 100644 --- a/frontend/lib/pages/new_trip_preferences.dart +++ b/frontend/lib/pages/new_trip_preferences.dart @@ -63,7 +63,7 @@ class _NewTripPreferencesPageState extends State { margin: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 0), shadowColor: Colors.grey, child: ListTile( - leading: Icon(Icons.timer), + leading: preferences.maxTime.icon, title: Text(preferences.maxTime.description), subtitle: CupertinoTimerPicker( mode: CupertinoTimerPickerMode.hm, diff --git a/frontend/lib/pages/settings.dart b/frontend/lib/pages/settings.dart index 8a97c90..d4c69a0 100644 --- a/frontend/lib/pages/settings.dart +++ b/frontend/lib/pages/settings.dart @@ -61,9 +61,7 @@ class _SettingsPageState extends State { return AlertDialog( title: Text('Debug mode - use a custom API endpoint'), content: TextField( - decoration: InputDecoration( - hintText: 'https://anyway-stg.anydev.info' - ), + controller: TextEditingController(text: API_URL_DEBUG), onChanged: (value) { setState(() { API_URL_BASE = value;