balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

fix and added messages screen to new location

Browse Source
This commit is contained in:
Kima 2024-03-12 21:01:20 +01:00
parent 7f074c67e3
commit f1429faf3f
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refilc_kreta_api/lib/models/message.dart
View File

@ -198,7 +198,7 @@ class SendRecipientType {
factory SendRecipientType.fromJson(Map json) { factory SendRecipientType.fromJson(Map json) {
return SendRecipientType( return SendRecipientType(
id: json['azonosito'] != '' ? int.parse(json['azonosito']) : 0, id: json['azonosito'] != '' ? json['azonosito'] : 0,
code: json['kod'], code: json['kod'],
description: json['leiras'], description: json['leiras'],
name: json['nev'], name: json['nev'],

17
refilc_mobile_ui/lib/pages/home/home_page.dart
View File

@ -1,6 +1,7 @@
// ignore_for_file: dead_code // ignore_for_file: dead_code
import 'dart:math'; import 'dart:math';
import 'package:flutter/cupertino.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:refilc/api/providers/live_card_provider.dart'; import 'package:refilc/api/providers/live_card_provider.dart';
import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc/theme/colors/colors.dart';
@ -8,7 +9,7 @@ import 'package:refilc/ui/date_widget.dart';
import 'package:refilc/utils/format.dart'; import 'package:refilc/utils/format.dart';
import 'package:i18n_extension/i18n_extension.dart'; import 'package:i18n_extension/i18n_extension.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart'; import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
import 'package:refilc_plus/providers/premium_provider.dart'; import 'package:refilc_plus/providers/premium_provider.dart';
import 'package:animated_list_plus/animated_list_plus.dart'; import 'package:animated_list_plus/animated_list_plus.dart';
import 'package:refilc/api/providers/update_provider.dart'; import 'package:refilc/api/providers/update_provider.dart';
@ -247,11 +248,17 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
), ),
actions: [ actions: [
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.only(
horizontal: 8.0, vertical: 5.0), left: 8.0, right: 8.0, bottom: 0.0),
child: IconButton( child: IconButton(
splashRadius: 24.0, splashRadius: 24.0,
onPressed: () async { onPressed: () async {
Navigator.of(context, rootNavigator: true)
.push(
CupertinoPageRoute(
builder: (context) =>
const MessagesPage()),
);
// Navigator.of(context, rootNavigator: true) // Navigator.of(context, rootNavigator: true)
// .push(PageRouteBuilder( // .push(PageRouteBuilder(
// pageBuilder: (context, animation, secondaryAnimation) => // pageBuilder: (context, animation, secondaryAnimation) =>
@ -264,11 +271,11 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
// [DeviceOrientation.portraitUp]); // [DeviceOrientation.portraitUp]);
// setSystemChrome(context); // setSystemChrome(context);
// }); // });
SoonAlert.show(context: context); // SoonAlert.show(context: context);
// await showSendMessageSheet(context); // await showSendMessageSheet(context);
}, },
icon: Icon( icon: Icon(
FeatherIcons.messageCircle, FeatherIcons.messageSquare,
color: AppColors.of(context).text, color: AppColors.of(context).text,
), ),
), ),

25
refilc_mobile_ui/lib/pages/messages/messages_page.dart
View File

@ -116,13 +116,24 @@ class MessagesPageState extends State<MessagesPage>
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
shadowColor: Theme.of(context).shadowColor, shadowColor: Theme.of(context).shadowColor,
title: Padding( title: Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 0.0),
child: Text( child: Row(
"Messages".i18n, children: [
style: TextStyle( BackButton(
color: AppColors.of(context).text, style: ButtonStyle(
fontSize: 32.0, splashFactory: NoSplash.splashFactory,
fontWeight: FontWeight.bold), padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
EdgeInsets.zero),
),
),
Text(
"Messages".i18n,
style: TextStyle(
color: AppColors.of(context).text,
fontSize: 32.0,
fontWeight: FontWeight.bold),
),
],
), ),
), ),
bottom: FilterBar( bottom: FilterBar(