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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ migrate_working_dir/
.pub-cache/
.pub/
/build/
/coverage/

# Symbolication related
app.*.symbols
Expand Down
1 change: 1 addition & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gradle-wrapper.jar
/local.properties
GeneratedPluginRegistrant.java
.cxx/
build/

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (keystorePropertiesFile.exists()) {

android {
namespace = "de.tu_chemnitz.etit.sse.openstop"
compileSdk = 35
compileSdk = 36
// Momentary fix. Alternatively the following line can also be commented out. See: https://github.com/flutter/flutter/issues/139427
ndkVersion = "27.0.12077973"

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

defaultConfig {
applicationId = "de.tu_chemnitz.etit.sse.openstop"
minSdk = 23
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.3" apply false
id("com.android.application") version "8.9.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}

Expand Down
1 change: 0 additions & 1 deletion l10n.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
synthetic-package: false
arb-dir: lib/l10n
template-arb-file: app_en.arb
output-localization-file: app_localizations.g.dart
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class HomeScreen extends View<HomeViewModel> with PromptHandler {
child: FlutterMap(
mapController: viewModel.mapController,
options: MapOptions(
onTap: (_, __) => viewModel.closeQuestionnaire(),
onTap: (_, _) => viewModel.closeQuestionnaire(),
interactionOptions: const InteractionOptions(
enableMultiFingerGestureRace: true,
),
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/privacy_policy.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
import 'package:url_launcher/url_launcher.dart';

import '/l10n/app_localizations.g.dart';
Expand Down Expand Up @@ -38,7 +38,7 @@ class _PrivacyPolicyScreenState extends State<PrivacyPolicyScreen> {
bottom: MediaQuery.of(context).padding.bottom,
),
selectable: true,
onTapLink: (_, url, __) {
onTapLink: (_, url, _) {
if (url != null) launchUrl(Uri.parse(url));
},
);
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/gallery_viewer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class GalleryViewer extends StatelessWidget {
tag: imagesKeys[index],
child: Image.asset(
images[index],
errorBuilder: (context, _, __) {
errorBuilder: (context, _, _) {
return Image.asset(
'assets/images/placeholder_image.png',
);
Expand Down Expand Up @@ -201,7 +201,7 @@ class _GalleryNavigatorState extends State<GalleryNavigator> {
tag: widget.imagesKeys[index],
child: Image.asset(
widget.images[index],
errorBuilder: (context, _, __) {
errorBuilder: (context, _, _) {
return Image.asset(
'assets/images/placeholder_image.png',
);
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/hero_viewer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class HeroViewer extends StatefulWidget {
);
}

static Widget defaultRouteTransitionsBuilder(_, Animation<double> animation, __, Widget child) {
static Widget defaultRouteTransitionsBuilder(_, Animation<double> animation, _, Widget child) {
return FadeTransition(
opacity: animation,
child: child,
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/osm_element_layer/osm_element_marker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class _OsmElementMarkerState extends State<OsmElementMarker> with SingleTickerPr
onTap: widget.onTap,
child: AnimatedBuilder(
animation: _animation,
builder: (_, __) => MarkerBubble(
builder: (_, _) => MarkerBubble(
shadowColor: Theme.of(context).colorScheme.shadow.withValues(alpha: 0.4),
elevation: _animation.value * 2,
child: Padding(
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/osm_element_layer/upload_indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class _UploadIndicatorState<T> extends State<UploadIndicator<T>>
_unsubscribe();
}

void _fail(error) {
void _fail(Object error) {
_stopAnimation();
_succeeded = false;
_unsubscribe();
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/question_dialog/question_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class QuestionDialog extends ViewFragment<HomeViewModel> {
// Use WillPopScope with "false" to prevent that back button closes app instead of Question Dialog
return PopScope(
canPop: false,
onPopInvokedWithResult: (_, __) => viewModel.closeQuestionnaire(),
onPopInvokedWithResult: (_, _) => viewModel.closeQuestionnaire(),
child: SafeArea(
minimum: MediaQuery.of(context).viewInsets,
bottom: false,
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/question_inputs/list_input.dart
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
colorBlendMode: BlendMode.dstOver,
color: Colors.grey.shade100,
height: 90,
errorBuilder: (context, _, __) {
errorBuilder: (context, _, _) {
return Image.asset(
'assets/images/placeholder_image.png',
fit: BoxFit.cover,
Expand Down
36 changes: 19 additions & 17 deletions lib/widgets/select_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,25 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
scrollable: true,
title: widget.title,
semanticLabel: widget.semanticLabel,
// Use column instead of ListView. See: https://github.com/flutter/flutter/issues/18108
content: Column(
children: List.generate(_entries.length, (index) {
final entry = _entries[index];
return RadioListTile<T>(
contentPadding: EdgeInsets.zero,
groupValue: _selectedValue,
visualDensity: VisualDensity.compact,
value: entry.key,
onChanged: (T? value) {
setState(() {
_selectedValue = value;
});
},
title: Text(entry.value),
);
}),
content: RadioGroup(
groupValue: _selectedValue,
onChanged: (T? value) {
setState(() {
_selectedValue = value;
});
},
// Use column instead of ListView. See: https://github.com/flutter/flutter/issues/18108
child: Column(
children: List.generate(_entries.length, (index) {
final entry = _entries[index];
return RadioListTile<T>(
contentPadding: EdgeInsets.zero,
visualDensity: VisualDensity.compact,
value: entry.key,
title: Text(entry.value),
);
}),
),
),
actions: [
TextButton(
Expand Down
Loading