dan63
/
TetraStats
mirror of https://github.com/dan63047/TetraStats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

still thinking

This commit is contained in:
dan63047 2024-08-08 01:42:04 +03:00
parent 636c2ae946
commit 79bbf2e71d
3 changed files with 257 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gen/strings.g.dart
View File

@ -6,7 +6,7 @@
/// Locales: 2 /// Locales: 2
/// Strings: 1216 (608 per locale) /// Strings: 1216 (608 per locale)
/// ///
/// Built on 2024-07-31 at 20:51 UTC /// Built on 2024-08-07 at 15:58 UTC
// coverage:ignore-file // coverage:ignore-file
// ignore_for_file: type=lint // ignore_for_file: type=lint
@ -720,7 +720,7 @@ class _StringsStatCellNumEn {
String get lbpcShort => '№ in local LB'; String get lbpcShort => '№ in local LB';
String get gamesPlayed => 'Games\nplayed'; String get gamesPlayed => 'Games\nplayed';
String get gamesWonTL => 'Games\nWon'; String get gamesWonTL => 'Games\nWon';
String get winrate => 'Winrate\nprecentage'; String get winrate => 'Winrate';
String get level => 'Level'; String get level => 'Level';
String get score => 'Score'; String get score => 'Score';
String get spp => 'Score\nPer Piece'; String get spp => 'Score\nPer Piece';
@ -1824,7 +1824,7 @@ extension on Translations {
case 'statCellNum.lbpcShort': return '№ in local LB'; case 'statCellNum.lbpcShort': return '№ in local LB';
case 'statCellNum.gamesPlayed': return 'Games\nplayed'; case 'statCellNum.gamesPlayed': return 'Games\nplayed';
case 'statCellNum.gamesWonTL': return 'Games\nWon'; case 'statCellNum.gamesWonTL': return 'Games\nWon';
case 'statCellNum.winrate': return 'Winrate\nprecentage'; case 'statCellNum.winrate': return 'Winrate';
case 'statCellNum.level': return 'Level'; case 'statCellNum.level': return 'Level';
case 'statCellNum.score': return 'Score'; case 'statCellNum.score': return 'Score';
case 'statCellNum.spp': return 'Score\nPer Piece'; case 'statCellNum.spp': return 'Score\nPer Piece';

329
lib/views/main_view_tiles.dart
View File

@ -75,7 +75,7 @@ TetrioPlayer testPlayer = TetrioPlayer(
tlSeason1: TetraLeagueAlpha( tlSeason1: TetraLeagueAlpha(
timestamp: DateTime(1970), timestamp: DateTime(1970),
gamesPlayed: 28, gamesPlayed: 28,
gamesWon: 14, gamesWon: 15,
bestRank: "x", bestRank: "x",
decaying: false, decaying: false,
rating: 23500.6194, rating: 23500.6194,
@ -106,6 +106,7 @@ class _MainState extends State<MainView> with TickerProviderStateMixin {
String _searchFor = "6098518e3d5155e6ec429cdc"; String _searchFor = "6098518e3d5155e6ec429cdc";
Cards rightCard = Cards.tetraLeague; Cards rightCard = Cards.tetraLeague;
final TextEditingController _searchController = TextEditingController(); final TextEditingController _searchController = TextEditingController();
Duration postSeasonLeft = seasonStart.difference(DateTime.now());
@override @override
void initState() { void initState() {
@ -155,6 +156,11 @@ class _MainState extends State<MainView> with TickerProviderStateMixin {
selectedIcon: Icon(Icons.home), selectedIcon: Icon(Icons.home),
label: Text('First'), label: Text('First'),
), ),
NavigationRailDestination(
icon: Icon(Icons.data_thresholding_outlined),
selectedIcon: Icon(Icons.data_thresholding_outlined),
label: Text('First'),
),
NavigationRailDestination( NavigationRailDestination(
icon: Icon(Icons.leaderboard), icon: Icon(Icons.leaderboard),
selectedIcon: Icon(Icons.leaderboard), selectedIcon: Icon(Icons.leaderboard),
@ -261,18 +267,47 @@ class _MainState extends State<MainView> with TickerProviderStateMixin {
child: Column( child: Column(
//crossAxisAlignment: CrossAxisAlignment.center, //crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Card( SizedBox(
child: Row( height: constraints.maxHeight - 64,
mainAxisSize: MainAxisSize.min, child: SingleChildScrollView(
children: [ child: Column(
const Spacer(), //mainAxisSize: MainAxisSize.min,
Text(t.tetraLeague, style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 42)), children: [
const Spacer() Card(
], child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Spacer(),
Text(t.tetraLeague, style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 42)),
const Spacer()
],
),
),
Card(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(t.seasonStarts),
Center(child: Text(countdown(postSeasonLeft), textAlign: TextAlign.center, style: const TextStyle(fontSize: 32.0))),
],
),
),
TetraLeagueThingy(league: testPlayer.tlSeason1!),
Card(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Spacer(),
Text(t.nerdStats, style: const TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 42)),
const Spacer()
],
),
),
NerdStatsThingy(nerdStats: testPlayer.tlSeason1!.nerdStats!)
],
),
), ),
), ),
TetraLeagueThingy(league: testPlayer.tlSeason1!),
//const Card(),
SegmentedButton<CardMod>( SegmentedButton<CardMod>(
showSelectedIcon: false, showSelectedIcon: false,
selected: <CardMod>{CardMod.info}, selected: <CardMod>{CardMod.info},
@ -986,6 +1021,15 @@ class _SearchDrawerState extends State<SearchDrawer> {
}); });
}, },
), ),
),
SliverToBoxAdapter(
child: ListTile(
title: Text(prefs.getString("player") ?? "dan63"),
onTap: () {
widget.changePlayer("6098518e3d5155e6ec429cdc");
Navigator.of(context).pop();
},
),
) )
]; ];
}, },
@ -1021,30 +1065,34 @@ class TetraLeagueThingy extends StatelessWidget{
children: [ children: [
TLRatingThingy(userID: "w", tlData: league), TLRatingThingy(userID: "w", tlData: league),
TLProgress(tlData: league,), TLProgress(tlData: league,),
Wrap( Row(
spacing: 25.0, // spacing: 25.0,
alignment: WrapAlignment.spaceAround, // alignment: WrapAlignment.spaceAround,
crossAxisAlignment: WrapCrossAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Table( Expanded(
defaultColumnWidth:IntrinsicColumnWidth(), child: Center(
children: [ child: Table(
TableRow(children: [ defaultColumnWidth:IntrinsicColumnWidth(),
Text("APM: ", style: TextStyle(fontSize: 21)), children: [
Text(league.apm != null ? f2.format(league.apm) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
//Text(" APM", style: TextStyle(fontSize: 21)) Text("APM: ", style: TextStyle(fontSize: 21)),
]), Text(league.apm != null ? f2.format(league.apm) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
TableRow(children: [ //Text(" APM", style: TextStyle(fontSize: 21))
Text("PPS: ", style: TextStyle(fontSize: 21)), ]),
Text(league.apm != null ? f2.format(league.pps) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
//Text(" PPS", style: TextStyle(fontSize: 21)) Text("PPS: ", style: TextStyle(fontSize: 21)),
]), Text(league.apm != null ? f2.format(league.pps) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
TableRow(children: [ //Text(" PPS", style: TextStyle(fontSize: 21))
Text("VS: ", style: TextStyle(fontSize: 21)), ]),
Text(league.apm != null ? f2.format(league.vs) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
// Text(" VS", style: TextStyle(fontSize: 21)) Text("VS: ", style: TextStyle(fontSize: 21)),
]) Text(league.apm != null ? f2.format(league.vs) : "---", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
], // Text(" VS", style: TextStyle(fontSize: 21))
])
],
),
),
), ),
SizedBox( SizedBox(
height: 128.0, height: 128.0,
@ -1066,63 +1114,192 @@ class TetraLeagueThingy extends StatelessWidget{
], ],
annotations: [ annotations: [
GaugeAnnotation(widget: Container(child: GaugeAnnotation(widget: Container(child:
Text('${f2l.format(league.winrate*100)}%\nWR', textAlign: TextAlign.center, style: TextStyle(fontSize: 25,fontWeight: FontWeight.bold))), Text(percentage.format(league.winrate), textAlign: TextAlign.center, style: TextStyle(fontSize: 25,fontWeight: FontWeight.bold))),
angle: 90,positionFactor: 0.1 angle: 90,positionFactor: 0.1
), ),
// GaugeAnnotation(widget: Container(child: GaugeAnnotation(widget: Container(child:
// Text('50.03%\nWR', textAlign: TextAlign.center, style: TextStyle(fontFamily: "Eurostile Round Extended", fontSize: 22))), Text(t.statCellNum.winrate, textAlign: TextAlign.center)),
// angle: 90,positionFactor: 0.5 angle: 270,positionFactor: 0.4
// ) )
], ],
) )
] ]
), ),
), ),
Table( Expanded(
defaultColumnWidth:IntrinsicColumnWidth(), child: Center(
children: [ child: Table(
TableRow(children: [ defaultColumnWidth:IntrinsicColumnWidth(),
//Text("APM: ", style: TextStyle(fontSize: 21)), children: [
Text(intf.format(league.gamesPlayed), textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
Text(" GP", style: TextStyle(fontSize: 21)) //Text("APM: ", style: TextStyle(fontSize: 21)),
]), Text(intf.format(league.gamesPlayed), textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
TableRow(children: [ Text(" Games", style: TextStyle(fontSize: 21))
//Text("PPS: ", style: TextStyle(fontSize: 21)), ]),
Text(intf.format(league.gamesWon), textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
Text(" GW", style: TextStyle(fontSize: 21)) //Text("PPS: ", style: TextStyle(fontSize: 21)),
]), Text(intf.format(league.gamesWon), textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
TableRow(children: [ Text(" Won", style: TextStyle(fontSize: 21))
//Text("VS: ", style: TextStyle(fontSize: 21)), ]),
Text("№ ${intf.format(league.standingLocal)}", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)), TableRow(children: [
Text(" in BY", style: TextStyle(fontSize: 21)) //Text("VS: ", style: TextStyle(fontSize: 21)),
]) Text("№ ${intf.format(league.standingLocal)}", textAlign: TextAlign.right, style: TextStyle(fontSize: 21)),
], Text(" in BY", style: TextStyle(fontSize: 21))
])
],
),
),
), ),
// RichText(
// textAlign: TextAlign.right,
// text: TextSpan(
// style: const TextStyle(color: Colors.white, fontFamily: "Eurostile Round", fontSize: 12),
// children: [
// TextSpan(text: "${league.apm != null ? f2.format(league.apm) : "---"} APM"),
// const TextSpan(text: "\n"),
// TextSpan(text: "${league.pps != null ? f2.format(league.pps) : "---"} PPS"),
// const TextSpan(text: "\n"),
// TextSpan(text: "${league.vs != null ? f2.format(league.vs) : "---"} VS"),
// ]
// )
// ),
// StatCellNum(playerStat: league.apm??0.00, fractionDigits: 2, playerStatLabel: "APM", isScreenBig: true, higherIsBetter: true),
// StatCellNum(playerStat: league.pps??0.00, fractionDigits: 2, playerStatLabel: "PPS", isScreenBig: true, higherIsBetter: true),
// StatCellNum(playerStat: league.vs??0.00, fractionDigits: 2, playerStatLabel: "VS", isScreenBig: true, higherIsBetter: true),
], ],
) ),
], ],
), ),
); );
} }
} }
class NerdStatsThingy extends StatelessWidget{
final NerdStats nerdStats;
const NerdStatsThingy({super.key, required this.nerdStats});
@override
Widget build(BuildContext context) {
return Card(
child: Column(
children: [
Row(
children: [
SizedBox(
height: 256.0,
width: 256.0,
child: SfRadialGauge(
axes: [
RadialAxis(
startAngle: 120,
endAngle: 240,
minimum: 0.0,
maximum: 1.0,
//radiusFactor: 1.5,
showTicks: true,
showLabels: false,
interval: 0.1,
//labelsPosition: ElementsPosition.outside,
ranges:[
GaugeRange(startValue: 0, endValue: nerdStats.app, color: theme.colorScheme.primary)
],
annotations: [
GaugeAnnotation(widget: Container(child:
RichText(
textAlign: TextAlign.center,
text: TextSpan(
style: TextStyle(fontFamily: "Eurostile Round"),
children: [
TextSpan(text: "APP\n"),
TextSpan(text: f3.format(nerdStats.app), style: TextStyle(fontSize: 25,fontWeight: FontWeight.bold)),
//TextSpan(text: "\nAPP"),
]
))),
angle: 180,positionFactor: 0.5
),
],
),
RadialAxis(
startAngle: 300,
endAngle: 60,
isInversed: true,
minimum: 1.8,
maximum: 2.4,
//radiusFactor: 1.5,
showTicks: true,
showLabels: false,
interval: 0.1,
//labelsPosition: ElementsPosition.outside,
ranges:[
GaugeRange(startValue: 0, endValue: nerdStats.vsapm, color: theme.colorScheme.primary)
],
annotations: [
GaugeAnnotation(widget: Container(child:
RichText(
textAlign: TextAlign.center,
text: TextSpan(
style: TextStyle(fontFamily: "Eurostile Round"),
children: [
TextSpan(text: "VS/APM\n"),
TextSpan(text: f3.format(nerdStats.vsapm), style: TextStyle(fontSize: 25,fontWeight: FontWeight.bold)),
]
))),
angle: 0,positionFactor: 0.5
)
],
)
]
),
),
Wrap(
children: [
GaugetThingy(value: nerdStats.dss, min: 0, max: 1.0, label: t.statCellNum.dss, sideSize: 128.0, fractionDigits: 3),
GaugetThingy(value: nerdStats.dsp, min: 0, max: 1.0, label: t.statCellNum.dsp, sideSize: 128.0, fractionDigits: 3),
GaugetThingy(value: nerdStats.appdsp, min: 0, max: 1.2, label: t.statCellNum.appdsp, sideSize: 128.0, fractionDigits: 3)
],
)
]
),
],
)
);
}
}
class GaugetThingy extends StatelessWidget{
final double value;
final double min;
final double max;
final String label;
final double sideSize;
final int fractionDigits;
GaugetThingy({super.key, required this.value, required this.min, required this.max, required this.label, required this.sideSize, required this.fractionDigits});
@override
Widget build(BuildContext context) {
return SizedBox(
height: sideSize,
width: sideSize,
child: SfRadialGauge(
axes: [
RadialAxis(
// startAngle: 180,
// endAngle: 0,
minimum: min,
maximum: max,
//radiusFactor: 1.5,
showTicks: true,
showLabels: false,
interval: 0.1,
//labelsPosition: ElementsPosition.outside,
ranges:[
GaugeRange(startValue: 0, endValue: value, color: theme.colorScheme.primary)
],
annotations: [
GaugeAnnotation(widget: Container(child:
Text(f3.format(value), textAlign: TextAlign.center, style: TextStyle(fontSize: 25,fontWeight: FontWeight.bold))),
angle: 90,positionFactor: 0.25
),
GaugeAnnotation(widget: Container(child:
Text(label, textAlign: TextAlign.center, style: TextStyle(height: .9))),
angle: 270,positionFactor: 0.4
)
],
)
]
),
);
}
}
class _TLRecords extends StatelessWidget { class _TLRecords extends StatelessWidget {
final String userID; final String userID;
final Function changePlayer; final Function changePlayer;

2
res/i18n/strings.i18n.json
View File

@ -272,7 +272,7 @@
"lbpcShort": "№ in local LB", "lbpcShort": "№ in local LB",
"gamesPlayed": "Games\nplayed", "gamesPlayed": "Games\nplayed",
"gamesWonTL": "Games\nWon", "gamesWonTL": "Games\nWon",
"winrate": "Winrate\nprecentage", "winrate": "Winrate",
"level": "Level", "level": "Level",
"score": "Score", "score": "Score",
"spp": "Score\nPer Piece", "spp": "Score\nPer Piece",