"Refactor code in multiple files: Firebase API, FavoritesStep, Home, NotificationTime, and CustomCupertinoDatePicker."

This commit is contained in:
OkaykOrhmn 2024-09-17 16:22:02 +03:30
parent 99965816f1
commit dc918c633f
9 changed files with 32 additions and 21 deletions

View File

@ -16,9 +16,9 @@ class FirebaseApi {
Future<void> initNotification() async { Future<void> initNotification() async {
try { try {
fcmToken = await _firebaseMessaging.getToken(); fcmToken = await _firebaseMessaging.getToken();
if (kDebugMode) { // if (kDebugMode) {
print("fCMToken: $fcmToken"); print("fCMToken: $fcmToken");
} // }
} catch (e) { } catch (e) {
e.printError(); e.printError();
} }

View File

@ -80,7 +80,7 @@ class _UsernameInputState extends State<UsernameInput> {
.copyWith(color: Theme.of(context).colorScheme.primary), .copyWith(color: Theme.of(context).colorScheme.primary),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () => launchUrlString( ..onTap = () => launchUrlString(
'https://didvan.app/terms-of-use#conditions', 'https://didvan.com/terms-of-use#conditions',
), ),
), ),
const TextSpan(text: 'و\n'), const TextSpan(text: 'و\n'),
@ -92,7 +92,7 @@ class _UsernameInputState extends State<UsernameInput> {
.copyWith(color: Theme.of(context).colorScheme.primary), .copyWith(color: Theme.of(context).colorScheme.primary),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () => launchUrlString( ..onTap = () => launchUrlString(
'https://didvan.app/terms-of-use#privacy', 'https://didvan.com/terms-of-use#privacy',
), ),
), ),
const TextSpan(text: 'را می‌پذیرم'), const TextSpan(text: 'را می‌پذیرم'),

View File

@ -49,7 +49,9 @@ class _FavoritesStepState extends State<FavoritesStep> {
child: Stack( child: Stack(
children: [ children: [
DidvanScaffold( DidvanScaffold(
appBarData: AppBarData( appBarData: state.toTimer
? null
: AppBarData(
hasBack: true, hasBack: true,
title: 'شخصی‌سازی محتوا', title: 'شخصی‌سازی محتوا',
), ),

View File

@ -476,7 +476,6 @@ class _HomeState extends State<Home>
}, },
isBackgroundDropBlur: true, isBackgroundDropBlur: true,
confrimTitle: 'بله', confrimTitle: 'بله',
onDismissed: Navigator.of(navigatorKey.currentContext!).pop,
dismissTitle: 'خیر', dismissTitle: 'خیر',
)); ));
} else { } else {

View File

@ -48,7 +48,9 @@ class _NotificationTimeState extends State<NotificationTime> {
child: Stack( child: Stack(
children: [ children: [
DidvanScaffold( DidvanScaffold(
appBarData: AppBarData( appBarData: state.fromFav
? null
: AppBarData(
hasBack: true, hasBack: true,
title: 'زمان دریافت اعلان', title: 'زمان دریافت اعلان',
), ),

View File

@ -1,5 +1,6 @@
import 'package:didvan/models/enums.dart'; import 'package:didvan/models/enums.dart';
import 'package:didvan/providers/core.dart'; import 'package:didvan/providers/core.dart';
import 'package:didvan/routes/routes.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -59,7 +60,6 @@ class NotificationTimeState extends CoreProvier {
if (fromFav) { if (fromFav) {
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.of(context).pop();
} else { } else {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }

View File

@ -55,11 +55,11 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
void initState() { void initState() {
super.initState(); super.initState();
for (int i = 1; i < 12 + 1; i++) { for (int i = 0; i < 12 + 1; i++) {
String twoDigitNumber = i.toString().padLeft(2, '0'); String twoDigitNumber = i.toString().padLeft(2, '0');
_timeH.add(twoDigitNumber); _timeH.add(twoDigitNumber);
} }
for (int i = 1; i < 12 + 1; i++) { for (int i = 1; i < 11 + 1; i++) {
String twoDigitNumber = i.toString().padLeft(2, '0'); String twoDigitNumber = i.toString().padLeft(2, '0');
_timeH.add(twoDigitNumber); _timeH.add(twoDigitNumber);
} }
@ -189,7 +189,10 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
child: Container( child: Container(
height: 64, height: 64,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primary.withOpacity(widget.disable? 0.2: 1), color: Theme.of(context)
.colorScheme
.primary
.withOpacity(widget.disable ? 0.2 : 1),
borderRadius: BorderRadius.circular(18)), borderRadius: BorderRadius.circular(18)),
child: const Padding( child: const Padding(
padding: EdgeInsets.symmetric(vertical: 12), padding: EdgeInsets.symmetric(vertical: 12),

View File

@ -222,7 +222,7 @@ class _ProfilePageState extends State<ProfilePage> {
icon: DidvanIcons.info_circle_regular, icon: DidvanIcons.info_circle_regular,
title: 'معرفی دیدوان', title: 'معرفی دیدوان',
onTap: () => onTap: () =>
launchUrlString('https://didvan.app/#info'), launchUrlString('https://didvan.com/#info'),
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
@ -339,7 +339,7 @@ class _ProfilePageState extends State<ProfilePage> {
icon: DidvanIcons.alert_regular, icon: DidvanIcons.alert_regular,
title: 'حریم خصوصی', title: 'حریم خصوصی',
onTap: () => launchUrlString( onTap: () => launchUrlString(
'https://didvan.app/terms-of-use#privacy', 'https://didvan.com/terms-of-use#privacy',
), ),
), ),
], ],

View File

@ -28,7 +28,12 @@
<!-- Favicon --> <!-- Favicon -->
<link rel="icon" type="image/png" href="favicon.png" /> <link rel="icon" type="image/png" href="favicon.png" />
<script>
// Import the functions you need from the SDKs you need
import { initializeApp } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-app.js";
import { getAnalytics } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-analytics.js";
import { getMessaging } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-messagin.js";
</script>
<title>Didvan</title> <title>Didvan</title>
<link rel="manifest" href="manifest.json" /> <link rel="manifest" href="manifest.json" />
<style> <style>