Merge pull request #3 from mechark/beta

Beta merge

Author: mechark

voita_app/android/app/build.gradle

@@ -45,8 +45,8 @@ android {
         applicationId "com.example.voita_app"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
+        minSdkVersion 29
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

voita_app/android/app/src/main/AndroidManifest.xml

@@ -25,6 +25,11 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

voita_app/devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

voita_app/lib/features/note-review/presentation/note_screen.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:voita_app/constants/app_colors.dart';
 import 'package:voita_app/features/note-review/bloc/review_bloc.dart';
-import 'package:voita_app/features/notes-overview/bloc/notes_bloc.dart';
 import 'package:voita_app/features/notes-overview/models/note_model.dart';
 import 'package:voita_app/shared-widgets/navbar/presentation/navbar.dart';
 import 'package:voita_app/shared-widgets/note-appbar/note_appbar.dart';
@@ -13,8 +12,8 @@ import 'package:voita_app/utils/services/time_formatter.dart';
 
 class NoteScreen extends StatefulWidget {
   final Note note;
-  final NotesBloc notesBloc;
-  NoteScreen({ Key? key, required this.note, required this.notesBloc }) : super(key: key);
+  final Function(Note) onNoteUpdated;
+  NoteScreen({ Key? key, required this.note, required this.onNoteUpdated }) : super(key: key);
 
   @override
   _NoteScreenState createState() => _NoteScreenState(this.note);
@@ -23,8 +22,8 @@ class NoteScreen extends StatefulWidget {
 class _NoteScreenState extends State<NoteScreen> {
   final Note note;
   bool isEditable = false;
-  late String curr_header = note.header;
-  late String curr_text = note.text;
+  late String currHeader = note.header;
+  late String currText = note.text;
   late TextEditingController _headerController;
   late TextEditingController _textController;
   late ReviewBloc _bloc;
@@ -44,8 +43,11 @@ class _NoteScreenState extends State<NoteScreen> {
         header: _headerController.text,
         text: _textController.text,
       ));
+    
+    note.header = _headerController.text;
+    note.text = _textController.text;
+    widget.onNoteUpdated(note);
     }
-    widget.notesBloc.add(const LoadNotes());
     super.deactivate();
   }
 
@@ -75,7 +77,7 @@ class _NoteScreenState extends State<NoteScreen> {
               IgnorePointer(
                 ignoring: !isEditable,
                 child: TextField(
-                onChanged: (value) => {curr_header = _headerController.text},
+                onChanged: (value) => {currHeader = _headerController.text},
                 controller: _headerController,
                 style: const TextStyle(
                   fontFamily: "Open Sans",
@@ -98,15 +100,15 @@ class _NoteScreenState extends State<NoteScreen> {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                 Text(
-                  TimeFormatter.getDay(note.date),
+                  TimeFormatter.getDay(note.date) == TimeFormatter.getDay(DateTime.now()) ? "Сьогодні" : TimeFormatter.getDay(note.date),
                   style: const TextStyle(
                     fontFamily: "Open Sans",
                     fontWeight: FontWeight.w600,
                     fontSize: 20,
                   )
                 ),
                 Text(
-                  TimeFormatter.getMinutes(note.date, note.duration),
+                  TimeFormatter.getTimeRange(note.date, note.duration),
                   style: const TextStyle(
                     fontFamily: "Open Sans",
                     fontWeight: FontWeight.w500,
@@ -133,7 +135,7 @@ class _NoteScreenState extends State<NoteScreen> {
             IgnorePointer(
               ignoring: !isEditable,
                 child: TextField(
-                  onChanged: (value) => {curr_text = _textController.text},
+                  onChanged: (value) => {currText = _textController.text},
                   controller: _textController,
                   maxLines: null,
                   keyboardType: TextInputType.multiline,
@@ -160,7 +162,7 @@ class _NoteScreenState extends State<NoteScreen> {
       extendBody: true,
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
       floatingActionButton: const RecordIcon(color: AppColor.spaceGray),
-      bottomNavigationBar: Navbar(),
+      bottomNavigationBar: const Navbar(),
     );
   }
   ));

voita_app/lib/features/notes-overview/bloc/notes_bloc.dart

@@ -1,7 +1,5 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:http/http.dart';
-import 'package:voita_app/features/recording/services/model_service.dart';
 import 'package:voita_app/utils/data/note_repository_impl.dart';
 import 'package:voita_app/features/notes-overview/models/note_model.dart';
 
@@ -11,7 +9,7 @@ part 'notes_state.dart';
 class NotesBloc extends Bloc<NotesEvent, NotesState> {
   late NoteRepositoryImpl _noteRepository;
 
-  NotesBloc() : super(NotesInitial()) {
+  NotesBloc() : super(const NotesLoaded()) {
     on<LoadNotes>(_onLoadNotes);
     on<AddNote>(_onAddNote);
     on<EditNote>(_editNote);
@@ -21,11 +19,8 @@ class NotesBloc extends Bloc<NotesEvent, NotesState> {
     _noteRepository = NoteRepositoryImpl();
   }
 
-  void _onLoadNotes(LoadNotes event, Emitter<NotesState> emit) async {
-    final notes = await _noteRepository.getAllNotes();
-    final service = ModelService();
-
-    emit(NotesLoaded(notes: notes));
+  void _onLoadNotes(LoadNotes event, Emitter<NotesState> emit) {
+    emit(const NotesLoaded());
   }
 
   void _failedToLoad(FailedToLoad event, Emitter<NotesState> emit) async {
@@ -34,15 +29,14 @@ class NotesBloc extends Bloc<NotesEvent, NotesState> {
 
   void _onAddNote(AddNote event, Emitter<NotesState> emit) async {
     final notes = await _noteRepository.getAllNotes();
-    emit(NotesLoaded(notes: notes));
+    emit(const NotesLoaded());
   }
 
   void _editNote(EditNote event, Emitter<NotesState> emit) async {
   }
 
   void _deleteNote(DeleteNote event, Emitter<NotesState> emit) async {
     await _noteRepository.removeNote(event.id);
-    final notes = await _noteRepository.getAllNotes();
-    emit(NotesLoaded(notes: notes));
+    emit(const NotesLoaded());
   }
 }

voita_app/lib/features/notes-overview/bloc/notes_event.dart

@@ -8,12 +8,10 @@ sealed class NotesEvent extends Equatable {
 }
 
 class LoadNotes extends NotesEvent {
-  final List<Note> notes;
-
-  const LoadNotes({this.notes = const <Note>[]});
+  const LoadNotes();
 
   @override
-  List<Object> get props => [notes];
+  List<Object> get props => [];
 }
 
 class FailedToLoad extends NotesEvent {
@@ -28,7 +26,7 @@ class FailedToLoad extends NotesEvent {
 class AddNote extends NotesEvent {
   final Note note;
 
-  AddNote({required this.note});
+  const AddNote({required this.note});
 
   @override
   List<Object> get props => [note];
@@ -37,7 +35,7 @@ class AddNote extends NotesEvent {
 class EditNote extends NotesEvent {
   final Note note;
 
-  EditNote({required this.note});
+  const EditNote({required this.note});
 
   @override
   List<Object> get props => [note];
@@ -46,7 +44,7 @@ class EditNote extends NotesEvent {
 class DeleteNote extends NotesEvent {
   final int id;
 
-  DeleteNote({required this.id});
+  const DeleteNote({required this.id});
 
   @override
   List<Object> get props => [id];

voita_app/lib/features/notes-overview/bloc/notes_state.dart

@@ -10,12 +10,10 @@ sealed class NotesState extends Equatable {
 final class NotesInitial extends NotesState {}
 
 class NotesLoaded extends NotesState {
-  final List<Note> notes;
-
-  const NotesLoaded({this.notes = const <Note>[]});
+  const NotesLoaded();
 
   @override
-  List<Object> get props => [notes];
+  List<Object> get props => [];
 }
 
 class NotesFailedToLoad extends NotesState {

voita_app/lib/features/notes-overview/models/note_model.dart

@@ -1,27 +1,30 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter/foundation.dart';
-
 part 'note_model.freezed.dart';
+part 'note_model.g.dart';
 
-@freezed
+@unfreezed
 class Note with _$Note {
-  const factory Note({
+  factory Note({
     required String header,
     required String text,
-    required DateTime date,
-    required int id,
-    required int duration,
-    required String audio_location
+    required final DateTime date,
+    required final int id,
+    required final int duration,
+    required final String audio_location
   }) = _Note;
 
   factory Note.fromMap(Map<String, dynamic> map) {
     return Note(
       id: map['id'],
-      header: map['header'],
+      header: map['header'] ?? "Нотатка",
       text: map['text'],
-      date: map['date'],
+      date: DateTime.parse(map['date']),
       duration: map['duration'],
       audio_location: map['audio_location']
     );
   }
+
+  factory Note.fromJson(Map<String, Object?> json)
+      => _$NoteFromJson(json);
 }