Skip to content
Snippets Groups Projects
Commit 06962138 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Improve settings page

parent adbbe332
No related branches found
No related tags found
1 merge request!46Resolve "Improve settings page"
Pipeline #4714 passed
Stage: update
Stage: build-debug
Show whitespace changes
Inline Side-by-side
Showing
with 103 additions and 70 deletions
android/gradle.properties
+ 2
− 2
View file @ 06962138
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=0.0.45
app.versionCode=45
app.versionName=0.0.46
app.versionCode=46
assets/translations/en.json
+ 4
− 3
View file @ 06962138
......@@ -28,10 +28,11 @@
"settings_title": "Settings",
"settings_label_username": "Username: ",
"settings_label_security_token": "Security token: ",
"settings_title_days_count": "Days counts: ",
"settings_label_discoveries_days_count": "Discoveries: ",
"settings_label_distribution_days_count": "Distributions : ",
"settings_label_statistics_recent_days_count": "Recent statistics: ",
"settings_label_timeline_days_count": "Timeline: ",
"settings_label_distribution_days_count": "Distributions (by day/hour) : ",
"settings_label_statistics_recent_days_count": "Statistics: ",
"settings_label_timeline_days_count": "Global timeline: ",
"settings_label_top_artists_days_count": "Top Artists: ",
"settings_button_save": "Save",
......
assets/translations/fr.json
+ 4
− 3
View file @ 06962138
......@@ -28,10 +28,11 @@
"settings_title": "Paramètres",
"settings_label_username": "Utilisateur : ",
"settings_label_security_token": "Jeton de sécurité : ",
"settings_title_days_count": "Nombre de jours : ",
"settings_label_discoveries_days_count": "Découvertes : ",
"settings_label_distribution_days_count": "Répartitions : ",
"settings_label_statistics_recent_days_count": "Statistiques récentes : ",
"settings_label_timeline_days_count": "Timeline : ",
"settings_label_distribution_days_count": "Répartitions (par jour/heure) : ",
"settings_label_statistics_recent_days_count": "Statistiques : ",
"settings_label_timeline_days_count": "Timeline globale : ",
"settings_label_top_artists_days_count": "Top Artistes : ",
"settings_button_save": "Enregistrer",
......
fastlane/metadata/android/en-US/changelogs/46.txt 0 → 100644
+ 1
− 0
View file @ 06962138
Improve settings page.
fastlane/metadata/android/fr-FR/changelogs/46.txt 0 → 100644
+ 1
− 0
View file @ 06962138
Améliorations sur la page des paramètres.
lib/ui/screens/settings.dart
+ 4
− 2
View file @ 06962138
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:scrobbles/ui/widgets/header_app.dart';
import 'package:scrobbles/ui/widgets/app_titles.dart';
import 'package:scrobbles/ui/widgets/settings_form.dart';
class ScreenSettings extends StatelessWidget {
......@@ -14,8 +15,9 @@ class ScreenSettings extends StatelessWidget {
mainAxisSize: MainAxisSize.max,
children: <Widget>[
SizedBox(height: 8),
AppHeader(text: 'settings_title'),
AppTitle1(text: tr('settings_title')),
SizedBox(height: 8),
AppTitle2(text: tr('settings_title_days_count')),
SettingsForm(),
],
);
......
lib/ui/widgets/app_bar.dart
+ 2
− 2
View file @ 06962138
import 'package:flutter/material.dart';
import 'package:unicons/unicons.dart';
import 'package:scrobbles/ui/widgets/header_app.dart';
import 'package:scrobbles/ui/widgets/app_titles.dart';
class StandardAppBar extends StatelessWidget implements PreferredSizeWidget {
final Function() notifyParent;
......@@ -11,7 +11,7 @@ class StandardAppBar extends StatelessWidget implements PreferredSizeWidget {
@override
Widget build(BuildContext context) {
return AppBar(
title: const AppHeader(text: 'app_name'),
title: const AppTitle(text: 'app_name'),
actions: [
IconButton(
onPressed: () {
......
lib/ui/widgets/app_titles.dart 0 → 100644
+ 47
− 0
View file @ 06962138
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
class AppTitle extends StatelessWidget {
const AppTitle({super.key, required this.text});
final String text;
@override
Widget build(BuildContext context) {
return Text(
tr(text),
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.headlineLarge!.apply(fontWeightDelta: 2),
);
}
}
class AppTitle1 extends StatelessWidget {
const AppTitle1({super.key, required this.text});
final String text;
@override
Widget build(BuildContext context) {
return Text(
text,
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.titleLarge!.apply(fontWeightDelta: 2),
);
}
}
class AppTitle2 extends StatelessWidget {
const AppTitle2({super.key, required this.text});
final String text;
@override
Widget build(BuildContext context) {
return Text(
text,
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.titleMedium!.apply(fontWeightDelta: 2),
);
}
}
lib/ui/widgets/card_content.dart
+ 2
− 5
View file @ 06962138
import 'package:flutter/material.dart';
import 'package:scrobbles/ui/widgets/app_titles.dart';
class CardContent extends StatelessWidget {
const CardContent({
......@@ -35,11 +36,7 @@ class CardContent extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
this.title,
style:
Theme.of(context).primaryTextTheme.titleLarge!.apply(fontWeightDelta: 2),
),
AppTitle1(text: this.title),
this.loader,
],
),
......
lib/ui/widgets/header_app.dart deleted 100644 → 0
+ 0
− 17
View file @ adbbe332
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
class AppHeader extends StatelessWidget {
const AppHeader({super.key, required this.text});
final String text;
@override
Widget build(BuildContext context) {
return Text(
tr(text),
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.headlineMedium!.apply(fontWeightDelta: 2),
);
}
}
lib/ui/widgets/settings_form.dart
+ 35
− 35
View file @ 06962138
......@@ -101,121 +101,121 @@ class _SettingsFormState extends State<SettingsForm> {
// ),
// SizedBox(height: 20),
// Discoveries
// Statistics (recent)
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('settings_label_discoveries_days_count').tr(),
Text('settings_label_statistics_recent_days_count').tr(),
ToggleButtons(
onPressed: (int index) {
setState(() {
discoveriesDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedDiscoveriesDaysCount.length; i++) {
_selectedDiscoveriesDaysCount[i] = i == index;
statisticsRecentDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedStatisticsRecentDaysCount.length; i++) {
_selectedStatisticsRecentDaysCount[i] = i == index;
}
});
saveSettings();
},
borderRadius: const BorderRadius.all(Radius.circular(8)),
constraints: const BoxConstraints(minHeight: 30.0, minWidth: 30.0),
isSelected: _selectedDiscoveriesDaysCount,
isSelected: _selectedStatisticsRecentDaysCount,
children: DefaultSettings.allowedValues.map((e) => Text(e.toString())).toList(),
),
],
),
// Distribution by day/hour + heatmap
// Timeline
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('settings_label_distribution_days_count').tr(),
Text('settings_label_timeline_days_count').tr(),
ToggleButtons(
onPressed: (int index) {
setState(() {
distributionDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedDistributionDaysCount.length; i++) {
_selectedDistributionDaysCount[i] = i == index;
timelineDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedTimelineDaysCount.length; i++) {
_selectedTimelineDaysCount[i] = i == index;
}
});
saveSettings();
},
borderRadius: const BorderRadius.all(Radius.circular(8)),
constraints: const BoxConstraints(minHeight: 30.0, minWidth: 30.0),
isSelected: _selectedDistributionDaysCount,
isSelected: _selectedTimelineDaysCount,
children: DefaultSettings.allowedValues.map((e) => Text(e.toString())).toList(),
),
],
),
// Statistics (recent)
// Top Artists
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('settings_label_statistics_recent_days_count').tr(),
Text('settings_label_top_artists_days_count').tr(),
ToggleButtons(
onPressed: (int index) {
setState(() {
statisticsRecentDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedStatisticsRecentDaysCount.length; i++) {
_selectedStatisticsRecentDaysCount[i] = i == index;
topArtistsDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedTopArtistsDaysCount.length; i++) {
_selectedTopArtistsDaysCount[i] = i == index;
}
});
saveSettings();
},
borderRadius: const BorderRadius.all(Radius.circular(8)),
constraints: const BoxConstraints(minHeight: 30.0, minWidth: 30.0),
isSelected: _selectedStatisticsRecentDaysCount,
isSelected: _selectedTopArtistsDaysCount,
children: DefaultSettings.allowedValues.map((e) => Text(e.toString())).toList(),
),
],
),
// Timeline
// Discoveries
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('settings_label_timeline_days_count').tr(),
Text('settings_label_discoveries_days_count').tr(),
ToggleButtons(
onPressed: (int index) {
setState(() {
timelineDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedTimelineDaysCount.length; i++) {
_selectedTimelineDaysCount[i] = i == index;
discoveriesDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedDiscoveriesDaysCount.length; i++) {
_selectedDiscoveriesDaysCount[i] = i == index;
}
});
saveSettings();
},
borderRadius: const BorderRadius.all(Radius.circular(8)),
constraints: const BoxConstraints(minHeight: 30.0, minWidth: 30.0),
isSelected: _selectedTimelineDaysCount,
isSelected: _selectedDiscoveriesDaysCount,
children: DefaultSettings.allowedValues.map((e) => Text(e.toString())).toList(),
),
],
),
// Top Artists
// Distribution by day/hour + heatmap
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('settings_label_top_artists_days_count').tr(),
Text('settings_label_distribution_days_count').tr(),
ToggleButtons(
onPressed: (int index) {
setState(() {
topArtistsDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedTopArtistsDaysCount.length; i++) {
_selectedTopArtistsDaysCount[i] = i == index;
distributionDaysCount = DefaultSettings.allowedValues[index];
for (int i = 0; i < _selectedDistributionDaysCount.length; i++) {
_selectedDistributionDaysCount[i] = i == index;
}
});
saveSettings();
},
borderRadius: const BorderRadius.all(Radius.circular(8)),
constraints: const BoxConstraints(minHeight: 30.0, minWidth: 30.0),
isSelected: _selectedTopArtistsDaysCount,
isSelected: _selectedDistributionDaysCount,
children: DefaultSettings.allowedValues.map((e) => Text(e.toString())).toList(),
),
],
......
pubspec.yaml
+ 1
− 1
View file @ 06962138
......@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
version: 0.0.45+45
version: 0.0.46+46
environment:
sdk: '^3.0.0'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment