Skip to content

Commit

Permalink
🧹
Browse files Browse the repository at this point in the history
  • Loading branch information
just-seba committed Oct 2, 2024
1 parent fb8c777 commit 4c89059
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ targets:
use_path_for_request_names: false
overriden_models:
- file_name: "backend_api.models"
import_url: "../models.dart"
import_url: "../value_types.dart"
overriden_models:
- "Watt"
5 changes: 2 additions & 3 deletions app/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ upgrade-sdk:
# dart fix and format
format:
dart fix --apply
dart format {{justfile_directory()}}
dart format .

# flutter analyze
analyze:
Expand All @@ -23,10 +23,9 @@ pub-get:
flutter pub get

# Generates code using build_runner
generate-code:
generate-code: && format
dart run build_runner clean
dart run build_runner build --delete-conflicting-outputs
just format

generate-icons: pub-get
dart run flutter_launcher_icons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:collection/collection.dart';
import 'dart:convert';

import 'backend_api.enums.swagger.dart' as enums;
import '../models.dart';
import '../value_types.dart';

part 'backend_api.models.swagger.g.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// ignore_for_file: type=lint


import 'backend_api.models.swagger.dart';
import 'package:chopper/chopper.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
extension type const Watt(num value) implements num {
extension type const Watt(num _value) implements num {
static const unit = "W";
static const zero = Watt(0);

// Json serialization
factory Watt.fromJson(num json) => Watt(json);
num toJson() => value;
num toJson() => _value;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:async';

import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/ui/commands/command.dart';
import 'package:openems/ui/shared/noop.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/meters/electricity_meter_list_item.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/ui/commands/command.dart';
import 'package:signals/signals_flutter.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/producers/producer_list_item.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/producers/edit_producer_screen.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/producers/producer_view_model.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/ui/commands/command.dart';
import 'package:signals/signals_flutter.dart';
Expand Down
6 changes: 3 additions & 3 deletions app/lib/ui/shared/unit_text.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:openems/application/backend_api/models.dart';
import 'package:openems/application/backend_api/value_types.dart';

class UnitText extends StatelessWidget {
const UnitText(this.value, this.unit, {this.color, super.key});
Expand All @@ -8,8 +8,8 @@ class UnitText extends StatelessWidget {
: value = wattHours,
unit = "Wh";

const UnitText.power(Watt watts, {this.color, super.key})
: value = watts,
const UnitText.power(Watt watt, {this.color, super.key})
: value = watt,
unit = Watt.unit;

UnitText.percentage(num percentage, {this.color, super.key})
Expand Down

0 comments on commit 4c89059

Please sign in to comment.