Läuft: Next Step zurück Button danach dann nach Zeit sortiert
This commit is contained in:
parent
c7a9e7926b
commit
419f6b17a8
|
|
@ -5,9 +5,11 @@
|
|||
*.swp
|
||||
.DS_Store
|
||||
.atom/
|
||||
.build/
|
||||
.buildlog/
|
||||
.history
|
||||
.svn/
|
||||
.swiftpm/
|
||||
migrate_working_dir/
|
||||
|
||||
# IntelliJ related
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@ import 'package:intl/intl.dart';
|
|||
|
||||
class Frame28 extends StatelessWidget {
|
||||
final List<Map<String, dynamic>> events;
|
||||
final Color color;
|
||||
|
||||
const Frame28({Key? key, required this.events}) : super(key: key);
|
||||
const Frame28({Key? key, required this.events, required this.color}) : super(key: key);
|
||||
|
||||
/* void initState() {
|
||||
super.initState();
|
||||
|
|
@ -20,7 +21,11 @@ class Frame28 extends StatelessWidget {
|
|||
//_loadData();
|
||||
var body = CustomScrollView(
|
||||
slivers: [
|
||||
SliverSafeArea(sliver: SliverToBoxAdapter(
|
||||
SliverSafeArea(
|
||||
//minimum: EdgeInsets.zero,
|
||||
bottom: false,
|
||||
sliver:
|
||||
SliverToBoxAdapter(
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
|
|
@ -33,6 +38,7 @@ class Frame28 extends StatelessWidget {
|
|||
child: ButtonSection(), // Dein Button-Bereich
|
||||
),
|
||||
Container(height: 10,),
|
||||
//Container(child: MusikHeader(),),
|
||||
Column(
|
||||
children: [
|
||||
Container(
|
||||
|
|
@ -46,9 +52,9 @@ class Frame28 extends StatelessWidget {
|
|||
children: [
|
||||
// TODO: muss noch angepasst werden jedes mal wenn ein neuer Tag ist wieder diesen Text anzeigen
|
||||
SizedBox(height: 10),
|
||||
Text( 'Heute', style: TextStyle(color: Color(0xFF171717), fontSize: 12, fontFamily: 'Inter', fontWeight: FontWeight.w600, height: 0,),),
|
||||
Text( 'Heute', style: TextStyle(color: Color(0xFF171717), fontSize: 12, fontFamily: 'Inter', fontWeight: FontWeight.w600,height:0,),),
|
||||
//Kurze Zwischenbereich zum trennen
|
||||
//SizedBox(height: 4),
|
||||
SizedBox(height: 4),
|
||||
//EventCard2Section(),
|
||||
/* const SizedBox(height: 20),
|
||||
EventCard2Section(),
|
||||
|
|
@ -65,13 +71,16 @@ class Frame28 extends StatelessWidget {
|
|||
),])
|
||||
),),),
|
||||
SliverList(
|
||||
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
|
||||
(context, index) {
|
||||
return EventCard2Section(
|
||||
title: events[index]['name'],
|
||||
description: events[index]['description'],
|
||||
location: events[index]['location']['name'],
|
||||
start_time: extractTime24h(events[index]['time'][0]['start_date']),
|
||||
color: color,
|
||||
);
|
||||
},
|
||||
childCount: events.length,
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ class HomePage extends StatelessWidget {
|
|||
MaterialPageRoute(
|
||||
builder: (context) => Frame28(
|
||||
events: events2,
|
||||
color: Data.recipes[index].color,
|
||||
)));
|
||||
},
|
||||
child: Card(
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ class EventCard2Section extends StatelessWidget {
|
|||
final String description;
|
||||
final String location;
|
||||
final String start_time;
|
||||
final Color color;
|
||||
|
||||
const EventCard2Section({
|
||||
Key? key,
|
||||
|
|
@ -157,6 +158,7 @@ class EventCard2Section extends StatelessWidget {
|
|||
required this.description,
|
||||
required this.location,
|
||||
required this.start_time,
|
||||
required this.color,
|
||||
}) : super(key: key);
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
|
@ -184,7 +186,7 @@ class EventCard2Section extends StatelessWidget {
|
|||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Color(0xFFF8AB14),
|
||||
color: color,//Color(0xFFF8AB14),
|
||||
blurRadius: 0,
|
||||
offset: Offset(0, 10),
|
||||
spreadRadius: 0,
|
||||
|
|
@ -828,4 +830,91 @@ class TagSlider extends StatelessWidget {
|
|||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class MusikHeader extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
Container(
|
||||
width: 390,
|
||||
height: 32,
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Transform(
|
||||
transform: Matrix4.identity()..translate(0.0, 0.0)..rotateZ(-1.57),
|
||||
child: Container(
|
||||
width: 32,
|
||||
height: 32,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
decoration: BoxDecoration(),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 89),
|
||||
Container(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Container(
|
||||
width: 24,
|
||||
height: 24,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
decoration: BoxDecoration(),
|
||||
child: FlutterLogo(),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
'Musik',
|
||||
style: TextStyle(
|
||||
color: Color(0xFF171717),
|
||||
fontSize: 20,
|
||||
fontFamily: 'Inter',
|
||||
fontWeight: FontWeight.w800,
|
||||
height: 0,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 89),
|
||||
Opacity(
|
||||
opacity: 0.80,
|
||||
child: Container(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Container(
|
||||
width: 22,
|
||||
height: 20,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
decoration: BoxDecoration(),
|
||||
child: FlutterLogo(),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
26
pubspec.lock
26
pubspec.lock
|
|
@ -69,10 +69,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
|
||||
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.18.0"
|
||||
version: "1.19.0"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -308,18 +308,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
|
||||
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.5"
|
||||
version: "10.0.7"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
|
||||
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.5"
|
||||
version: "3.0.8"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -532,7 +532,7 @@ packages:
|
|||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.99"
|
||||
version: "0.0.0"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -569,10 +569,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
|
||||
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.0"
|
||||
version: "1.3.0"
|
||||
supabase:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -601,10 +601,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
|
||||
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.2"
|
||||
version: "0.7.3"
|
||||
timeago:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -697,10 +697,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
|
||||
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "14.2.5"
|
||||
version: "14.3.0"
|
||||
web:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
|
|||
Loading…
Reference in New Issue