From da3abb7fb7d6c47decdfaa55a76656cefcb121a3 Mon Sep 17 00:00:00 2001
From: Kima <kimavideos97@gmail.com>
Date: Mon, 4 Sep 2023 17:10:09 +0200
Subject: [PATCH] fixed school select (omfg nagyon szarul csinaltak)
---
.gitignore | 1 +
.../lib/screens/login/login_screen.dart | 5 +-
.../login/school_input/school_input_tile.dart | 79 +++++++++----------
3 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2e80ede..7f38ad2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ filcnaplo/ios/Podfile.lock
key.properties
.flutter-plugins*
+filcnaplo/ios/Flutter/flutter_export_environment 4.sh
diff --git a/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart b/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
index fef6f0a..22b1c5c 100755
--- a/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
+++ b/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
@@ -278,7 +278,10 @@ class _LoginScreenState extends State<LoginScreen> {
][_loginState.index]
.i18n,
style: const TextStyle(
- color: Colors.red, fontWeight: FontWeight.w500),
+ color: Colors.red,
+ fontWeight: FontWeight.w500,
+ ),
+ textAlign: TextAlign.center,
),
),
const Spacer()
diff --git a/filcnaplo_mobile_ui/lib/screens/login/school_input/school_input_tile.dart b/filcnaplo_mobile_ui/lib/screens/login/school_input/school_input_tile.dart
index ae48d26..a364c23 100755
--- a/filcnaplo_mobile_ui/lib/screens/login/school_input/school_input_tile.dart
+++ b/filcnaplo_mobile_ui/lib/screens/login/school_input/school_input_tile.dart
@@ -12,51 +12,48 @@ class SchoolInputTile extends StatelessWidget {
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(4.0),
- child: GestureDetector(
- onPanDown: (e) {
+ child: InkWell(
+ onTap: () {
onTap!();
},
- child: InkWell(
- onTapDown: (e) {},
- borderRadius: BorderRadius.circular(6.0),
- child: Padding(
- padding: const EdgeInsets.all(6.0),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // School name
- Padding(
- padding: const EdgeInsets.only(bottom: 4.0),
- child: Text(
- school.name,
- maxLines: 2,
- overflow: TextOverflow.ellipsis,
- style: const TextStyle(fontWeight: FontWeight.w600),
+ borderRadius: BorderRadius.circular(6.0),
+ child: Padding(
+ padding: const EdgeInsets.all(6.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // School name
+ Padding(
+ padding: const EdgeInsets.only(bottom: 4.0),
+ child: Text(
+ school.name,
+ maxLines: 2,
+ overflow: TextOverflow.ellipsis,
+ style: const TextStyle(fontWeight: FontWeight.w600),
+ ),
+ ),
+ Row(
+ children: [
+ // School id
+ Expanded(
+ child: Text(
+ school.instituteCode,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
),
- ),
- Row(
- children: [
- // School id
- Expanded(
- child: Text(
- school.instituteCode,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
+ // School city
+ Expanded(
+ child: Text(
+ school.city,
+ textAlign: TextAlign.right,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
- // School city
- Expanded(
- child: Text(
- school.city,
- textAlign: TextAlign.right,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- ),
- ],
- ),
- ],
- ),
+ ),
+ ],
+ ),
+ ],
),
),
),