Skip to content
This repository was archived by the owner on Aug 26, 2023. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/clima_ui/l10n.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
arb-dir: lib/l10n
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart
43 changes: 43 additions & 0 deletions packages/clima_ui/lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"aboutClima": "About Clima",

"information": "Information",

"changelog": "Changelog",

"donate": "Donate",

"donateTileSubtitle": "Support the development of Clima",

"libraries": "Libraries",
"librariesTileSubtitle": "Open-source libraries used in the app",

"feedback": "Feedback",
"feedbackTileSubtitle": "Bugs and feature requests",

"submitIssue": "Submit issue",

"contactDeveloper": "Contact developer",

"sourceCode": "Source code",
"sourceCodeTileSubtitle": "Clima is free software licensed under the MPL 2.0",

"settings": "Settings",

"interface": "Interface",

"theme": "Theme",
"light": "Light",
"dark": "Dark",

"darkTheme": "Dark theme",
"defaultTheme": "Default",
"black": "Black",

"about": "About",

"windSpeedLowercase": "wind speed",
"sunriseLowercase": "sunrise",
"sunsetLowercase": "sunset",
"humidityLowercase": "humdity"
}
3 changes: 3 additions & 0 deletions packages/clima_ui/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import 'package:clima_ui/themes/black_theme.dart';
import 'package:clima_ui/themes/dark_theme.dart';
import 'package:clima_ui/themes/light_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shared_preferences/shared_preferences.dart';
Expand Down Expand Up @@ -91,6 +92,8 @@ class _App extends HookConsumerWidget {
builder: (context, orientation, screenType) {
return MaterialApp(
locale: getLocale?.call(context),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
builder: (context, child) {
final ClimaThemeData climaTheme;

Expand Down
27 changes: 15 additions & 12 deletions packages/clima_ui/lib/screens/about_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@ import 'package:clima_ui/widgets/settings/settings_divider.dart';
import 'package:clima_ui/widgets/settings/settings_header.dart';
import 'package:clima_ui/widgets/settings/settings_tile.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:url_launcher/url_launcher.dart';

class AboutScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
final appLocalizations = AppLocalizations.of(context)!;

return Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: Text(
'About Clima',
appLocalizations.aboutClima,
style: TextStyle(
color: Theme.of(context).appBarTheme.titleTextStyle!.color,
fontSize: Theme.of(context).textTheme.headline6!.fontSize,
Expand All @@ -39,11 +42,11 @@ class AboutScreen extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
const SettingsHeader(
title: 'Information',
SettingsHeader(
title: appLocalizations.information,
),
SettingsTile(
title: 'Changelog',
title: appLocalizations.changelog,
subtitle: 'Version 2.0.1',
leading: Icon(
Icons.new_releases_outlined,
Expand All @@ -59,8 +62,8 @@ class AboutScreen extends StatelessWidget {
// Example: https://github.com/streetcomplete/StreetComplete/issues/3768
if (buildFlavor != BuildFlavor.googlePlay)
SettingsTile(
title: 'Donate',
subtitle: 'Support the development of Clima',
title: appLocalizations.donate,
subtitle: appLocalizations.donateTileSubtitle,
leading: Icon(
Icons.local_library_outlined,
color: Theme.of(context).iconTheme.color,
Expand All @@ -70,8 +73,8 @@ class AboutScreen extends StatelessWidget {
),
),
SettingsTile(
title: 'Libraries',
subtitle: 'Open-source libraries used in the app',
title: appLocalizations.libraries,
subtitle: appLocalizations.librariesTileSubtitle,
leading: Icon(
Icons.source_outlined,
color: Theme.of(context).iconTheme.color,
Expand All @@ -87,8 +90,8 @@ class AboutScreen extends StatelessWidget {
},
),
SettingsTile(
title: 'Feedback',
subtitle: 'Bugs and feature requests',
title: appLocalizations.feedback,
subtitle: appLocalizations.feedbackTileSubtitle,
leading: Icon(
Icons.help_outline,
color: Theme.of(context).iconTheme.color,
Expand All @@ -101,8 +104,8 @@ class AboutScreen extends StatelessWidget {
},
),
SettingsTile(
title: 'Source code',
subtitle: 'Clima is free software licensed under the MPL 2.0',
title: appLocalizations.sourceCode,
subtitle: appLocalizations.sourceCodeTileSubtitle,
isThreeLine: true,
leading: FaIcon(
FontAwesomeIcons.github,
Expand Down
26 changes: 14 additions & 12 deletions packages/clima_ui/lib/screens/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ import 'package:clima_ui/widgets/settings/settings_divider.dart';
import 'package:clima_ui/widgets/settings/settings_header.dart';
import 'package:clima_ui/widgets/settings/settings_tile.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

class SettingScreen extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final appLocalizations = AppLocalizations.of(context)!;
final theme =
ref.watch(themeStateNotifierProvider.select((state) => state.theme));
final darkTheme = ref.watch(
Expand All @@ -49,7 +51,7 @@ class SettingScreen extends ConsumerWidget {
},
),
title: Text(
'Settings',
appLocalizations.settings,
style: TextStyle(
color: Theme.of(context).appBarTheme.titleTextStyle!.color,
fontSize: Theme.of(context).textTheme.headline6!.fontSize,
Expand Down Expand Up @@ -84,18 +86,18 @@ class SettingScreen extends ConsumerWidget {
),
),
const SettingsDivider(),
const SettingsHeader(
title: 'Interface',
SettingsHeader(
title: appLocalizations.interface,
),
SettingsTile(
title: 'Theme',
title: appLocalizations.theme,
subtitle: () {
switch (theme) {
case ThemeModel.light:
return 'Light';
return appLocalizations.light;

case ThemeModel.dark:
return 'Dark';
return appLocalizations.dark;

case ThemeModel.systemDefault:
return 'System default';
Expand All @@ -111,14 +113,14 @@ class SettingScreen extends ConsumerWidget {
),
),
SettingsTile(
title: 'Dark theme',
title: appLocalizations.darkTheme,
subtitle: () {
switch (darkTheme) {
case DarkThemeModel.darkGrey:
return 'Default';
return appLocalizations.defaultTheme;

case DarkThemeModel.black:
return 'Black';
return appLocalizations.black;

default:
throw Error();
Expand Down Expand Up @@ -175,11 +177,11 @@ class SettingScreen extends ConsumerWidget {
},
),
const SettingsDivider(),
const SettingsHeader(
title: 'About',
SettingsHeader(
title: appLocalizations.about,
),
SettingsTile(
title: 'About Clima',
title: appLocalizations.aboutClima,
leading: Icon(
Icons.info_outline,
color: Theme.of(context).iconTheme.color,
Expand Down
6 changes: 5 additions & 1 deletion packages/clima_ui/lib/widgets/dialogs/dark_theme_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import 'package:clima_data/models/dark_theme_model.dart';
import 'package:clima_ui/state_notifiers/theme_state_notifier.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

class DarkThemeDialog extends ConsumerWidget {
static const _dialogOptions = {
Expand All @@ -22,6 +24,8 @@ class DarkThemeDialog extends ConsumerWidget {
themeStateNotifierProvider.select((state) => state.darkTheme),
);

final localizations = AppLocalizations.of(context)!;

final radios = [
for (final entry in _dialogOptions.entries)
RadioListTile<DarkThemeModel>(
Expand All @@ -42,7 +46,7 @@ class DarkThemeDialog extends ConsumerWidget {

return SimpleDialog(
title: Text(
'Dark theme',
localizations.darkTheme,
style: TextStyle(
color: Theme.of(context).textTheme.subtitle1!.color,
),
Expand Down
5 changes: 4 additions & 1 deletion packages/clima_ui/lib/widgets/dialogs/theme_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import 'package:clima_data/models/theme_model.dart';
import 'package:clima_ui/state_notifiers/theme_state_notifier.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

class ThemeDialog extends ConsumerWidget {
Expand All @@ -22,6 +23,8 @@ class ThemeDialog extends ConsumerWidget {
final theme =
ref.watch(themeStateNotifierProvider.select((state) => state.theme));

final localizations = AppLocalizations.of(context)!;

final radios = [
for (final entry in _dialogOptions.entries)
RadioListTile<ThemeModel>(
Expand All @@ -42,7 +45,7 @@ class ThemeDialog extends ConsumerWidget {

return SimpleDialog(
title: Text(
'Theme',
localizations.theme,
style: TextStyle(
color: Theme.of(context).textTheme.subtitle1!.color,
),
Expand Down
2 changes: 1 addition & 1 deletion packages/clima_ui/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ packages:
source: hosted
version: "0.18.4"
flutter_localizations:
dependency: transitive
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/clima_ui/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ dependencies:
flutter:
sdk: flutter

flutter_localizations:
sdk: flutter

clima_core:
path: ../clima_core
clima_domain:
Expand Down Expand Up @@ -46,3 +49,4 @@ flutter:
assets:
- assets/
uses-material-design: true
generate: true