Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • android/org.benoitharrault.scrobbles
1 result
Show changes
Commits on Source (2)
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.46 app.versionName=0.0.47
app.versionCode=46 app.versionCode=47
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"top_artists_title": "Top artists ({daysCount} days)", "top_artists_title": "Top artists ({daysCount} days)",
"settings_title": "Settings", "settings_title": "Settings",
"settings_title_global": "Global:",
"settings_label_username": "Username: ", "settings_label_username": "Username: ",
"settings_label_security_token": "Security token: ", "settings_label_security_token": "Security token: ",
"settings_title_days_count": "Days counts: ", "settings_title_days_count": "Days counts: ",
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"top_artists_title": "Top artistes ({daysCount} jours)", "top_artists_title": "Top artistes ({daysCount} jours)",
"settings_title": "Paramètres", "settings_title": "Paramètres",
"settings_title_global": "Généraux :",
"settings_label_username": "Utilisateur : ", "settings_label_username": "Utilisateur : ",
"settings_label_security_token": "Jeton de sécurité : ", "settings_label_security_token": "Jeton de sécurité : ",
"settings_title_days_count": "Nombre de jours : ", "settings_title_days_count": "Nombre de jours : ",
......
Add "username" parameter.
Ajout du paramètre "nom d'utilisateur".
...@@ -9,17 +9,17 @@ class ScreenSettings extends StatelessWidget { ...@@ -9,17 +9,17 @@ class ScreenSettings extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Material(
mainAxisAlignment: MainAxisAlignment.start, color: Theme.of(context).colorScheme.background,
crossAxisAlignment: CrossAxisAlignment.start, child: ListView(
mainAxisSize: MainAxisSize.max, padding: const EdgeInsets.symmetric(horizontal: 4),
children: <Widget>[ physics: const BouncingScrollPhysics(),
SizedBox(height: 8), children: <Widget>[
AppTitle1(text: tr('settings_title')), SizedBox(height: 8),
SizedBox(height: 8), AppTitle1(text: tr('settings_title')),
AppTitle2(text: tr('settings_title_days_count')), SettingsForm(),
SettingsForm(), ],
], ),
); );
} }
} }
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:unicons/unicons.dart';
import 'package:scrobbles/config/default_settings.dart'; import 'package:scrobbles/config/default_settings.dart';
import 'package:scrobbles/cubit/settings_cubit.dart'; import 'package:scrobbles/cubit/settings_cubit.dart';
import 'package:scrobbles/ui/widgets/app_titles.dart';
class SettingsForm extends StatefulWidget { class SettingsForm extends StatefulWidget {
const SettingsForm({super.key}); const SettingsForm({super.key});
...@@ -81,25 +83,31 @@ class _SettingsFormState extends State<SettingsForm> { ...@@ -81,25 +83,31 @@ class _SettingsFormState extends State<SettingsForm> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
SizedBox(height: 8),
AppTitle2(text: tr('settings_title_global')),
// Username // Username
// Text('settings_label_username').tr(), Text('settings_label_username').tr(),
// TextFormField( TextFormField(
// controller: usernameController, controller: usernameController,
// decoration: InputDecoration( decoration: InputDecoration(
// border: UnderlineInputBorder(), border: UnderlineInputBorder(),
// ), suffixIcon: ElevatedButton(
// ), style: ElevatedButton.styleFrom(
// SizedBox(height: 16), shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(6.0),
// Security token ),
// Text('settings_label_security_token').tr(), ),
// TextFormField( child: Icon(UniconsLine.save),
// controller: securityTokenController, onPressed: () {
// decoration: InputDecoration( saveSettings();
// border: UnderlineInputBorder(), },
// ), ),
// ), ),
// SizedBox(height: 20), ),
SizedBox(height: 8),
AppTitle2(text: tr('settings_title_days_count')),
// Statistics (recent) // Statistics (recent)
Row( Row(
......
...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts ...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none' publish_to: 'none'
version: 0.0.46+46 version: 0.0.47+47
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......