diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml index 1e10be4..8e68e2f 100644 --- a/.github/workflows/flutter_ci.yml +++ b/.github/workflows/flutter_ci.yml @@ -17,10 +17,10 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Set up Flutter - uses: subosito/flutter-action@v4 + uses: subosito/flutter-action@v2 with: flutter-version: 3.24.3 diff --git a/lib/main.dart b/lib/main.dart index b62c153..b57b8eb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,7 +81,7 @@ class MyApp extends StatelessWidget { routes: { AdminMainPage.routeName: (ctx) => AdminMainPage(), AuctionHome.routeName: (ctx) => AuctionHome(), - // AuctionPlayer.routeName: (ctx) => AuctionPlayer(), + //AuctionPlayer.routeName: (ctx) => AuctionPlayer(), AuctionPlayerResell.routeName: (ctx) => AuctionPlayerResell(), AuctionDetails.routeName: (ctx) => AuctionDetails(), TeamDetails.routeName: (ctx) => TeamDetails(), diff --git a/lib/screens/player/schedule_screen.dart b/lib/screens/player/schedule_screen.dart index 0bd5425..b292961 100644 --- a/lib/screens/player/schedule_screen.dart +++ b/lib/screens/player/schedule_screen.dart @@ -128,6 +128,7 @@ class UpcomingMatchCard extends StatelessWidget { ); }, child: Container( + width: MediaQuery.sizeOf(context).width*0.8, decoration: BoxDecoration( borderRadius: BorderRadius.circular(20), border: Border.all( @@ -211,12 +212,14 @@ class UpcomingMatchCard extends StatelessWidget { ), title: Center( child: Column(children: [ - Text( - "Match " + match.matchId, - style: TextStyle( - fontSize: 22, - fontWeight: FontWeight.bold, - color: Colors.white60), + Container( + child: Text( + "Match " + match.matchId, + style: TextStyle( + fontWeight: FontWeight.bold, + color: Colors.white60), + textScaler: TextScaler.linear(1.5), + ), ), SizedBox( height: 12, @@ -224,37 +227,51 @@ class UpcomingMatchCard extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - Text( - teams - .firstWhere((e) => e.teamUid == match.teamId1) - .teamAbbreviation, - // teams.firstWhere((e) => e.teamUid==match.teamId1).teamAbbreviation[1] + - // teams.firstWhere((e) => e.teamUid==match.teamId1).teamAbbreviation[2], + Container( + width: MediaQuery.sizeOf(context).width*0.175, + alignment: Alignment.center, + child: Text( + teams + .firstWhere((e) => e.teamUid == match.teamId1) + .teamAbbreviation, + // teams.firstWhere((e) => e.teamUid==match.teamId1).teamAbbreviation[1] + + // teams.firstWhere((e) => e.teamUid==match.teamId1).teamAbbreviation[2], - // overflow: TextOverflow.visible, - style: TextStyle( - color: Colors.white60, - fontWeight: FontWeight.bold, - fontSize: 18), + // overflow: TextOverflow.visible, + style: TextStyle( + color: Colors.white60, + fontWeight: FontWeight.bold, + ), + textScaler: TextScaler.linear(1), + ), ), - Text( - " Vs ", - style: TextStyle( - color: Colors.white60, - fontWeight: FontWeight.bold, - fontSize: 18), + Container( + width: MediaQuery.sizeOf(context).width*0.075, + alignment: Alignment.center, + child: Text( + " Vs ", + style: TextStyle( + color: Colors.white60, + fontWeight: FontWeight.bold, + ), + textScaler: TextScaler.linear(1), + ), ), - Text( - teams - .firstWhere((e) => e.teamUid == match.teamId2) - .teamAbbreviation, - // teams.firstWhere((e) => e.teamUid==match.teamId2).teamAbbreviation[1] + - // teams.firstWhere((e) => e.teamUid==match.teamId2).teamAbbreviation[2], - overflow: TextOverflow.visible, - style: TextStyle( - color: Colors.white60, - fontWeight: FontWeight.bold, - fontSize: 18), + Container( + alignment: Alignment.center, + width: MediaQuery.sizeOf(context).width*0.175, + child: Text( + teams + .firstWhere((e) => e.teamUid == match.teamId2) + .teamAbbreviation, + // teams.firstWhere((e) => e.teamUid==match.teamId2).teamAbbreviation[1] + + // teams.firstWhere((e) => e.teamUid==match.teamId2).teamAbbreviation[2], + // overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Colors.white60, + fontWeight: FontWeight.bold, + ),textScaler: TextScaler.linear(1), + ), ), ], ),