Skip to content

bump new Android to 2.2.5 and fix Sample App state management #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vscmaster merged 1 commit into from
Jun 10, 2026
Merged

bump new Android to 2.2.5 and fix Sample App state management #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 44 additions & 29 deletions Sample/lib/api/model/branding_options_request.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 14 additions & 5 deletions Sample/lib/feature/home/home_screen_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
final _logger = Logger();
final OttuApi _api;

String? _apiTransactionDetails;
ThemeModeNotifierHolder _themeModeNotifier;

HomeScreenCubit({
Expand Down Expand Up @@ -92,9 +91,14 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
}
}

@override
void onChange(Change<HomeScreenState> change) {
super.onChange(change);
_state = change.nextState;
}

@override
Future<void> close() {
_state = state;
return super.close();
}

Expand Down Expand Up @@ -140,8 +144,13 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
);
result.onResult(
success: (sessionResponse) {
_apiTransactionDetails = sessionResponse.transactionDetails;
emit(state.copyWith(sessionId: sessionResponse.sessionId, hasSessionLoaded: true));
emit(
state.copyWith(
sessionId: sessionResponse.sessionId,
hasSessionLoaded: true,
apiTransactionDetails: sessionResponse.transactionDetails,
),
);
},
error: (_) {},
);
Expand Down Expand Up @@ -262,7 +271,7 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
amount: amount,
showPaymentDetails: state.showPaymentDetails,
paymentOptionsDisplaySettings: displaySettings,
setupPreload: state.preloadPayload == true ? _apiTransactionDetails : null,
setupPreload: state.preloadPayload == true ? state.apiTransactionDetails : null,
formsOfPayment: formOfPayments?.isNotEmpty == true ? formOfPayments : null,
theme: _theme,
payButtonText: state.useCustomText == true
Expand Down
5 changes: 5 additions & 0 deletions Sample/lib/feature/home/home_screen_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ final class HomeScreenState extends Equatable {
final PaymentOptionsDisplayMode? paymentOptionsDisplayMode;
final Map<FormsOfPayment, bool>? formsOfPaymentChecked;
final Map<PGCode, bool>? pgCodesChecked;
final String? apiTransactionDetails;

const HomeScreenState({
required this.merchantId,
Expand All @@ -49,6 +50,7 @@ final class HomeScreenState extends Equatable {
this.formsOfPaymentChecked,
this.pgCodesChecked,
this.useCustomText = false,
this.apiTransactionDetails,
});

HomeScreenState copyWith({
Expand All @@ -73,6 +75,7 @@ final class HomeScreenState extends Equatable {
PaymentOptionsDisplayMode? paymentOptionsDisplayMode,
Map<FormsOfPayment, bool>? formsOfPaymentChecked,
Map<PGCode, bool>? pgCodesChecked,
String? apiTransactionDetails,
}) {
return HomeScreenState(
merchantId: merchantId ?? this.merchantId,
Expand All @@ -96,6 +99,7 @@ final class HomeScreenState extends Equatable {
paymentOptionsDisplayMode: paymentOptionsDisplayMode ?? this.paymentOptionsDisplayMode,
formsOfPaymentChecked: formsOfPaymentChecked ?? this.formsOfPaymentChecked,
pgCodesChecked: pgCodesChecked ?? this.pgCodesChecked,
apiTransactionDetails: apiTransactionDetails ?? this.apiTransactionDetails,
);
}

Expand All @@ -122,5 +126,6 @@ final class HomeScreenState extends Equatable {
paymentOptionsDisplayMode?.name,
formsOfPaymentChecked.hashCode,
pgCodesChecked.hashCode,
apiTransactionDetails,
];
}
8 changes: 5 additions & 3 deletions Sample/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ void main() {
}

class OttuApp extends StatelessWidget {
final modules = [];
final List<Module> modules;
final routes = <RouteBase>[];
late final GoRouter _router;

OttuApp({required final List<Module> modules, super.key}) {
OttuApp({required this.modules, super.key}) {
modules.forEach((final module) => module.init(_service));
modules.forEach((final module) => routes.addAll(module.router()));
_router = GoRouter(routes: routes);
}

@override
Expand All @@ -53,7 +55,7 @@ class OttuApp extends StatelessWidget {
builder: (context, themeMode, _) {
final mode = themeMode?.toThemeMode();
return MaterialApp.router(
routerConfig: GoRouter(routes: routes),
routerConfig: _router,
themeMode: mode,
supportedLocales: [Locale('ar'), Locale('en')],
localizationsDelegates: const [
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ allprojects {
}

dependencies {
implementation("com.github.ottuco:ottu-android-checkout:2.2.4")
implementation("com.github.ottuco:ottu-android-checkout:2.2.5")
implementation("com.squareup.moshi:moshi-kotlin:1.15.2")
implementation("com.squareup.moshi:moshi-adapters:1.15.2")
implementation("com.squareup.moshi:moshi-kotlin-codegen:1.15.2")
Expand Down