Skip to content

Commit b55921b

Browse files
authored
Merge pull request #52 from headlines-toolkit/fix_hide_ui_related_to_notification_feature
Fix hide UI related to notification feature
2 parents e132ef6 + 0a72ed4 commit b55921b

File tree

10 files changed

+48
-48
lines changed

10 files changed

+48
-48
lines changed

lib/account/view/account_page.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,17 @@ class AccountPage extends StatelessWidget {
130130
statusWidget = Column(
131131
mainAxisSize: MainAxisSize.min, // To keep column tight
132132
children: [
133-
if (user?.role != null) ...[
134-
// Show role only if available
135-
const SizedBox(height: AppSpacing.xs),
136-
Text(
137-
l10n.accountRoleLabel(user!.role.name),
138-
style: textTheme.bodyMedium?.copyWith(
139-
color: colorScheme.onSurfaceVariant,
140-
),
141-
textAlign: TextAlign.center,
142-
),
143-
],
133+
// if (user?.role != null) ...[
134+
// // Show role only if available
135+
// const SizedBox(height: AppSpacing.xs),
136+
// Text(
137+
// l10n.accountRoleLabel(user!.role.name),
138+
// style: textTheme.bodyMedium?.copyWith(
139+
// color: colorScheme.onSurfaceVariant,
140+
// ),
141+
// textAlign: TextAlign.center,
142+
// ),
143+
// ],
144144
const SizedBox(height: AppSpacing.md), // Consistent spacing
145145
OutlinedButton.icon(
146146
// Changed to OutlinedButton.icon

lib/authentication/view/authentication_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class AuthenticationPage extends StatelessWidget {
9999
Padding(
100100
padding: const EdgeInsets.only(bottom: AppSpacing.xl),
101101
child: Icon(
102-
Icons.security,
102+
isLinkingContext ? Icons.sync : Icons.newspaper,
103103
size: AppSpacing.xxl * 2, // Standardized large icon
104104
color: colorScheme.primary,
105105
),

lib/headlines-feed/view/headlines_feed_page.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
9090
style: textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
9191
),
9292
actions: [
93-
IconButton(
94-
icon: const Icon(Icons.notifications_outlined),
95-
tooltip: l10n.notificationsTooltip, // Add tooltip for accessibility
96-
onPressed: () {
97-
context.goNamed(
98-
Routes.notificationsName,
99-
); // Ensure correct route name
100-
},
101-
),
93+
// IconButton(
94+
// icon: const Icon(Icons.notifications_outlined),
95+
// tooltip: l10n.notificationsTooltip, // Add tooltip for accessibility
96+
// onPressed: () {
97+
// context.goNamed(
98+
// Routes.notificationsName,
99+
// ); // Ensure correct route name
100+
// },
101+
// ),
102102
BlocBuilder<HeadlinesFeedBloc, HeadlinesFeedState>(
103103
builder: (context, state) {
104104
var isFilterApplied = false;

lib/headlines-feed/view/headlines_filter_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
272272
title: Text(l10n.headlinesFeedFilterTitle),
273273
actions: [
274274
IconButton(
275-
icon: const Icon(Icons.clear_all),
275+
icon: const Icon(Icons.refresh),
276276
tooltip: l10n.headlinesFeedFilterResetButton,
277277
onPressed: () {
278278
context.read<HeadlinesFeedBloc>().add(

lib/l10n/app_localizations.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,25 +449,25 @@ abstract class AppLocalizations {
449449
/// Headline for the authentication page when linking an anonymous account
450450
///
451451
/// In en, this message translates to:
452-
/// **'Connect Your Account'**
452+
/// **'Sync Your Data'**
453453
String get authenticationLinkingHeadline;
454454

455455
/// Subheadline explaining the benefit of linking an anonymous account
456456
///
457457
/// In en, this message translates to:
458-
/// **'Sign in with Google or Email to save your preferences and reading history across devices.'**
458+
/// **'save your settings, content preferences and more across devices.'**
459459
String get authenticationLinkingSubheadline;
460460

461461
/// Headline for the authentication page during standard sign-in
462462
///
463463
/// In en, this message translates to:
464-
/// **'Sign In'**
464+
/// **'Headlines Toolkit'**
465465
String get authenticationSignInHeadline;
466466

467467
/// Subheadline for the authentication page during standard sign-in
468468
///
469469
/// In en, this message translates to:
470-
/// **'Sign in or continue anonymously to personalize your feed.'**
470+
/// **'Develop News Headlines Apps Rapidly & Reliably.'**
471471
String get authenticationSignInSubheadline;
472472

473473
/// AppBar title for the email sign-in page

lib/l10n/app_localizations_ar.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,18 @@ class AppLocalizationsAr extends AppLocalizations {
190190
String get authenticationEmailSignInButton => 'متابعة بالبريد الإلكتروني';
191191

192192
@override
193-
String get authenticationLinkingHeadline => 'ربط حسابك';
193+
String get authenticationLinkingHeadline => 'زامن بياناتك';
194194

195195
@override
196196
String get authenticationLinkingSubheadline =>
197-
'سجل الدخول باستخدام جوجل أو البريد الإلكتروني لحفظ تفضيلاتك وسجل القراءة عبر الأجهزة.';
197+
'إحفظ إعداداتك، تفضيلات المحتوى والمزيد عبر مختلف الأجهزة.';
198198

199199
@override
200-
String get authenticationSignInHeadline => 'تسجيل الدخول';
200+
String get authenticationSignInHeadline => 'هادلاينز تولكيت';
201201

202202
@override
203203
String get authenticationSignInSubheadline =>
204-
'سجل الدخول أو تابع كمجهول لتخصيص موجز الأخبار الخاص بك.';
204+
'طور التطبيقات الإخبارية بسرعة وبشكل موثوق.';
205205

206206
@override
207207
String get emailSignInPageTitle => 'تسجيل الدخول بالبريد الإلكتروني';

lib/l10n/app_localizations_en.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,18 @@ class AppLocalizationsEn extends AppLocalizations {
192192
String get authenticationEmailSignInButton => 'Continue with Email';
193193

194194
@override
195-
String get authenticationLinkingHeadline => 'Connect Your Account';
195+
String get authenticationLinkingHeadline => 'Sync Your Data';
196196

197197
@override
198198
String get authenticationLinkingSubheadline =>
199-
'Sign in with Google or Email to save your preferences and reading history across devices.';
199+
'save your settings, content preferences and more across devices.';
200200

201201
@override
202-
String get authenticationSignInHeadline => 'Sign In';
202+
String get authenticationSignInHeadline => 'Headlines Toolkit';
203203

204204
@override
205205
String get authenticationSignInSubheadline =>
206-
'Sign in or continue anonymously to personalize your feed.';
206+
'Develop News Headlines Apps Rapidly & Reliably.';
207207

208208
@override
209209
String get emailSignInPageTitle => 'Sign in with Email';

lib/l10n/arb/app_ar.arb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,19 @@
238238
"@authenticationEmailSignInButton": {
239239
"description": "نص زر بدء تدفق تسجيل الدخول بالبريد الإلكتروني"
240240
},
241-
"authenticationLinkingHeadline": "ربط حسابك",
241+
"authenticationLinkingHeadline": "زامن بياناتك",
242242
"@authenticationLinkingHeadline": {
243243
"description": "عنوان صفحة المصادقة عند ربط حساب مجهول"
244244
},
245-
"authenticationLinkingSubheadline": "سجل الدخول باستخدام جوجل أو البريد الإلكتروني لحفظ تفضيلاتك وسجل القراءة عبر الأجهزة.",
245+
"authenticationLinkingSubheadline": "إحفظ إعداداتك، تفضيلات المحتوى والمزيد عبر مختلف الأجهزة.",
246246
"@authenticationLinkingSubheadline": {
247247
"description": "عنوان فرعي يشرح فائدة ربط حساب مجهول"
248248
},
249-
"authenticationSignInHeadline": "تسجيل الدخول",
249+
"authenticationSignInHeadline": "هادلاينز تولكيت",
250250
"@authenticationSignInHeadline": {
251251
"description": "عنوان صفحة المصادقة أثناء تسجيل الدخول القياسي"
252252
},
253-
"authenticationSignInSubheadline": "سجل الدخول أو تابع كمجهول لتخصيص موجز الأخبار الخاص بك.",
253+
"authenticationSignInSubheadline": "طور التطبيقات الإخبارية بسرعة وبشكل موثوق.",
254254
"@authenticationSignInSubheadline": {
255255
"description": "عنوان فرعي لصفحة المصادقة أثناء تسجيل الدخول القياسي"
256256
},

lib/l10n/arb/app_en.arb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,19 @@
238238
"@authenticationEmailSignInButton": {
239239
"description": "Button text for initiating email sign-in flow"
240240
},
241-
"authenticationLinkingHeadline": "Connect Your Account",
241+
"authenticationLinkingHeadline": "Sync Your Data",
242242
"@authenticationLinkingHeadline": {
243243
"description": "Headline for the authentication page when linking an anonymous account"
244244
},
245-
"authenticationLinkingSubheadline": "Sign in with Google or Email to save your preferences and reading history across devices.",
245+
"authenticationLinkingSubheadline": "save your settings, content preferences and more across devices.",
246246
"@authenticationLinkingSubheadline": {
247247
"description": "Subheadline explaining the benefit of linking an anonymous account"
248248
},
249-
"authenticationSignInHeadline": "Sign In",
249+
"authenticationSignInHeadline": "Headlines Toolkit",
250250
"@authenticationSignInHeadline": {
251251
"description": "Headline for the authentication page during standard sign-in"
252252
},
253-
"authenticationSignInSubheadline": "Sign in or continue anonymously to personalize your feed.",
253+
"authenticationSignInSubheadline": "Develop News Headlines Apps Rapidly & Reliably.",
254254
"@authenticationSignInSubheadline": {
255255
"description": "Subheadline for the authentication page during standard sign-in"
256256
},

lib/settings/view/settings_page.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ class SettingsPage extends StatelessWidget {
101101
onTap: () => context.goNamed(Routes.settingsFeedName),
102102
),
103103
const Divider(indent: AppSpacing.lg, endIndent: AppSpacing.lg),
104-
_buildSettingsTile(
105-
context: context,
106-
icon: Icons.notifications_outlined,
107-
title: l10n.settingsNotificationsTitle, // Add l10n key
108-
onTap: () => context.goNamed(Routes.settingsNotificationsName),
109-
),
104+
// _buildSettingsTile(
105+
// context: context,
106+
// icon: Icons.notifications_outlined,
107+
// title: l10n.settingsNotificationsTitle,
108+
// onTap: () => context.goNamed(Routes.settingsNotificationsName),
109+
// ),
110110
],
111111
);
112112
},

0 commit comments

Comments
 (0)