firka/firka
firka/firka
9
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

commonize class names and file names

Browse Source
This commit is contained in:
Armand 2025-07-15 08:58:35 +02:00
parent 389540c3ac
commit 49f9e1a80e
12 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firka/lib/helpers/ui/stateless_async_widget.dart
View File

@ -12,7 +12,7 @@ abstract class StatelessAsyncWidget extends StatelessWidget {
future: buildAsync(context),
builder: (BuildContext context, AsyncSnapshot<Widget> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return Center(child: DelayedSpinner());
return Center(child: DelayedSpinnerWidget());
} else if (snapshot.hasError) {
return Center(child: Text('Error: ${snapshot.error}'));
} else {

0
firka/lib/ui/phone/pages/error/main_error.dart → firka/lib/ui/phone/pages/extras/main_error.dart
View File

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

@ -123,7 +123,7 @@ class _HomeMainScreen extends State<HomeMainScreen> {
children: [HomeMainWelcome(now, student!, lessons!), SizedBox()],
);*/
} else {
return DelayedSpinner();
return DelayedSpinnerWidget();
}
}
}

10
firka/lib/ui/phone/screens/home/home_screen.dart
View File

@ -13,8 +13,8 @@ import 'package:shake_gesture/shake_gesture.dart';
import '../../../../helpers/debug_helper.dart';
import '../../../../l10n/app_localizations.dart';
import '../../../widget/firka_icon.dart';
import '../../pages/error/main_error.dart';
import '../../pages/extras/extras.dart';
import '../../pages/extras/main_error.dart';
import '../../pages/home/home_grades_subject.dart';
import '../../pages/home/home_timetable.dart';
import '../debug/debug_screen.dart';
@ -248,7 +248,7 @@ class _HomeScreenState extends State<HomeScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// Home Button
BottomNavIcon(() {
BottomNavIconWidget(() {
if (page.page != HomePages.home) {
HapticFeedback.lightImpact();
@ -269,7 +269,7 @@ class _HomeScreenState extends State<HomeScreen> {
: appStyle.colors.secondary,
appStyle.colors.textPrimary),
// Grades Button
BottomNavIcon(() {
BottomNavIconWidget(() {
if (page.page != HomePages.grades) {
HapticFeedback.lightImpact();
@ -290,7 +290,7 @@ class _HomeScreenState extends State<HomeScreen> {
: appStyle.colors.secondary,
appStyle.colors.textPrimary),
// Timetable Button
BottomNavIcon(() {
BottomNavIconWidget(() {
if (page.page != HomePages.timetable) {
HapticFeedback.lightImpact();
@ -311,7 +311,7 @@ class _HomeScreenState extends State<HomeScreen> {
: appStyle.colors.secondary,
appStyle.colors.textPrimary),
// More Button
BottomNavIcon(() {
BottomNavIconWidget(() {
HapticFeedback.lightImpact();
showExtrasBottomSheet(context, data);
},

4
firka/lib/ui/phone/widgets/bottom_nav_icon.dart
View File

@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import '../../model/style.dart';
import '../../widget/firka_icon.dart';
class BottomNavIcon extends StatelessWidget {
class BottomNavIconWidget extends StatelessWidget {
final void Function() onTap;
final bool active;
final Uint8List icon;
@ -13,7 +13,7 @@ class BottomNavIcon extends StatelessWidget {
final Color iconColor;
final Color textColor;
const BottomNavIcon(this.onTap, this.active, this.icon, this.text,
const BottomNavIconWidget(this.onTap, this.active, this.icon, this.text,
this.iconColor, this.textColor,
{super.key});

2
firka/lib/ui/phone/widgets/lesson_big.dart
View File

@ -6,7 +6,7 @@ import 'package:firka/ui/widget/firka_icon.dart';
import 'package:flutter/material.dart';
import '../../../helpers/api/model/timetable.dart';
import '../../widget/class_icon_widget.dart';
import '../../widget/class_icon.dart';
class LessonBigWidget extends StatelessWidget {
final DateTime now;

2
firka/lib/ui/phone/widgets/lesson_small.dart
View File

@ -4,7 +4,7 @@ import 'package:firka/ui/model/style.dart';
import 'package:flutter/material.dart';
import '../../../helpers/api/model/timetable.dart';
import '../../widget/class_icon_widget.dart';
import '../../widget/class_icon.dart';
class LessonSmallWidget extends StatelessWidget {
final Lesson lesson;

2
firka/lib/ui/wear/screens/home/home_screen.dart
View File

@ -3,7 +3,7 @@ import 'dart:math';
import 'package:firka/helpers/api/model/timetable.dart';
import 'package:firka/helpers/extensions.dart';
import 'package:firka/ui/widget/class_icon_widget.dart';
import 'package:firka/ui/widget/class_icon.dart';
import 'package:firka/wear_main.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

11
firka/lib/ui/wear/widgets/circular_progress_indicator.dart
View File

@ -2,13 +2,13 @@ import 'dart:math';
import 'package:flutter/material.dart';
class CircularProgressIndicator extends StatefulWidget {
class CircularProgressIndicatorWidget extends StatefulWidget {
final double progress;
final double strokeWidth;
final Color color;
final Size screenSize;
const CircularProgressIndicator({
const CircularProgressIndicatorWidget({
super.key,
required this.progress,
required this.screenSize,
@ -17,11 +17,12 @@ class CircularProgressIndicator extends StatefulWidget {
});
@override
_CircularProgressIndicatorState createState() =>
_CircularProgressIndicatorState();
_CircularProgressIndicatorWidgetState createState() =>
_CircularProgressIndicatorWidgetState();
}
class _CircularProgressIndicatorState extends State<CircularProgressIndicator>
class _CircularProgressIndicatorWidgetState
extends State<CircularProgressIndicatorWidget>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
late Animation<double> _animation;

0
firka/lib/ui/widget/class_icon_widget.dart → firka/lib/ui/widget/class_icon.dart
View File

8
firka/lib/ui/widget/delayed_spinner.dart
View File

@ -2,14 +2,14 @@ import 'dart:async';
import 'package:flutter/material.dart';
class DelayedSpinner extends StatefulWidget {
const DelayedSpinner({super.key});
class DelayedSpinnerWidget extends StatefulWidget {
const DelayedSpinnerWidget({super.key});
@override
State<DelayedSpinner> createState() => _DelayedSpinner();
State<DelayedSpinnerWidget> createState() => _DelayedSpinner();
}
class _DelayedSpinner extends State<DelayedSpinner> {
class _DelayedSpinner extends State<DelayedSpinnerWidget> {
Timer? timer;
bool showSpinner = false;

2
firka/lib/ui/widget/grade_small_card.dart
View File

@ -2,7 +2,7 @@ import 'package:firka/helpers/api/model/grade.dart';
import 'package:firka/helpers/api/model/subject.dart';
import 'package:firka/helpers/ui/firka_card.dart';
import 'package:firka/helpers/ui/grade_helpers.dart';
import 'package:firka/ui/widget/class_icon_widget.dart';
import 'package:firka/ui/widget/class_icon.dart';
import 'package:flutter/material.dart';
import '../model/style.dart';