meh...
This commit is contained in:
parent
5f404d3508
commit
500639df05
|
|
@ -16,7 +16,7 @@ import 'package:sqflite_common_ffi/sqflite_ffi.dart';
|
|||
import 'package:sqflite_common_ffi_web/sqflite_ffi_web.dart';
|
||||
import 'package:tetra_stats/gen/strings.g.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
import 'package:tetra_stats/views/main_view.dart';
|
||||
import 'package:tetra_stats/views/main_view_tiles.dart';
|
||||
import 'package:tetra_stats/views/settings_view.dart';
|
||||
import 'package:tetra_stats/views/tracked_players_view.dart';
|
||||
import 'package:tetra_stats/views/calc_view.dart';
|
||||
|
|
|
|||
|
|
@ -233,8 +233,13 @@ class DestinationGraphs extends StatefulWidget{
|
|||
State<DestinationGraphs> createState() => _DestinationGraphsState();
|
||||
}
|
||||
|
||||
enum Graph{
|
||||
history,
|
||||
leagueState,
|
||||
leagueCutoffs
|
||||
}
|
||||
|
||||
class _DestinationGraphsState extends State<DestinationGraphs> {
|
||||
Cards rightCard = Cards.tetraLeague;
|
||||
bool fetchData = false;
|
||||
bool _gamesPlayedInsteadOfDateAndTime = false;
|
||||
late ZoomPanBehavior _zoomPanBehavior;
|
||||
|
|
@ -242,7 +247,9 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
String yAxisTitle = "";
|
||||
bool _smooth = false;
|
||||
final List _historyShortTitles = ["TR", "Glicko", "RD", "APM", "PPS", "VS", "APP", "DS/S", "DS/P", "APP + DS/P", "VS/APM", "Cheese", "GbE", "wAPP", "Area", "eTR", "±eTR", "Opener", "Plonk", "Inf. DS", "Stride"];
|
||||
Graph _graph = Graph.history;
|
||||
int _chartsIndex = 0;
|
||||
int _season = currentSeason-1;
|
||||
late List<List<DropdownMenuItem<List<_HistoryChartSpot>>>> historyData;
|
||||
//Duration postSeasonLeft = seasonStart.difference(DateTime.now());
|
||||
|
||||
|
|
@ -337,7 +344,10 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return FutureBuilder<List<List<DropdownMenuItem<List<_HistoryChartSpot>>>>>(
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
FutureBuilder<List<List<DropdownMenuItem<List<_HistoryChartSpot>>>>>(
|
||||
future: getHistoryData(fetchData),
|
||||
builder: (context, snapshot) {
|
||||
switch (snapshot.connectionState){
|
||||
|
|
@ -347,7 +357,7 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
return const Center(child: CircularProgressIndicator());
|
||||
case ConnectionState.done:
|
||||
if (snapshot.hasData && snapshot.data!.isNotEmpty){
|
||||
List<_HistoryChartSpot> selectedGraph = snapshot.data![currentSeason-1][_chartsIndex].value!;
|
||||
List<_HistoryChartSpot> selectedGraph = snapshot.data![_season][_chartsIndex].value!;
|
||||
yAxisTitle = _historyShortTitles[_chartsIndex];
|
||||
return SingleChildScrollView(
|
||||
scrollDirection: Axis.vertical,
|
||||
|
|
@ -359,6 +369,21 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
spacing: 20,
|
||||
crossAxisAlignment: WrapCrossAlignment.center,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Padding(padding: EdgeInsets.all(8.0), child: Text("Season:", style: TextStyle(fontSize: 22))),
|
||||
DropdownButton(
|
||||
items: [for (int i = 1; i <= currentSeason; i++) DropdownMenuItem(value: i-1, child: Text("$i"))],
|
||||
value: _season,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
_season = value!;
|
||||
});
|
||||
}
|
||||
),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
|
|
@ -379,11 +404,11 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
children: [
|
||||
const Padding(padding: EdgeInsets.all(8.0), child: Text("Y:", style: TextStyle(fontSize: 22))),
|
||||
DropdownButton(
|
||||
items: historyData[currentSeason-1],
|
||||
value: historyData[currentSeason-1][_chartsIndex].value,
|
||||
items: historyData[_season],
|
||||
value: historyData[_season][_chartsIndex].value,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
_chartsIndex = historyData[currentSeason-1].indexWhere((element) => element.value == value);
|
||||
_chartsIndex = historyData[_season].indexWhere((element) => element.value == value);
|
||||
});
|
||||
}
|
||||
),
|
||||
|
|
@ -406,10 +431,10 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
],
|
||||
),
|
||||
),
|
||||
if(historyData[currentSeason-1][_chartsIndex].value!.length > 1) Card(
|
||||
if(historyData[_season][_chartsIndex].value!.length > 1) Card(
|
||||
child: SizedBox(
|
||||
width: MediaQuery.of(context).size.width - 88,
|
||||
height: MediaQuery.of(context).size.height - 60,
|
||||
height: MediaQuery.of(context).size.height - 96,
|
||||
child: Padding( padding: const EdgeInsets.fromLTRB(40, 30, 40, 30),
|
||||
child: SfCartesianChart(
|
||||
tooltipBehavior: _tooltipBehavior,
|
||||
|
|
@ -422,7 +447,7 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
series: <CartesianSeries>[
|
||||
if (_gamesPlayedInsteadOfDateAndTime) StepLineSeries<_HistoryChartSpot, int>(
|
||||
enableTooltip: true,
|
||||
dataSource: historyData[currentSeason-1][_chartsIndex].value!,
|
||||
dataSource: historyData[_season][_chartsIndex].value!,
|
||||
animationDuration: 0,
|
||||
opacity: _smooth ? 0 : 1,
|
||||
xValueMapper: (_HistoryChartSpot data, _) => data.gamesPlayed,
|
||||
|
|
@ -431,14 +456,14 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
trendlines:<Trendline>[
|
||||
Trendline(
|
||||
isVisible: _smooth,
|
||||
period: (historyData[currentSeason-1][_chartsIndex].value!.length/175).floor(),
|
||||
period: (historyData[_season][_chartsIndex].value!.length/175).floor(),
|
||||
type: TrendlineType.movingAverage,
|
||||
color: Theme.of(context).colorScheme.primary)
|
||||
],
|
||||
)
|
||||
else StepLineSeries<_HistoryChartSpot, DateTime>(
|
||||
enableTooltip: true,
|
||||
dataSource: historyData[currentSeason-1][_chartsIndex].value!,
|
||||
dataSource: historyData[_season][_chartsIndex].value!,
|
||||
animationDuration: 0,
|
||||
opacity: _smooth ? 0 : 1,
|
||||
xValueMapper: (_HistoryChartSpot data, _) => data.timestamp,
|
||||
|
|
@ -447,7 +472,7 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
trendlines:<Trendline>[
|
||||
Trendline(
|
||||
isVisible: _smooth,
|
||||
period: (historyData[currentSeason-1][_chartsIndex].value!.length/175).floor(),
|
||||
period: (historyData[_season][_chartsIndex].value!.length/175).floor(),
|
||||
type: TrendlineType.movingAverage,
|
||||
color: Theme.of(context).colorScheme.primary)
|
||||
],
|
||||
|
|
@ -457,7 +482,7 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
)
|
||||
),
|
||||
)
|
||||
else if (historyData[currentSeason-1][_chartsIndex].value!.length <= 1) Center(child: Column(
|
||||
else if (historyData[_season][_chartsIndex].value!.length <= 1) Center(child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(t.notEnoughData, style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 28)),
|
||||
|
|
@ -494,6 +519,27 @@ class _DestinationGraphsState extends State<DestinationGraphs> {
|
|||
],
|
||||
));
|
||||
},
|
||||
),
|
||||
SegmentedButton<Graph>(
|
||||
showSelectedIcon: false,
|
||||
segments: <ButtonSegment<Graph>>[
|
||||
const ButtonSegment<Graph>(
|
||||
value: Graph.history,
|
||||
label: Text('Player History')),
|
||||
ButtonSegment<Graph>(
|
||||
value: Graph.leagueState,
|
||||
label: Text('League State')),
|
||||
ButtonSegment<Graph>(
|
||||
value: Graph.leagueCutoffs,
|
||||
label: Text('League Cutoffs'),
|
||||
),
|
||||
],
|
||||
selected: <Graph>{_graph},
|
||||
onSelectionChanged: (Set<Graph> newSelection) {
|
||||
setState(() {
|
||||
_graph = newSelection.first;
|
||||
});})
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -2432,7 +2478,7 @@ class TetraLeagueThingy extends StatelessWidget{
|
|||
//surfaceTintColor: rankColors[league.rank],
|
||||
child: Column(
|
||||
children: [
|
||||
TLRatingThingy(userID: "w", tlData: league),
|
||||
TLRatingThingy(userID: "w", tlData: league, oldTl: toCompare, showPositions: true),
|
||||
TLProgress(
|
||||
tlData: league,
|
||||
previousRankTRcutoff: cutoffs != null ? cutoffs!.tr[league.rank != "z" ? league.rank : league.percentileRank] : null,
|
||||
|
|
@ -2514,12 +2560,6 @@ class TetraLeagueThingy extends StatelessWidget{
|
|||
child: Table(
|
||||
defaultColumnWidth:const IntrinsicColumnWidth(),
|
||||
children: [
|
||||
TableRow(children: [
|
||||
//Text("VS: ", style: TextStyle(fontSize: 21)),
|
||||
Text("№ ${league.standingLocal.isNegative ? "---" : intf.format(league.standingLocal)}", textAlign: TextAlign.right, style: TextStyle(fontSize: 21, color: league.standingLocal.isNegative ? Colors.grey : Colors.white)),
|
||||
Text(" local", style: TextStyle(fontSize: 21, color: league.standingLocal.isNegative ? Colors.grey : Colors.white)),
|
||||
if (toCompare != null) Text(" (${compareIntf.format(league.standingLocal-toCompare!.standingLocal)})", textAlign: TextAlign.right, style: TextStyle(fontSize: 21, color: getDifferenceColor(league.standingLocal-toCompare!.standingLocal)))
|
||||
]),
|
||||
TableRow(children: [
|
||||
//Text("APM: ", style: TextStyle(fontSize: 21)),
|
||||
Text(intf.format(league.gamesPlayed), textAlign: TextAlign.right, style: const TextStyle(fontSize: 21)),
|
||||
|
|
@ -2531,7 +2571,13 @@ class TetraLeagueThingy extends StatelessWidget{
|
|||
Text(intf.format(league.gamesWon), textAlign: TextAlign.right, style: const TextStyle(fontSize: 21)),
|
||||
const Text(" Won", style: TextStyle(fontSize: 21)),
|
||||
if (toCompare != null) Text(" (${comparef2.format(league.gamesWon-toCompare!.gamesWon)})", textAlign: TextAlign.right, style: TextStyle(fontSize: 21, color: Colors.grey))
|
||||
])
|
||||
]),
|
||||
TableRow(children: [
|
||||
//Text("VS: ", style: TextStyle(fontSize: 21)),
|
||||
Tooltip(child: Text("${league.gxe.isNegative ? "---" : f3.format(league.gxe)}", textAlign: TextAlign.right, style: TextStyle(fontSize: 21, color: league.standingLocal.isNegative ? Colors.grey : Colors.white)), message: "${f2.format(league.s1tr)}",),
|
||||
Text(" GLIXARE", style: TextStyle(fontSize: 21, color: league.standingLocal.isNegative ? Colors.grey : Colors.white)),
|
||||
if (toCompare != null) Text(" (${comparef.format(league.gxe-toCompare!.gxe)})", textAlign: TextAlign.right, style: TextStyle(fontSize: 21, color: getDifferenceColor(league.standingLocal-toCompare!.standingLocal)))
|
||||
]),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
|
@ -2952,7 +2998,7 @@ class TLRatingThingy extends StatelessWidget{
|
|||
children: [
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 20, color: Colors.white),
|
||||
style: const TextStyle(fontFamily: "Eurostile Round", fontSize: 20, color: Colors.white, height: 0.9),
|
||||
children: (tlData.gamesPlayed > 9) ? switch(prefs.getInt("ratingMode")){
|
||||
1 => [
|
||||
TextSpan(text: formatedGlicko[0], style: TextStyle(fontFamily: "Eurostile Round Extended", fontSize: bigScreen ? 42 : 28)),
|
||||
|
|
@ -2972,17 +3018,43 @@ class TLRatingThingy extends StatelessWidget{
|
|||
} : [TextSpan(text: "---\n", style: TextStyle(fontFamily: "Eurostile Round Extended", fontSize: bigScreen ? 42 : 28, color: Colors.grey)), TextSpan(text: t.gamesUntilRanked(left: 10-tlData.gamesPlayed), style: const TextStyle(color: Colors.grey, fontSize: 14)),]
|
||||
)
|
||||
),
|
||||
if (oldTl != null) Text(
|
||||
switch(prefs.getInt("ratingMode")){
|
||||
if (oldTl != null) RichText(
|
||||
textAlign: TextAlign.center,
|
||||
softWrap: true,
|
||||
text: TextSpan(
|
||||
style: DefaultTextStyle.of(context).style,
|
||||
children: [
|
||||
TextSpan(text: switch(prefs.getInt("ratingMode")){
|
||||
1 => "${fDiff.format(tlData.glicko! - oldTl!.glicko!)} Glicko",
|
||||
2 => "${fDiff.format(tlData.percentile * 100 - oldTl!.percentile * 100)} %",
|
||||
_ => "${fDiff.format(tlData.tr - oldTl!.tr)} TR"
|
||||
},
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
color: tlData.tr - oldTl!.tr < 0 ?
|
||||
Colors.red :
|
||||
Colors.green
|
||||
color: getDifferenceColor(switch(prefs.getInt("ratingMode")){
|
||||
1 => tlData.glicko! - oldTl!.glicko!,
|
||||
2 => tlData.percentile - oldTl!.percentile,
|
||||
_ => tlData.tr - oldTl!.tr
|
||||
})
|
||||
),
|
||||
),
|
||||
const TextSpan(text: " • ", style: TextStyle(color: Colors.grey)),
|
||||
TextSpan(text: switch(prefs.getInt("ratingMode")){
|
||||
1 => "${fDiff.format(tlData.tr - oldTl!.tr)} TR",
|
||||
_ => "${fDiff.format(tlData.glicko! - oldTl!.glicko!)} Glicko"
|
||||
},
|
||||
style: TextStyle(
|
||||
color: getDifferenceColor(switch(prefs.getInt("ratingMode")){
|
||||
1 => tlData.tr - oldTl!.tr,
|
||||
_ => tlData.glicko! - oldTl!.glicko!
|
||||
})
|
||||
),
|
||||
),
|
||||
const TextSpan(text: " • ", style: TextStyle(color: Colors.grey)),
|
||||
TextSpan(
|
||||
text: "${fDiff.format(tlData.rd! - oldTl!.rd!)} RD",
|
||||
style: TextStyle(color: getDifferenceColor(oldTl!.rd! - tlData.rd!))
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
if (tlData.gamesPlayed > 9) Column(
|
||||
|
|
|
|||
|
|
@ -74,12 +74,12 @@ class TLProgress extends StatelessWidget{
|
|||
ranges: [
|
||||
if (previousRankTRcutoff != null && nextRankTRcutoff != null) LinearGaugeRange(endValue: getBarTR(tlData.tr)!, color: Theme.of(context).colorScheme.primary, position: LinearElementPosition.cross)
|
||||
else if (tlData.standing != -1) LinearGaugeRange(endValue: getBarPosition(), color: Theme.of(context).colorScheme.primary, position: LinearElementPosition.cross),
|
||||
if (previousRankTRcutoff != null && previousRankTRcutoffTarget != null) LinearGaugeRange(endValue: getBarTR(previousRankTRcutoffTarget!)!, color: Colors.greenAccent, position: LinearElementPosition.inside),
|
||||
if (nextRankTRcutoff != null && nextRankTRcutoffTarget != null && previousRankTRcutoff != null) LinearGaugeRange(startValue: getBarTR(nextRankTRcutoffTarget!)!, endValue: 1, color: Colors.yellowAccent, position: LinearElementPosition.inside)
|
||||
if (previousRankTRcutoff != null && previousRankTRcutoffTarget != null) LinearGaugeRange(endValue: getBarTR(previousRankTRcutoffTarget!)!, color: Colors.greenAccent.withAlpha(175), position: LinearElementPosition.inside),
|
||||
if (nextRankTRcutoff != null && nextRankTRcutoffTarget != null && previousRankTRcutoff != null) LinearGaugeRange(startValue: getBarTR(nextRankTRcutoffTarget!)!, endValue: 1, color: Colors.yellowAccent.withAlpha(175), position: LinearElementPosition.inside)
|
||||
],
|
||||
markerPointers: [
|
||||
LinearShapePointer(value: (previousRankTRcutoff != null && nextRankTRcutoff != null) ? getBarTR(tlData.tr)! : getBarPosition(), position: LinearElementPosition.cross, shapeType: LinearShapePointerType.diamond, color: Colors.white, height: 20),
|
||||
if (tlData.standing != -1) LinearWidgetPointer(offset: 4, position: LinearElementPosition.outside, value: (previousRankTRcutoff != null && nextRankTRcutoff != null) ? getBarTR(tlData.tr)! : getBarPosition(), child: Text("№ ${NumberFormat.decimalPatternDigits(locale: LocaleSettings.currentLocale.languageCode, decimalDigits: 0).format(tlData.standing)}", style: const TextStyle(fontSize: 14),))
|
||||
//if (tlData.standing != -1) LinearWidgetPointer(offset: 4, position: LinearElementPosition.outside, value: (previousRankTRcutoff != null && nextRankTRcutoff != null) ? getBarTR(tlData.tr)! : getBarPosition(), child: Text("№ ${NumberFormat.decimalPatternDigits(locale: LocaleSettings.currentLocale.languageCode, decimalDigits: 0).format(tlData.standing)}", style: const TextStyle(fontSize: 14),))
|
||||
],
|
||||
isMirrored: true,
|
||||
showTicks: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue