SaveFamily/sf-app-platform
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewards ui, state and command

Browse Source
This commit is contained in:
Aitor Arana
2026-03-10 16:08:33 +01:00
parent 2b3169b3e5
commit 5ee7852ee7
15 changed files with 567 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/mobile_app/lib/navigation/app_router.dart
View File

@@ -25,7 +25,7 @@ late final GoRouter appRouter;
void configureAppRouter() {
appRouter = GoRouter(
navigatorKey: rootNavigatorKey,
initialLocation: AppRoutes.legacyOnboarding,
initialLocation: AppRoutes.controlPanel,
debugLogDiagnostics: true,
routes: [
GoRoute(
@@ -108,6 +108,11 @@ void configureAppRouter() {
name: 'locate_device',
pageBuilder: LocateDeviceBuilder().buildPage,
),
GoRoute(
path: 'rewards',
name: 'rewards',
pageBuilder: RewardsBuilder().buildPage,
),
],
),
],

1
modules/legacy/modules/device_management/lib/device_management.dart
View File

@@ -4,3 +4,4 @@ export 'src/features/device_management/device_management_builder.dart';
export 'src/features/contacts/contacts_builder.dart';
export 'src/features/remote_connection/remote_connection_builder.dart';
export 'src/features/locate_device/locate_device_builder.dart';
export 'src/features/rewards/rewards_builder.dart';

2
modules/legacy/modules/device_management/lib/src/features/device_management/device_management_screen.dart
View File

@@ -82,7 +82,7 @@ class DeviceManagementScreen extends ConsumerWidget {
SizedBox(height: SizeUtils.getByScreen(small: 16, big: 15)),
AppMenuButton(
color: theme.getColorFor(ThemeCode.legacyPrimary),
onPressed: (){},
onPressed: (){navigationContract.pushTo(AppRoutes.rewards);},
icon: SFIcons.rewardsCircle,
negativeIcon: true,
text: context.translate(I18n.rewards)

125
modules/legacy/modules/device_management/lib/src/features/rewards/presentation/rewards_screen.dart Normal file
View File

@@ -0,0 +1,125 @@
import 'package:design_system/design_system.dart';
import 'package:device_management/src/features/rewards/presentation/state/rewards_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:legacy_shared/legacy_shared.dart';
import 'package:navigation/navigation.dart';
import 'package:sf_localizations/sf_localizations.dart';
class RewardsScreen extends ConsumerWidget {
final NavigationContract navigationContract;
const RewardsScreen({super.key, required this.navigationContract});
@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.read(themePortProvider);
return LegacyPageLayout(
theme: theme,
title: context.translate(I18n.rewards),
body: Column(
children: [
Center(
child: Icon(SFIcons.rewardsCircle,
size: 180,
color: theme.getColorFor(ThemeCode.legacyPrimary),
)
),
SizedBox(height: 32),
Text(
context.translate(I18n.rewardsMessage),
textAlign: TextAlign.start,
),
SizedBox(height: 12),
const _CounterSection(),
],
),
footer: _SaveSection(),
);
}
}
class _CounterSection extends ConsumerWidget {
const _CounterSection();
@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.read(themePortProvider);
final state = ref.watch(rewardsViewModelProvider);
final vm = ref.read(rewardsViewModelProvider.notifier);
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
IconButton(
onPressed: vm.decreaseAmount,
icon: Icon(Icons.remove),
color: theme.getColorFor(ThemeCode.legacyPrimary),
),
SizedBox(
width: 240,
child: TextField(
controller: vm.amountController,
decoration: InputDecoration(
border: OutlineInputBorder(
borderSide: BorderSide(
color: theme.getColorFor(ThemeCode.legacyPrimary),
),
borderRadius: BorderRadius.all(Radius.circular(32)),
),
),
style: TextStyle(color: theme.getColorFor(ThemeCode.legacyPrimary)),
textAlign: TextAlign.center,
keyboardType: TextInputType.number,
)
),
IconButton(
onPressed: vm.increaseAmount,
icon: Icon(Icons.add),
color: theme.getColorFor(ThemeCode.legacyPrimary),
),
],
);
}
}
class _SaveSection extends ConsumerWidget{
const _SaveSection();
@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.read(themePortProvider);
final vm = ref.read(rewardsViewModelProvider.notifier);
return Padding(
padding: EdgeInsets.symmetric(horizontal: 24, vertical: 10),
child: PrimaryButton(
onPressed: () async {
await vm.submit();
final errorMessage = ref.read(
rewardsViewModelProvider.select((s)=>s.errorMessage)
);
if (errorMessage.isNotEmpty) {
showTopSnackbar(
context,
message: errorMessage,
type: MessageType.error,
);
}
},
text: context.translate(I18n.sendRewards),
color: theme.getColorFor(ThemeCode.legacyPrimary)
)
);
}
}

109
modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_model.dart Normal file
View File

@@ -0,0 +1,109 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:legacy_shared/legacy_shared.dart';
import 'rewards_view_state.dart';
final rewardsViewModelProvider =
NotifierProvider.autoDispose<RewardsViewModel, RewardsViewState>(
RewardsViewModel.new,
);
class RewardsViewModel extends Notifier<RewardsViewState> {
static final _min = 1;
late final TextEditingController amountController;
late final SendCommandUseCase _sendCommandUseCase;
@override
RewardsViewState build() {
_sendCommandUseCase = ref.read(sendCommandUseCaseProvider);
amountController = TextEditingController();
amountController.addListener(_onAmountChanged);
amountController.text = '1';
ref.onDispose(disposeControllers);
return const RewardsViewState();
}
void _onAmountChanged() {
final raw = amountController.text;
if (raw.isEmpty) return;
final amount = int.tryParse(raw);
if (amount == null) return;
if (amount == state.amount) return;
if (amount < _min) return;
state = state.copyWith(
amount: amount,
errorMessage: '',
);
}
void increaseAmount() {
final amount = state.amount + 1;
state = state.copyWith(
amount: amount,
errorMessage: '',
);
amountController.text = amount.toString();
}
void decreaseAmount() {
if (state.amount == _min) return;
final amount = state.amount - 1;
state = state.copyWith(
amount: amount,
errorMessage: '',
);
amountController.text = amount.toString();
}
Future<void> submit() async {
try {
state = state.copyWith(
isLoading: true,
isComplete: false,
);
final device = ref.read(selectedDeviceProvider);
final request = SendCommandRequestModel(
device: device!.identificator.toString(),
command: 'REWARDS',
data: {
'rewards': state.amount
}
);
await _sendCommandUseCase.send(request: request);
state = state.copyWith(
isLoading: false,
isComplete: true
);
} catch(e) {
state = state.copyWith(
errorMessage: e.toString(),
isLoading: false,
isComplete: false
);
}
}
void disposeControllers() {
amountController.removeListener(_onAmountChanged);
amountController.dispose();
}
}

15
modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_state.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'rewards_view_state.freezed.dart';
@freezed
abstract class RewardsViewState with _$RewardsViewState {
const factory RewardsViewState({
@Default(1) int amount,
@Default(false) bool isLoading,
@Default(false) bool isComplete,
@Default('') String errorMessage,
}) = _RewardsViewState;
}

280
modules/legacy/modules/device_management/lib/src/features/rewards/presentation/state/rewards_view_state.freezed.dart Normal file
View File

@@ -0,0 +1,280 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
// coverage:ignore-file
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of 'rewards_view_state.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
// dart format off
T _$identity<T>(T value) => value;
/// @nodoc
mixin _$RewardsViewState {
int get amount; bool get isLoading; bool get isComplete; String get errorMessage;
/// Create a copy of RewardsViewState
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
$RewardsViewStateCopyWith<RewardsViewState> get copyWith => _$RewardsViewStateCopyWithImpl<RewardsViewState>(this as RewardsViewState, _$identity);
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is RewardsViewState&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
}
@override
int get hashCode => Object.hash(runtimeType,amount,isLoading,isComplete,errorMessage);
@override
String toString() {
return 'RewardsViewState(amount: $amount, isLoading: $isLoading, isComplete: $isComplete, errorMessage: $errorMessage)';
}
}
/// @nodoc
abstract mixin class $RewardsViewStateCopyWith<$Res> {
factory $RewardsViewStateCopyWith(RewardsViewState value, $Res Function(RewardsViewState) _then) = _$RewardsViewStateCopyWithImpl;
@useResult
$Res call({
int amount, bool isLoading, bool isComplete, String errorMessage
});
}
/// @nodoc
class _$RewardsViewStateCopyWithImpl<$Res>
implements $RewardsViewStateCopyWith<$Res> {
_$RewardsViewStateCopyWithImpl(this._self, this._then);
final RewardsViewState _self;
final $Res Function(RewardsViewState) _then;
/// Create a copy of RewardsViewState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? amount = null,Object? isLoading = null,Object? isComplete = null,Object? errorMessage = null,}) {
return _then(_self.copyWith(
amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
as int,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// Adds pattern-matching-related methods to [RewardsViewState].
extension RewardsViewStatePatterns on RewardsViewState {
/// A variant of `map` that fallback to returning `orElse`.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case _:
/// return orElse();
/// }
/// ```
@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _RewardsViewState value)? $default,{required TResult orElse(),}){
final _that = this;
switch (_that) {
case _RewardsViewState() when $default != null:
return $default(_that);case _:
return orElse();
}
}
/// A `switch`-like method, using callbacks.
///
/// Callbacks receives the raw object, upcasted.
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case final Subclass2 value:
/// return ...;
/// }
/// ```
@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _RewardsViewState value) $default,){
final _that = this;
switch (_that) {
case _RewardsViewState():
return $default(_that);case _:
throw StateError('Unexpected subclass');
}
}
/// A variant of `map` that fallback to returning `null`.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case final Subclass value:
/// return ...;
/// case _:
/// return null;
/// }
/// ```
@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _RewardsViewState value)? $default,){
final _that = this;
switch (_that) {
case _RewardsViewState() when $default != null:
return $default(_that);case _:
return null;
}
}
/// A variant of `when` that fallback to an `orElse` callback.
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case _:
/// return orElse();
/// }
/// ```
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int amount, bool isLoading, bool isComplete, String errorMessage)? $default,{required TResult orElse(),}) {final _that = this;
switch (_that) {
case _RewardsViewState() when $default != null:
return $default(_that.amount,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
return orElse();
}
}
/// A `switch`-like method, using callbacks.
///
/// As opposed to `map`, this offers destructuring.
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case Subclass2(:final field2):
/// return ...;
/// }
/// ```
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int amount, bool isLoading, bool isComplete, String errorMessage) $default,) {final _that = this;
switch (_that) {
case _RewardsViewState():
return $default(_that.amount,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
throw StateError('Unexpected subclass');
}
}
/// A variant of `when` that fallback to returning `null`
///
/// It is equivalent to doing:
/// ```dart
/// switch (sealedClass) {
/// case Subclass(:final field):
/// return ...;
/// case _:
/// return null;
/// }
/// ```
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int amount, bool isLoading, bool isComplete, String errorMessage)? $default,) {final _that = this;
switch (_that) {
case _RewardsViewState() when $default != null:
return $default(_that.amount,_that.isLoading,_that.isComplete,_that.errorMessage);case _:
return null;
}
}
}
/// @nodoc
class _RewardsViewState implements RewardsViewState {
const _RewardsViewState({this.amount = 0, this.isLoading = false, this.isComplete = false, this.errorMessage = ''});
@override@JsonKey() final int amount;
@override@JsonKey() final bool isLoading;
@override@JsonKey() final bool isComplete;
@override@JsonKey() final String errorMessage;
/// Create a copy of RewardsViewState
/// with the given fields replaced by the non-null parameter values.
@override @JsonKey(includeFromJson: false, includeToJson: false)
@pragma('vm:prefer-inline')
_$RewardsViewStateCopyWith<_RewardsViewState> get copyWith => __$RewardsViewStateCopyWithImpl<_RewardsViewState>(this, _$identity);
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is _RewardsViewState&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&(identical(other.isComplete, isComplete) || other.isComplete == isComplete)&&(identical(other.errorMessage, errorMessage) || other.errorMessage == errorMessage));
}
@override
int get hashCode => Object.hash(runtimeType,amount,isLoading,isComplete,errorMessage);
@override
String toString() {
return 'RewardsViewState(amount: $amount, isLoading: $isLoading, isComplete: $isComplete, errorMessage: $errorMessage)';
}
}
/// @nodoc
abstract mixin class _$RewardsViewStateCopyWith<$Res> implements $RewardsViewStateCopyWith<$Res> {
factory _$RewardsViewStateCopyWith(_RewardsViewState value, $Res Function(_RewardsViewState) _then) = __$RewardsViewStateCopyWithImpl;
@override @useResult
$Res call({
int amount, bool isLoading, bool isComplete, String errorMessage
});
}
/// @nodoc
class __$RewardsViewStateCopyWithImpl<$Res>
implements _$RewardsViewStateCopyWith<$Res> {
__$RewardsViewStateCopyWithImpl(this._self, this._then);
final _RewardsViewState _self;
final $Res Function(_RewardsViewState) _then;
/// Create a copy of RewardsViewState
/// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? amount = null,Object? isLoading = null,Object? isComplete = null,Object? errorMessage = null,}) {
return _then(_RewardsViewState(
amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
as int,isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
as bool,isComplete: null == isComplete ? _self.isComplete : isComplete // ignore: cast_nullable_to_non_nullable
as bool,errorMessage: null == errorMessage ? _self.errorMessage : errorMessage // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
// dart format on

18
modules/legacy/modules/device_management/lib/src/features/rewards/rewards_builder.dart Normal file
View File

@@ -0,0 +1,18 @@
import 'package:device_management/src/features/rewards/presentation/rewards_screen.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:get_it/get_it.dart';
import 'package:navigation/navigation.dart';
class RewardsBuilder {
const RewardsBuilder();
Page<void> buildPage(BuildContext context, GoRouterState state) {
final NavigationContract navigationContract = GetIt.I<NavigationContract>();
return MaterialPage<void>(
key: state.pageKey,
child: RewardsScreen(navigationContract: navigationContract),
);
}
}

2
packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml
View File

@@ -7,6 +7,6 @@
<versions>
<version>2.6.4</version>
</versions>
<lastUpdated>20260309000000</lastUpdated>
<lastUpdated>20260310000000</lastUpdated>
</versioning>
</metadata>

2
packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.md5
View File

@@ -1 +1 @@
efba28f7c4340264bc1e42e5d11102a8
4d748a03a80705124d1ffe8143732218

2
packages/flutter_treezor_entrust_sdk_bridge/android/build/com/entrust/antelop/antelop/maven-metadata.xml.sha1
View File

@@ -1 +1 @@
33fe0a028f582b89ab719f8dafc0490e05af4ff5
626b5ba9e1320d252d7286b888d11b14552a2a38

1
packages/navigation/lib/app_routes.dart
View File

@@ -50,6 +50,7 @@ class AppRoutes {
static const contacts = '$deviceManagement/contacts';
static const remoteConnection = '$deviceManagement/remote_connection';
static const locateDevice = '$deviceManagement/locate_device';
static const rewards = '$deviceManagement/rewards';
static const legacyLogin = '$legacy/login';
static const legacySignup = '$legacy/signup';

6
packages/sf_localizations/assets/l10n/en.json
View File

@@ -489,7 +489,6 @@
"deleteAccount": "Delete account",
"logOut": "Log out",
"loginEmail": "(Login email)",
"loginSuccess": "Login successful",
"userNameLabel": "User name",
"userPhoneLabel": "User phone number",
"contactEmailLabel": "Contact email",
@@ -498,7 +497,6 @@
"editDeviceTitle": "Edit Device",
"name": "Name",
"deleteDeviceDialog": "Are you sure you want to delete this device from the list?",
"cancel": "Cancel",
"delete": "Delete",
"userAccount": "Account: {email}",
"userRole": "Role: {role}",
@@ -544,5 +542,7 @@
"deviceSetup_weightHint": "30",
"deviceSetup_heightLabel": "Height (cm)",
"deviceSetup_heightHint": "120",
"activationKeyLabel": "Activation key"
"activationKeyLabel": "Activation key",
"rewardsMessage": "Send rewards",
"sendRewards": "Send rewards!"
}

4
packages/sf_localizations/assets/l10n/es.json
View File

@@ -540,5 +540,7 @@
"deviceSetup_weightHint": "30",
"deviceSetup_heightLabel": "Altura (cm)",
"deviceSetup_heightHint": "120",
"activationKeyLabel": "Clave de activación"
"activationKeyLabel": "Clave de activación",
"rewardsMessage": "Envía una recompensa",
"sendRewards": "¡Enviar recompensas!"
}

2
packages/sf_localizations/lib/src/generated/i18n.dart
View File

@@ -661,4 +661,6 @@ class I18n {
static const String deviceSetup_heightLabel = 'deviceSetup_heightLabel';
static const String deviceSetup_heightHint = 'deviceSetup_heightHint';
static const String activationKeyLabel = 'activationKeyLabel';
static const String rewardsMessage = 'rewardsMessage';
static const String sendRewards = 'sendRewards';
}