anydev/anyway
0
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

ensure attractiveness is always an int #25

Merged
remoll merged 3 commits from fix/backend/pydantic-issues into main 2024-09-27 08:28:38 +00:00
Conversation 0 Commits 3 Files Changed 12 +5 -6
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 290baec64e - Show all commits

2
frontend/.github/workflows/build_app_android.yaml vendored
View File

@@ -44,7 +44,7 @@ jobs:
echo "${{ secrets.ANDROID_SECRET_PROPERTIES }}" > secrets.properties echo "${{ secrets.ANDROID_SECRET_PROPERTIES }}" > secrets.properties
echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON }}" > google-key.json echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON }}" > google-key.json
# decode the base64 encoded google key # 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 working-directory: android
- name: Install fastlane - name: Install fastlane

1
frontend/lib/constants.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
const String APP_NAME = 'AnyWay'; const String APP_NAME = 'AnyWay';
String API_URL_BASE = 'https://anyway.anydev.info'; String API_URL_BASE = 'https://anyway.anydev.info';
String API_URL_DEBUG = 'https://anyway.anydev.info';
String PRIVACY_URL = 'https://anydev.info/privacy'; String PRIVACY_URL = 'https://anydev.info/privacy';
const String MAP_ID = '41c21ac9b81dbfd8'; const String MAP_ID = '41c21ac9b81dbfd8';

2
frontend/lib/modules/new_trip_button.dart
View File

@@ -34,7 +34,7 @@ class _NewTripButtonState extends State<NewTripButton> {
} }
return FloatingActionButton.extended( return FloatingActionButton.extended(
onPressed: onPressed, onPressed: onPressed,
icon: const Icon(Icons.add), icon: const Icon(Icons.directions),
label: AutoSizeText('Start planning!'), label: AutoSizeText('Start planning!'),
); );
} }

2
frontend/lib/pages/new_trip_preferences.dart
View File

@@ -63,7 +63,7 @@ class _NewTripPreferencesPageState extends State<NewTripPreferencesPage> {
margin: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 0), margin: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 0),
shadowColor: Colors.grey, shadowColor: Colors.grey,
child: ListTile( child: ListTile(
leading: Icon(Icons.timer), leading: preferences.maxTime.icon,
title: Text(preferences.maxTime.description), title: Text(preferences.maxTime.description),
subtitle: CupertinoTimerPicker( subtitle: CupertinoTimerPicker(
mode: CupertinoTimerPickerMode.hm, mode: CupertinoTimerPickerMode.hm,

4
frontend/lib/pages/settings.dart
View File

@@ -61,9 +61,7 @@ class _SettingsPageState extends State<SettingsPage> {
return AlertDialog( return AlertDialog(
title: Text('Debug mode - use a custom API endpoint'), title: Text('Debug mode - use a custom API endpoint'),
content: TextField( content: TextField(
decoration: InputDecoration( controller: TextEditingController(text: API_URL_DEBUG),
hintText: 'https://anyway-stg.anydev.info'
),
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
API_URL_BASE = value; API_URL_BASE = value;