This commit is contained in:
dan63047 2024-08-13 02:07:59 +03:00
parent cda6dc790c
commit b3fd96e58c
2 changed files with 327 additions and 172 deletions

View File

@ -573,6 +573,7 @@ class _MainState extends State<MainView> with TickerProviderStateMixin {
break; break;
default: default:
errText = snapshot.error.toString(); errText = snapshot.error.toString();
subText = snapshot.stackTrace.toString();
} }
return Center(child: return Center(child:
Column( Column(

View File

@ -656,6 +656,59 @@ class _DestinationHomeState extends State<DestinationHome> {
); );
} }
Widget getRecentTLrecords(String searchFor, BoxConstraints constraints){
return Column(
children: [
Card(
child: Padding(
padding: const EdgeInsets.only(bottom: 4.0),
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(t.recent, style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 42)),
],
),
),
),
),
Card(
child: FutureBuilder<TetraLeagueBetaStream>(
future: teto.fetchTLStream(searchFor),
builder: (context, snapshot) {
switch (snapshot.connectionState){
case ConnectionState.none:
case ConnectionState.waiting:
case ConnectionState.active:
return const Center(child: CircularProgressIndicator());
case ConnectionState.done:
if (snapshot.hasData){
return SizedBox(height: constraints.maxHeight, child: _TLRecords(userID: searchFor, changePlayer: (){}, data: snapshot.data!.records, wasActiveInTL: snapshot.data!.records.isNotEmpty, oldMathcesHere: false));
}
if (snapshot.hasError){
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(t.errors.noSuchUser, style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 42, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(t.errors.noSuchUserSub, textAlign: TextAlign.center),
),
],
)
);
}
}
return Text("what?");
},
),
),
],
);
}
Widget getZenithCard(RecordSingle? record){ Widget getZenithCard(RecordSingle? record){
return Column( return Column(
children: [ children: [
@ -691,24 +744,48 @@ class _DestinationHomeState extends State<DestinationHome> {
); );
} }
Widget getRecordCard(RecordSingle? record){ Widget getRecordCard(RecordSingle? record, bool? betterThanRankAverage, MapEntry? closestAverage, bool? betterThanClosestAverage, String? rank){
return Column( return Column(
children: [ children: [
Row( Card(
child: Padding(
padding: const EdgeInsets.only(bottom: 4.0),
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(switch(record!.gamemode){
"40l" => t.sprint,
"blitz" => t.blitz,
"5mblast" => "5,000,000 Blast",
_ => record.gamemode
}, style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 42))
],
),
),
),
),
Card(
child: Padding(
padding: const EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
// if (record!.gamemode == "40l") Padding(padding: const EdgeInsets.only(right: 8.0), if (closestAverage != null) Padding(padding: const EdgeInsets.only(right: 8.0),
// child: Image.asset("res/tetrio_tl_alpha_ranks/${closestAverageSprint.key}.png", height: 96) child: Image.asset("res/tetrio_tl_alpha_ranks/${closestAverage.key}.png", height: 96)
// ), ),
// if (record!.gamemode == "blitz") Padding(padding: const EdgeInsets.only(right: 8.0),
// child: Image.asset("res/tetrio_tl_alpha_ranks/${closestAverageBlitz.key}.png", height: 96)
// ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
RichText(text: TextSpan( RichText(text: TextSpan(
text: record!.gamemode == "40l" ? get40lTime(record.stats.finalTime.inMicroseconds) : NumberFormat.decimalPattern().format(record.stats.score), text: switch(record.gamemode){
"40l" => get40lTime(record.stats.finalTime.inMicroseconds),
"blitz" => NumberFormat.decimalPattern().format(record.stats.score),
"5mblast" => get40lTime(record.stats.finalTime.inMicroseconds),
_ => record.stats.score.toString()
},
style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white), style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white),
), ),
), ),
@ -716,27 +793,71 @@ class _DestinationHomeState extends State<DestinationHome> {
text: "", text: "",
style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 14, color: Colors.grey), style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 14, color: Colors.grey),
children: [ children: [
// if (record!.gamemode == "40l" && (rank != null && rank != "z")) TextSpan(text: "${t.verdictGeneral(n: readableTimeDifference(record!.stats.finalTime, sprintAverages[rank]!), verdict: sprintBetterThanRankAverage??false ? t.verdictBetter : t.verdictWorse, rank: rank!.toUpperCase())}\n", style: TextStyle( if (rank != null && rank != "z") TextSpan(text: "${t.verdictGeneral(n: switch(record.gamemode){
// color: sprintBetterThanRankAverage??false ? Colors.greenAccent : Colors.redAccent "40l" => readableTimeDifference(record.stats.finalTime, sprintAverages[rank]!),
// )) "blitz" => readableIntDifference(record.stats.score, blitzAverages[rank]!),
// else if (record!.gamemode == "40l" && (rank == null || rank == "z")) TextSpan(text: "${t.verdictGeneral(n: readableTimeDifference(record!.stats.finalTime, closestAverageSprint.value), verdict: sprintBetterThanClosestAverage ? t.verdictBetter : t.verdictWorse, rank: closestAverageSprint.key.toUpperCase())}\n", style: TextStyle( _ => record.stats.score.toString()
// color: sprintBetterThanClosestAverage ? Colors.greenAccent : Colors.redAccent }, verdict: betterThanRankAverage??false ? t.verdictBetter : t.verdictWorse, rank: rank.toUpperCase())}\n", style: TextStyle(
// )) color: betterThanClosestAverage??false ? Colors.greenAccent : Colors.redAccent
// else if (record!.gamemode == "blitz" && (rank != null && rank != "z")) TextSpan(text: "${t.verdictGeneral(n: readableIntDifference(record!.stats.score, blitzAverages[rank]!), verdict: blitzBetterThanRankAverage??false ? t.verdictBetter : t.verdictWorse, rank: rank!.toUpperCase())}\n", style: TextStyle( ))
// color: blitzBetterThanRankAverage??false ? Colors.greenAccent : Colors.redAccent else if ((rank == null || rank == "z") && closestAverage != null) TextSpan(text: "${t.verdictGeneral(n: switch(record.gamemode){
// )) "40l" => readableTimeDifference(record.stats.finalTime, closestAverage.value),
// else if (record!.gamemode == "blitz" && (rank == null || rank == "z")) TextSpan(text: "${t.verdictGeneral(n: readableIntDifference(record!.stats.score, closestAverageBlitz.value), verdict: blitzBetterThanClosestAverage ? t.verdictBetter : t.verdictWorse, rank: closestAverageBlitz.key.toUpperCase())}\n", style: TextStyle( "blitz" => readableIntDifference(record.stats.score, closestAverage.value),
// color: blitzBetterThanClosestAverage ? Colors.greenAccent : Colors.redAccent _ => record.stats.score.toString()
// )), }, verdict: sprintBetterThanClosestAverage ? t.verdictBetter : t.verdictWorse, rank: closestAverageSprint.key.toUpperCase())}\n", style: TextStyle(
if (record.rank != -1) TextSpan(text: "${record.rank}", style: TextStyle(color: getColorOfRank(record.rank))), color: betterThanClosestAverage??false ? Colors.greenAccent : Colors.redAccent
)),
if (record.rank != -1) TextSpan(text: "${intf.format(record.rank)}", style: TextStyle(color: getColorOfRank(record.rank))),
if (record.rank != -1) const TextSpan(text: ""), if (record.rank != -1) const TextSpan(text: ""),
if (record.countryRank != -1) TextSpan(text: "${intf.format(record.countryRank)} local", style: TextStyle(color: getColorOfRank(record.countryRank))),
if (record.countryRank != -1) const TextSpan(text: ""),
TextSpan(text: timestamp(record.timestamp)), TextSpan(text: timestamp(record.timestamp)),
] ]
), ),
) ),
],), ],),
Spacer(),
Table(
defaultColumnWidth:const IntrinsicColumnWidth(),
children: [
TableRow(children: [
Text(switch(record.gamemode){
"40l" => record.stats.piecesPlaced.toString(),
"blitz" => record.stats.level.toString(),
"5mblast" => NumberFormat.decimalPattern().format(record.stats.spp),
_ => "What if "
}, textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
Text(switch(record.gamemode){
"40l" => " Pieces",
"blitz" => " Level",
"5mblast" => " SPP",
_ => " i wanted to"
}, textAlign: TextAlign.left, style: const TextStyle(fontSize: 21)),
]),
TableRow(children: [
Text(f2.format(record.stats.pps), textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
Text(" PPS", textAlign: TextAlign.left, style: const TextStyle(fontSize: 21)),
]),
TableRow(children: [
Text(switch(record.gamemode){
"40l" => f2.format(record.stats.kpp),
"blitz" => f2.format(record.stats.spp),
"5mblast" => record.stats.piecesPlaced.toString(),
_ => "but god said"
}, textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
Text(switch(record.gamemode){
"40l" => " KPP",
"blitz" => " SPP",
"5mblast" => " Pieces",
_ => " no"
}, textAlign: TextAlign.left, style: const TextStyle(fontSize: 21)),
])
], ],
), ),
],
),
),
),
] ]
); );
} }
@ -946,12 +1067,26 @@ class _DestinationHomeState extends State<DestinationHome> {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator());
case ConnectionState.done: case ConnectionState.done:
if (snapshot.hasData){ if (snapshot.hasData){
blitzBetterThanRankAverage = (snapshot.data!.league.rank != "z" && snapshot.data!.blitz != null) ? snapshot.data!.blitz!.stats.score > blitzAverages[snapshot.data!.league.rank]! : null;
sprintBetterThanRankAverage = (snapshot.data!.league.rank != "z" && snapshot.data!.sprint != null) ? snapshot.data!.sprint!.stats.finalTime < sprintAverages[snapshot.data!.league.rank]! : null;
if (snapshot.data!.sprint != null) {
closestAverageSprint = sprintAverages.entries.singleWhere((element) => element.value == sprintAverages.values.reduce((a, b) => (a-snapshot.data!.sprint!.stats.finalTime).abs() < (b -snapshot.data!.sprint!.stats.finalTime).abs() ? a : b));
sprintBetterThanClosestAverage = snapshot.data!.sprint!.stats.finalTime < closestAverageSprint.value;
}
if (snapshot.data!.blitz != null){
closestAverageBlitz = blitzAverages.entries.singleWhere((element) => element.value == blitzAverages.values.reduce((a, b) => (a-snapshot.data!.blitz!.stats.score).abs() < (b -snapshot.data!.blitz!.stats.score).abs() ? a : b));
blitzBetterThanClosestAverage = snapshot.data!.blitz!.stats.score > closestAverageBlitz.value;
}
return switch (rightCard){ return switch (rightCard){
Cards.overview => getOverviewCard(snapshot.data!), Cards.overview => getOverviewCard(snapshot.data!),
Cards.tetraLeague => getTetraLeagueCard(snapshot.data!.league), Cards.tetraLeague => switch (cardMod){
CardMod.info => getTetraLeagueCard(snapshot.data!.league),
CardMod.recent => getRecentTLrecords(widget.searchFor, widget.constraints),
_ => Center(child: Text("huh?"))
},
Cards.quickPlay => getZenithCard(cardMod == CardMod.ex ? snapshot.data?.zenithEx : snapshot.data?.zenith), Cards.quickPlay => getZenithCard(cardMod == CardMod.ex ? snapshot.data?.zenithEx : snapshot.data?.zenith),
Cards.sprint => getRecordCard(snapshot.data?.sprint), Cards.sprint => getRecordCard(snapshot.data?.sprint, sprintBetterThanRankAverage, closestAverageSprint, sprintBetterThanClosestAverage, snapshot.data!.league.rank),
Cards.blitz => getRecordCard(snapshot.data?.blitz), Cards.blitz => getRecordCard(snapshot.data?.blitz, blitzBetterThanRankAverage, closestAverageBlitz, blitzBetterThanClosestAverage, snapshot.data!.league.rank),
}; };
} }
if (snapshot.hasError){ if (snapshot.hasError){
@ -1339,6 +1474,16 @@ class FakeDistinguishmentThingy extends StatelessWidget{
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Card( return Card(
surfaceTintColor: getCardTint(), surfaceTintColor: getCardTint(),
child: Container(
decoration: banned ? BoxDecoration(
gradient: LinearGradient(
colors: [Colors.transparent, const Color.fromARGB(171, 244, 67, 54), Color.fromARGB(171, 244, 67, 54)],
stops: [0.1, 0.9, 0.01],
tileMode: TileMode.mirror,
begin: Alignment.topLeft,
end: AlignmentDirectional(-0.95, -0.95)
)
) : null,
child: Column( child: Column(
children: [ children: [
Center( Center(
@ -1353,6 +1498,7 @@ class FakeDistinguishmentThingy extends StatelessWidget{
Text(getDistinguishmentSubtitle(), style: const TextStyle(fontSize: 18), textAlign: TextAlign.center), Text(getDistinguishmentSubtitle(), style: const TextStyle(fontSize: 18), textAlign: TextAlign.center),
], ],
), ),
),
); );
} }
@ -1798,18 +1944,18 @@ class TetraLeagueThingy extends StatelessWidget{
SizedBox( SizedBox(
height: 128.0, height: 128.0,
width: 128.0, width: 128.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(1000),
child: SfRadialGauge( child: SfRadialGauge(
backgroundColor: Colors.black,
axes: [ axes: [
RadialAxis( RadialAxis(
// startAngle: 180,
// endAngle: 0,
minimum: 0.4, minimum: 0.4,
maximum: 0.6, maximum: 0.6,
//radiusFactor: 1.5, radiusFactor: 1.01,
showTicks: true, showTicks: true,
showLabels: false, showLabels: false,
interval: 0.1, interval: 0.1,
//labelsPosition: ElementsPosition.outside,
ranges:[ ranges:[
GaugeRange(startValue: 0, endValue: league.winrate, color: theme.colorScheme.primary) GaugeRange(startValue: 0, endValue: league.winrate, color: theme.colorScheme.primary)
], ],
@ -1827,6 +1973,7 @@ class TetraLeagueThingy extends StatelessWidget{
] ]
), ),
), ),
),
Expanded( Expanded(
child: Center( child: Center(
child: Table( child: Table(
@ -1875,14 +2022,17 @@ class NerdStatsThingy extends StatelessWidget{
SizedBox( SizedBox(
height: 256.0, height: 256.0,
width: 256.0, width: 256.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(1000),
child: SfRadialGauge( child: SfRadialGauge(
backgroundColor: Colors.black,
axes: [ axes: [
RadialAxis( RadialAxis(
startAngle: 120, startAngle: 200,
endAngle: 240, endAngle: 340,
minimum: 0.0, minimum: 0.0,
maximum: 1.0, maximum: 1.0,
//radiusFactor: 1.5, radiusFactor: 1.01,
showTicks: true, showTicks: true,
showLabels: false, showLabels: false,
interval: 0.1, interval: 0.1,
@ -1898,21 +2048,21 @@ class NerdStatsThingy extends StatelessWidget{
style: const TextStyle(fontFamily: "Eurostile Round"), style: const TextStyle(fontFamily: "Eurostile Round"),
children: [ children: [
const TextSpan(text: "APP\n"), const TextSpan(text: "APP\n"),
TextSpan(text: f3.format(nerdStats.app), style: const TextStyle(fontSize: 25,fontWeight: FontWeight.bold)), TextSpan(text: f3.format(nerdStats.app), style: const TextStyle(fontSize: 25, fontFamily: "Eurostile Round Extended", fontWeight: FontWeight.w100)),
//TextSpan(text: "\nAPP"), //TextSpan(text: "\nAPP"),
] ]
))), ))),
angle: 180,positionFactor: 0.5 angle: 270,positionFactor: 0.5
), ),
], ],
), ),
RadialAxis( RadialAxis(
startAngle: 300, startAngle: 20,
endAngle: 60, endAngle: 160,
isInversed: true, isInversed: true,
minimum: 1.8, minimum: 1.8,
maximum: 2.4, maximum: 2.4,
//radiusFactor: 1.5, radiusFactor: 1.01,
showTicks: true, showTicks: true,
showLabels: false, showLabels: false,
interval: 0.1, interval: 0.1,
@ -1928,18 +2078,20 @@ class NerdStatsThingy extends StatelessWidget{
style: const TextStyle(fontFamily: "Eurostile Round"), style: const TextStyle(fontFamily: "Eurostile Round"),
children: [ children: [
const TextSpan(text: "VS/APM\n"), const TextSpan(text: "VS/APM\n"),
TextSpan(text: f3.format(nerdStats.vsapm), style: const TextStyle(fontSize: 25,fontWeight: FontWeight.bold)), TextSpan(text: f3.format(nerdStats.vsapm), style: const TextStyle(fontSize: 25, fontFamily: "Eurostile Round Extended", fontWeight: FontWeight.w100)),
] ]
))), ))),
angle: 0,positionFactor: 0.5 angle: 90,positionFactor: 0.5
) )
], ],
) )
] ]
), ),
), ),
),
Expanded( Expanded(
child: Wrap( child: Wrap(
spacing: 10,
children: [ children: [
GaugetThingy(value: nerdStats.dss, min: 0, max: 1.0, tickInterval: .2, label: "DS/S", sideSize: 128.0, fractionDigits: 3), GaugetThingy(value: nerdStats.dss, min: 0, max: 1.0, tickInterval: .2, label: "DS/S", sideSize: 128.0, fractionDigits: 3),
GaugetThingy(value: nerdStats.dsp, min: 0, max: 1.0, tickInterval: .2, label: "DS/P", sideSize: 128.0, fractionDigits: 3), GaugetThingy(value: nerdStats.dsp, min: 0, max: 1.0, tickInterval: .2, label: "DS/P", sideSize: 128.0, fractionDigits: 3),
@ -2007,17 +2159,18 @@ class GaugetThingy extends StatelessWidget{
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
NumberFormat f = NumberFormat.decimalPatternDigits(locale: LocaleSettings.currentLocale.languageCode, decimalDigits: fractionDigits); NumberFormat f = NumberFormat.decimalPatternDigits(locale: LocaleSettings.currentLocale.languageCode, decimalDigits: fractionDigits);
return SizedBox( return ClipRRect(
borderRadius: BorderRadius.circular(1000),
child: SizedBox(
height: sideSize, height: sideSize,
width: sideSize, width: sideSize,
child: SfRadialGauge( child: SfRadialGauge(
backgroundColor: Colors.black,
axes: [ axes: [
RadialAxis( RadialAxis(
// startAngle: 180, radiusFactor: 1.01,
// endAngle: 0,
minimum: min, minimum: min,
maximum: max, maximum: max,
//radiusFactor: 1.5,
showTicks: true, showTicks: true,
showLabels: false, showLabels: false,
interval: tickInterval, interval: tickInterval,
@ -2028,7 +2181,7 @@ class GaugetThingy extends StatelessWidget{
annotations: [ annotations: [
GaugeAnnotation(widget: Container(child: GaugeAnnotation(widget: Container(child:
Text(f.format(value), textAlign: TextAlign.center, style: const TextStyle(fontSize: 25,fontWeight: FontWeight.bold))), Text(f.format(value), textAlign: TextAlign.center, style: const TextStyle(fontSize: 25,fontWeight: FontWeight.bold))),
angle: 90,positionFactor: 0.25 angle: 90,positionFactor: 0.10
), ),
GaugeAnnotation(widget: Container(child: GaugeAnnotation(widget: Container(child:
Text(label, textAlign: TextAlign.center, style: const TextStyle(height: .9))), Text(label, textAlign: TextAlign.center, style: const TextStyle(height: .9))),
@ -2038,6 +2191,7 @@ class GaugetThingy extends StatelessWidget{
) )
] ]
), ),
),
); );
} }
} }