Specify color for dividers to keep it same after flutter upgrade

New material theme has a different default colour for dividers
This commit is contained in:
ashilkn 2024-03-28 18:22:38 +05:30
parent 9f22882d8d
commit 4c73fb7374
10 changed files with 59 additions and 34 deletions

View file

@ -375,7 +375,10 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
textInputAction: TextInputAction.next,
),
),
const Divider(thickness: 1),
Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
const SizedBox(height: 12),
_getAgreement(),
const SizedBox(height: 40),

View file

@ -8,6 +8,7 @@ import "package:photos/generated/l10n.dart";
import "package:photos/l10n/l10n.dart";
import "package:photos/models/api/user/srp.dart";
import 'package:photos/services/user_service.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/account/login_pwd_verification_page.dart";
import 'package:photos/ui/common/dynamic_fab.dart';
import 'package:photos/ui/common/web_page.dart';
@ -159,10 +160,11 @@ class _LoginPageState extends State<LoginPage> {
autofocus: true,
),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 18),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18),
child: Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
),
Padding(

View file

@ -282,10 +282,11 @@ class _LoginPasswordVerificationPageState
},
),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 18),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18),
child: Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
),
Padding(

View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:photos/ente_theme_data.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/services/user_service.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/common/dynamic_fab.dart';
import 'package:step_progress_indicator/step_progress_indicator.dart';
import "package:styled_text/styled_text.dart";
@ -16,7 +17,7 @@ class OTTVerificationPage extends StatefulWidget {
this.email, {
this.isChangeEmail = false,
this.isCreateAccountScreen = false,
this.isResetPasswordScreen = false,
this.isResetPasswordScreen = false,
Key? key,
}) : super(key: key);
@ -78,9 +79,11 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
_verificationCodeController.text,
);
} else {
UserService.instance
.verifyEmail(context, _verificationCodeController.text,
isResettingPasswordScreen: widget.isResetPasswordScreen,);
UserService.instance.verifyEmail(
context,
_verificationCodeController.text,
isResettingPasswordScreen: widget.isResetPasswordScreen,
);
}
FocusScope.of(context).unfocus();
},
@ -130,21 +133,21 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
},
),
),
widget.isResetPasswordScreen ?
Text(
S.of(context).toResetVerifyEmail,
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontSize: 14),
):
Text(
S.of(context).checkInboxAndSpamFolder,
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontSize: 14),
),
widget.isResetPasswordScreen
? Text(
S.of(context).toResetVerifyEmail,
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontSize: 14),
)
: Text(
S.of(context).checkInboxAndSpamFolder,
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontSize: 14),
),
],
),
),
@ -178,8 +181,9 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
},
),
),
const Divider(
Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
Padding(
padding: const EdgeInsets.all(20),

View file

@ -9,6 +9,7 @@ import 'package:photos/core/event_bus.dart';
import 'package:photos/events/subscription_purchased_event.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/services/user_service.dart";
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/account/recovery_page.dart';
import 'package:photos/ui/common/dynamic_fab.dart';
import 'package:photos/ui/components/buttons/button_widget.dart';
@ -257,10 +258,11 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
},
),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 18),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18),
child: Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
),
Padding(

View file

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
import "package:photos/generated/l10n.dart";
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/account/password_entry_page.dart';
import 'package:photos/ui/common/dynamic_fab.dart';
import 'package:photos/utils/dialog_util.dart';
@ -123,10 +124,11 @@ class _RecoveryPageState extends State<RecoveryPage> {
},
),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 18),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18),
child: Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
),
Row(

View file

@ -210,10 +210,11 @@ class _RequestPasswordVerificationPageState
},
),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 18),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18),
child: Divider(
thickness: 1,
color: getEnteColorScheme(context).strokeFaint,
),
),
],

View file

@ -5,6 +5,7 @@ import 'package:photos/ente_theme_data.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/sessions.dart';
import 'package:photos/services/user_service.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/common/loading_widget.dart';
import "package:photos/utils/date_time_util.dart";
import 'package:photos/utils/dialog_util.dart';
@ -106,7 +107,9 @@ class _SessionsPageState extends State<SessionsPage> {
),
),
),
const Divider(),
Divider(
color: getEnteColorScheme(context).strokeFaint,
),
],
);
}

View file

@ -10,6 +10,7 @@ import 'package:photos/events/sync_status_update_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/services/sync_service.dart';
import 'package:photos/services/user_remote_flag_service.dart';
import "package:photos/theme/ente_theme.dart";
import 'package:photos/theme/text_style.dart';
import 'package:photos/ui/account/verify_recovery_page.dart';
import 'package:photos/ui/components/home_header_widget.dart';
@ -93,8 +94,9 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
: const Text("ente", style: brandStyleMedium),
),
_showErrorBanner
? const Divider(
? Divider(
height: 8,
color: getEnteColorScheme(context).strokeFaint,
)
: const SizedBox.shrink(),
_showErrorBanner

View file

@ -10,6 +10,7 @@ import 'package:photos/events/user_logged_out_event.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/collections/button/archived_button.dart";
import "package:photos/ui/collections/button/hidden_button.dart";
import "package:photos/ui/collections/button/trash_button.dart";
@ -184,7 +185,11 @@ class _UserCollectionsTabState extends State<UserCollectionsTab>
),
)
: const SliverToBoxAdapter(child: SizedBox.shrink()),
const SliverToBoxAdapter(child: Divider()),
SliverToBoxAdapter(
child: Divider(
color: getEnteColorScheme(context).strokeFaint,
),
),
const SliverToBoxAdapter(child: SizedBox(height: 12)),
SliverToBoxAdapter(
child: Padding(