zan1456/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

Merge branch 'fix-issue-16' into dev

Browse Source
This commit is contained in:
checkedear
2026-03-28 16:27:18 +01:00
parent 84f8e75694 21ff8f082f
commit fa6f5390b1
2 changed files with 69 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
firka/lib/ui/phone/pages/home/home_main.dart
View File

@@ -321,34 +321,31 @@ class _HomeMainScreen extends FirkaState<HomeMainScreen> {
noticeBoardWidgets.add((
GestureDetector(
child: FirkaCard(
left: [],
extra: Row(
children: [
GradeWidget(grade),
SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
(grade.topic ?? grade.type.description!).firstUpper(),
style: appStyle.fonts.B_16SB.apply(
color: appStyle.colors.textPrimary,
),
left: [
GradeWidget(grade),
SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
(grade.topic ?? grade.type.description!).firstUpper(),
style: appStyle.fonts.B_16SB.apply(
color: appStyle.colors.textPrimary,
),
grade.mode?.description != null
? Text(
grade.mode!.description!.firstUpper(),
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textSecondary,
),
)
: SizedBox(),
],
),
),
grade.mode?.description != null
? Text(
grade.mode!.description!.firstUpper(),
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textSecondary,
),
)
: SizedBox(),
],
),
],
),
),
],
),
onTap: () {
showGradeBottomSheet(context, widget.data, grade);

142
firka_common/lib/ui/components/firka_card.dart
View File

@@ -7,9 +7,9 @@ enum Attach { none, bottom, top }
class FirkaCard extends StatelessWidget {
final List<Widget> left;
final List<Widget>? center;
final List<Widget> center;
final double? height;
final List<Widget>? right;
final List<Widget> right;
final bool shadow;
final Widget? extra;
final Attach? attached;
@@ -19,10 +19,10 @@ class FirkaCard extends StatelessWidget {
const FirkaCard({
required this.left,
this.shadow = true,
this.center,
this.right,
this.center = const [],
this.right = const [],
this.extra,
this.attached,
this.attached = Attach.none,
this.color,
this.height,
this.isLightMode,
@@ -31,107 +31,57 @@ class FirkaCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
var right = this.right ?? [];
var attached = this.attached != null ? this.attached! : Attach.none;
final defaultRounding = 16.0;
final attachedRounding = 8.0;
final isLight =
isLightMode ?? Theme.of(context).brightness == Brightness.light;
if (extra != null) {
return SizedBox(
width: MediaQuery.of(context).size.width,
height: height,
child: FirkaShadow(
shadow: shadow,
isLightMode: isLight,
child: Card(
color: color ?? appStyle.colors.card,
shadowColor: isLight && shadow ? null : Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
topRight: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
bottomLeft: Radius.circular(
attached == Attach.bottom
? attachedRounding
: defaultRounding,
),
bottomRight: Radius.circular(
attached == Attach.bottom
? attachedRounding
: defaultRounding,
),
final leftRow = Row(children: this.left);
final alignedRow = this.right.isEmpty && this.center.isEmpty
? leftRow
: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
leftRow,
Row(children: this.center),
Row(children: this.right),
],
);
return SizedBox(
width: MediaQuery.of(context).size.width,
height: height,
child: FirkaShadow(
shadow: shadow,
isLightMode: isLight,
child: Card(
color: color ?? appStyle.colors.card,
shadowColor: isLight && shadow ? null : Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: left),
Row(children: center ?? []),
Row(children: right),
],
),
extra ?? const SizedBox(),
],
topRight: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
bottomLeft: Radius.circular(
attached == Attach.bottom ? attachedRounding : defaultRounding,
),
bottomRight: Radius.circular(
attached == Attach.bottom ? attachedRounding : defaultRounding,
),
),
),
),
);
} else {
return SizedBox(
width: MediaQuery.of(context).size.width,
height: height,
child: FirkaShadow(
shadow: shadow,
isLightMode: isLight,
child: Card(
color: color ?? appStyle.colors.card,
shadowColor: isLight && shadow ? null : Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
topRight: Radius.circular(
attached == Attach.top ? attachedRounding : defaultRounding,
),
bottomLeft: Radius.circular(
attached == Attach.bottom
? attachedRounding
: defaultRounding,
),
bottomRight: Radius.circular(
attached == Attach.bottom
? attachedRounding
: defaultRounding,
),
),
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: left),
Row(children: center ?? []),
Row(children: right),
],
),
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: this.extra == null
? alignedRow
: Column(children: [alignedRow, this.extra!]),
),
),
);
}
),
);
}
}