mirror of
https://github.com/Myzel394/quid_faciam_hodie.git
synced 2025-06-18 23:35:25 +02:00
improvements & bugfixes
This commit is contained in:
parent
b0878ca740
commit
ab764e7b16
@ -96,9 +96,7 @@ class _LoginScreenState extends AuthState<LoginScreen> with Loadable {
|
|||||||
Navigator.push(
|
Navigator.push(
|
||||||
context,
|
context,
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
builder: (context) => ServerLoadingScreen(
|
builder: (context) => const ServerLoadingScreen(),
|
||||||
nextScreen: MainScreen.ID,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -11,12 +11,14 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
|||||||
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
||||||
import 'package:location/location.dart';
|
import 'package:location/location.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
import 'package:quid_faciam_hodie/constants/help_sheet_id.dart';
|
import 'package:quid_faciam_hodie/constants/help_sheet_id.dart';
|
||||||
import 'package:quid_faciam_hodie/constants/spacing.dart';
|
import 'package:quid_faciam_hodie/constants/spacing.dart';
|
||||||
import 'package:quid_faciam_hodie/constants/values.dart';
|
import 'package:quid_faciam_hodie/constants/values.dart';
|
||||||
import 'package:quid_faciam_hodie/extensions/snackbar.dart';
|
import 'package:quid_faciam_hodie/extensions/snackbar.dart';
|
||||||
import 'package:quid_faciam_hodie/managers/file_manager.dart';
|
import 'package:quid_faciam_hodie/managers/file_manager.dart';
|
||||||
import 'package:quid_faciam_hodie/managers/global_values_manager.dart';
|
import 'package:quid_faciam_hodie/managers/global_values_manager.dart';
|
||||||
|
import 'package:quid_faciam_hodie/models/memories.dart';
|
||||||
import 'package:quid_faciam_hodie/screens/main_screen/annotation_dialog.dart';
|
import 'package:quid_faciam_hodie/screens/main_screen/annotation_dialog.dart';
|
||||||
import 'package:quid_faciam_hodie/screens/main_screen/camera_help_content.dart';
|
import 'package:quid_faciam_hodie/screens/main_screen/camera_help_content.dart';
|
||||||
import 'package:quid_faciam_hodie/screens/main_screen/settings_button_overlay.dart';
|
import 'package:quid_faciam_hodie/screens/main_screen/settings_button_overlay.dart';
|
||||||
@ -77,6 +79,7 @@ class _MainScreenState extends AuthRequiredState<MainScreen> with Loadable {
|
|||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
|
downloadLatestMemory();
|
||||||
loadSettings();
|
loadSettings();
|
||||||
loadCameras();
|
loadCameras();
|
||||||
}
|
}
|
||||||
@ -92,6 +95,18 @@ class _MainScreenState extends AuthRequiredState<MainScreen> with Loadable {
|
|||||||
_updateCamera(state);
|
_updateCamera(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> downloadLatestMemory() async {
|
||||||
|
final memories = context.read<Memories>();
|
||||||
|
|
||||||
|
if (memories.memories.isEmpty) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final latestMemory = memories.memories.first;
|
||||||
|
|
||||||
|
await latestMemory.downloadToFile();
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> loadSettings() async {
|
Future<void> loadSettings() async {
|
||||||
final settings = GlobalValuesManager.settings!;
|
final settings = GlobalValuesManager.settings!;
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ class _AnnotationDialogState extends State<AnnotationDialog> {
|
|||||||
actions: <Widget>[
|
actions: <Widget>[
|
||||||
PlatformDialogAction(
|
PlatformDialogAction(
|
||||||
child: Text(localizations.generalCancelButtonLabel),
|
child: Text(localizations.generalCancelButtonLabel),
|
||||||
onPressed: () => Navigator.pop(context),
|
onPressed: () => Navigator.pop(context, ''),
|
||||||
),
|
),
|
||||||
PlatformDialogAction(
|
PlatformDialogAction(
|
||||||
child: Text(localizations.generalSaveButtonLabel),
|
child: Text(localizations.generalSaveButtonLabel),
|
||||||
|
@ -2,16 +2,18 @@ import 'dart:math';
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
||||||
|
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||||
import 'package:quid_faciam_hodie/constants/spacing.dart';
|
import 'package:quid_faciam_hodie/constants/spacing.dart';
|
||||||
import 'package:quid_faciam_hodie/constants/values.dart';
|
import 'package:quid_faciam_hodie/constants/values.dart';
|
||||||
import 'package:quid_faciam_hodie/managers/photo_manager.dart';
|
import 'package:quid_faciam_hodie/managers/photo_manager.dart';
|
||||||
import 'package:quid_faciam_hodie/managers/user_help_sheets_manager.dart';
|
|
||||||
import 'package:quid_faciam_hodie/screens/welcome_screen/pages/view_memories_page.dart';
|
import 'package:quid_faciam_hodie/screens/welcome_screen/pages/view_memories_page.dart';
|
||||||
|
|
||||||
import 'welcome_screen/pages/create_memories_page.dart';
|
import 'welcome_screen/pages/create_memories_page.dart';
|
||||||
import 'welcome_screen/pages/get_started_page.dart';
|
import 'welcome_screen/pages/get_started_page.dart';
|
||||||
import 'welcome_screen/pages/initial_page.dart';
|
import 'welcome_screen/pages/initial_page.dart';
|
||||||
|
|
||||||
|
const storage = FlutterSecureStorage();
|
||||||
|
|
||||||
class WelcomeScreen extends StatefulWidget {
|
class WelcomeScreen extends StatefulWidget {
|
||||||
static const ID = '/welcome';
|
static const ID = '/welcome';
|
||||||
|
|
||||||
@ -29,7 +31,7 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
|
|||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
UserHelpSheetsManager.deleteAll();
|
storage.deleteAll();
|
||||||
getInitialImageForPhotoSwitching();
|
getInitialImageForPhotoSwitching();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:quid_faciam_hodie/screens/login_screen.dart';
|
import 'package:quid_faciam_hodie/screens/welcome_screen.dart';
|
||||||
import 'package:supabase_flutter/supabase_flutter.dart';
|
import 'package:supabase_flutter/supabase_flutter.dart';
|
||||||
|
|
||||||
class AuthRequiredState<T extends StatefulWidget>
|
class AuthRequiredState<T extends StatefulWidget>
|
||||||
@ -8,7 +8,7 @@ class AuthRequiredState<T extends StatefulWidget>
|
|||||||
void onUnauthenticated() {
|
void onUnauthenticated() {
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
Navigator.of(context)
|
Navigator.of(context)
|
||||||
.pushNamedAndRemoveUntil(LoginScreen.ID, (route) => false);
|
.pushNamedAndRemoveUntil(WelcomeScreen.ID, (route) => false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,18 +43,12 @@ class _RawMemoryDisplayState extends State<RawMemoryDisplay> {
|
|||||||
Future<File> createTempVideo() async {
|
Future<File> createTempVideo() async {
|
||||||
final tempDirectory = await getTemporaryDirectory();
|
final tempDirectory = await getTemporaryDirectory();
|
||||||
final path = '${tempDirectory.path}/${widget.filename ?? 'video.mp4'}';
|
final path = '${tempDirectory.path}/${widget.filename ?? 'video.mp4'}';
|
||||||
print("#" * 50);
|
|
||||||
print(widget.filename);
|
|
||||||
print(path);
|
|
||||||
final file = File(path);
|
final file = File(path);
|
||||||
print(await file.exists());
|
|
||||||
print(widget.data);
|
|
||||||
|
|
||||||
/*
|
|
||||||
if (await file.exists()) {
|
if (await file.exists()) {
|
||||||
// File already exists, so just return it
|
// File already exists, so just return it
|
||||||
return file;
|
return file;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
// File needs to be created
|
// File needs to be created
|
||||||
await file.create();
|
await file.create();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user