Merge remote-tracking branch 'origin/develop' into develop-groupedParticipants

# Conflicts:
#	pubspec.yaml
This commit is contained in:
2025-09-06 15:36:12 +02:00
9 changed files with 24 additions and 24 deletions

View File

@@ -31,7 +31,7 @@ class AppModule {
var available = {
Modules.timetable: AppModule(
Modules.timetable,
name: 'Vertretung',
name: 'Stundenplan',
icon: () => Icon(Icons.calendar_month),
breakerArea: BreakerArea.timetable,
create: Timetable.new,

View File

@@ -1,11 +1,11 @@
import 'dart:io';
import 'package:better_open_file/better_open_file.dart';
import 'package:filesize/filesize.dart';
import 'package:flowder/flowder.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:open_filex/open_filex.dart';
import '../../../widget/infoDialog.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:path_provider/path_provider.dart';

View File

@@ -1,4 +1,3 @@
import 'package:better_open_file/better_open_file.dart';
import 'package:bubble/bubble.dart';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart' as emojis;
import 'package:flowder/flowder.dart';
@@ -6,6 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:jiffy/jiffy.dart';
import 'package:open_filex/open_filex.dart';
import '../../../../extensions/text.dart';
import 'package:provider/provider.dart';

View File

@@ -32,7 +32,7 @@ class DefaultSettings {
hiddenModules: [],
),
timetableSettings: TimetableSettings(
connectDoubleLessons: false,
connectDoubleLessons: true,
timetableNameMode: TimetableNameMode.name
),
talkSettings: TalkSettings(

View File

@@ -246,7 +246,7 @@ class _SettingsState extends State<Settings> {
ListTile(
leading: const CenteredLeading(Icon(Icons.date_range_outlined)),
title: const Text('Infos zu Web-/ Untis'),
subtitle: const Text('Für den Vertretungsplan'),
subtitle: const Text('Für den Stundenplan'),
trailing: const Icon(Icons.arrow_right),
onTap: () => PrivacyInfo(providerText: 'Untis', imprintUrl: 'https://www.untis.at/impressum', privacyUrl: 'https://www.untis.at/datenschutz-wu-apps').showPopup(context)
),

View File

@@ -1,8 +1,8 @@
import 'dart:io';
import 'dart:math';
import 'package:better_open_file/better_open_file.dart';
import 'package:flutter/material.dart';
import 'package:open_filex/open_filex.dart';
import 'package:photo_view/photo_view.dart';
import 'package:provider/provider.dart';
import 'package:share_plus/share_plus.dart';
@@ -93,7 +93,7 @@ class _FileViewerState extends State<FileViewer> {
);
default:
OpenFile.open(widget.path).then((result) {
OpenFilex.open(widget.path).then((result) {
Navigator.of(context).pop();
if(result.type != ResultType.done) {
showDialog(context: context, builder: (context) => AlertDialog(