issue #158

darkmoonight · Jan 28, 2024 · d0464a5 · d0464a5
1 parent 42ad98d
commit d0464a5
Show file tree

Hide file tree

Showing 27 changed files with 135 additions and 32 deletions.
diff --git a/lib/app/api/weather.freezed.dart b/lib/app/api/weather.freezed.dart
@@ -162,7 +162,7 @@ class _$WeatherDataApiImpl implements _WeatherDataApi {
  }
 
  @override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
  return identical(this, other) ||
  (other.runtimeType == runtimeType &&
  other is _$WeatherDataApiImpl &&
@@ -781,7 +781,7 @@ class _$HourlyImpl implements _Hourly {
  }
 
  @override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
  return identical(this, other) ||
  (other.runtimeType == runtimeType &&
  other is _$HourlyImpl &&
@@ -1445,7 +1445,7 @@ class _$DailyImpl implements _Daily {
  }
 
  @override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
  return identical(this, other) ||
  (other.runtimeType == runtimeType &&
  other is _$DailyImpl &&

diff --git a/lib/app/data/weather.dart b/lib/app/data/weather.dart
@@ -11,6 +11,7 @@ class Settings {
  bool notifications = false;
  bool materialColor = false;
  bool amoledTheme = false;
+ bool roundDegree = false;
  String? widgetBackgroundColor;
  String? widgetTextColor;
  String measurements = 'metric';

diff --git a/lib/app/data/weather.g.dart b/lib/app/data/weather.g.dart
diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart
@@ -444,6 +444,21 @@ class _SettingsPageState extends State<SettingsPage> {
  ),
  ),
  ),
+ SettingCard(
+ elevation: 4,
+ icon: const Icon(Iconsax.cloud_notif),
+ text: 'roundDegree'.tr,
+ switcher: true,
+ value: settings.roundDegree,
+ onChange: (value) {
+ settings.roundDegree = value;
+ isar.writeTxnSync(
+ () => isar.settings.putSync(settings));
+ MyApp.updateAppState(context,
+ newRoundDegree: value);
+ setState(() {});
+ },
+ ),
  SettingCard(
  elevation: 4,
  icon: const Icon(Iconsax.sun_1),

diff --git a/lib/app/widgets/now/weather_now.dart b/lib/app/widgets/now/weather_now.dart
@@ -40,7 +40,7 @@ class _WeatherNowState extends State<WeatherNow> {
  height: 200,
  ),
  GlowText(
- '${widget.degree}',
+ '${roundDegree ? widget.degree.round() : widget.degree}',
  style: context.textTheme.displayLarge?.copyWith(
  fontSize: 90,
  fontWeight: FontWeight.w800,

diff --git a/lib/main.dart b/lib/main.dart
@@ -33,6 +33,7 @@ FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
 
 bool amoledTheme = false;
 bool materialColor = false;
+bool roundDegree = false;
 Locale locale = const Locale('en', 'US');
 int timeRange = 1;
 String timeStart = '09:00';
@@ -149,6 +150,7 @@ class MyApp extends StatefulWidget {
  BuildContext context, {
  bool? newAmoledTheme,
  bool? newMaterialColor,
+ bool? newRoundDegree,
  Locale? newLocale,
  int? newTimeRange,
  String? newTimeStart,
@@ -164,6 +166,9 @@ class MyApp extends StatefulWidget {
  if (newMaterialColor != null) {
  state.changeMarerialTheme(newMaterialColor);
  }
+ if (newRoundDegree != null) {
+ state.changeRoundDegree(newRoundDegree);
+ }
  if (newLocale != null) {
  state.changeLocale(newLocale);
  }
@@ -203,6 +208,12 @@ class _MyAppState extends State<MyApp> {
  });
  }
 
+ void changeRoundDegree(bool newRoundDegree) {
+ setState(() {
+ roundDegree = newRoundDegree;
+ });
+ }
+
  void changeTimeRange(int newTimeRange) {
  setState(() {
  timeRange = newTimeRange;
@@ -243,6 +254,7 @@ class _MyAppState extends State<MyApp> {
  void initState() {
  amoledTheme = settings.amoledTheme;
  materialColor = settings.materialColor;
+ roundDegree = settings.roundDegree;
  locale = Locale(
  settings.language!.substring(0, 2), settings.language!.substring(3));
  timeRange = settings.timeRange ?? 1;

diff --git a/lib/translation/bn_in.dart b/lib/translation/bn_in.dart
@@ -121,5 +121,6 @@ class BnIn {
  'dewpoint': 'তুষার বিন্দু',
  'shortwaveRadiation': 'সংক্ষেপণ তরঙ্গ প্রকৃতি',
  'W/m2': 'ডব্লিউ/মিটার বর্গ',
+ 'roundDegree': 'ডিগ্রি রাউন্ড করুন',
  };
 }
diff --git a/lib/translation/cs_cz.dart b/lib/translation/cs_cz.dart
@@ -119,5 +119,6 @@ class CsCz {
  'widgetText': 'Text widgetu',
  'dewpoint': 'Rosný bod',
  'shortwaveRadiation': 'Krátká vlnová radiace',
+ 'roundDegree': 'Zaokrouhlit stupně',
  };
 }
diff --git a/lib/translation/de_de.dart b/lib/translation/de_de.dart
@@ -121,5 +121,6 @@ class DeDe {
  'widgetText': 'Widget-Text',
  'dewpoint': 'Taupunkt',
  'shortwaveRadiation': 'Kurzwellenstrahlung',
+ 'roundDegree': 'Grad runden',
  };
 }
diff --git a/lib/translation/en_us.dart b/lib/translation/en_us.dart
@@ -120,5 +120,6 @@ class EnUs {
  'dewpoint': 'Dewpoint',
  'shortwaveRadiation': 'Shortwave radiation',
  'W/m2': 'W/m2',
+ 'roundDegree': 'Round degrees',
  };
 }
diff --git a/lib/translation/es_es.dart b/lib/translation/es_es.dart
@@ -121,5 +121,6 @@ class EsEs {
  'widgetText': 'Texto del widget',
  'dewpoint': 'Punto de rocío',
  'shortwaveRadiation': 'Radiación de onda corta',
+ 'roundDegree': 'Redondear grados',
  };
 }
diff --git a/lib/translation/fr_fr.dart b/lib/translation/fr_fr.dart
@@ -121,5 +121,6 @@ class FrFr {
  'widgetText': 'Texte du widget',
  'dewpoint': 'Point de rosée',
  'shortwaveRadiation': 'Rayonnement à ondes courtes',
+ 'roundDegree': 'Arrondir les degrés',
  };
 }
diff --git a/lib/translation/ga_ie.dart b/lib/translation/ga_ie.dart
@@ -121,5 +121,6 @@ class GaIe {
  'dewpoint': 'Poinnte Dé',
  'shortwaveRadiation': 'Fuinneamh Ghearrfhad',
  'W/m2': 'W/m2',
+ 'roundDegree': 'Timpeall na Gráid',
  };
 }
diff --git a/lib/translation/hi_in.dart b/lib/translation/hi_in.dart
@@ -118,5 +118,6 @@ class HiIn {
  'widgetText': 'विजेट पाठ',
  'dewpoint': 'बर्फ़ के बिंदु',
  'shortwaveRadiation': 'शॉर्टवेव विकिरण',
+ 'roundDegree': 'डिग्री गोली मारें',
  };
 }
diff --git a/lib/translation/hu_hu.dart b/lib/translation/hu_hu.dart
@@ -120,6 +120,7 @@ class HuHu {
  'widgetText': 'Widget szöveg',
  'dewpoint': 'Harmatpont',
  'shortwaveRadiation': 'Rövidhullámú sugárzás',
- 'W/m2': 'W/m2'
+ 'W/m2': 'W/m2',
+ 'roundDegree': 'Fokok Kerekítése',
  };
 }
diff --git a/lib/translation/it_it.dart b/lib/translation/it_it.dart
@@ -121,5 +121,6 @@ class ItIt {
  'widgetText': 'Testo del widget',
  'dewpoint': 'Punto di rugiada',
  'shortwaveRadiation': 'Radiazione a onde corte',
+ 'roundDegree': 'Arrotonda i gradi',
  };
 }
diff --git a/lib/translation/ka_ge.dart b/lib/translation/ka_ge.dart
@@ -120,5 +120,6 @@ class KaGe {
  'widgetText': 'ვიჯეტის ტექსტი',
  'dewpoint': 'დევპოინტი',
  'shortwaveRadiation': 'მოკლე ტალღის გამოსხივება',
+ 'roundDegree': 'ხარისხი მიჯნურობა',
  };
 }