Skip to content
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.

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

Sign in ui is done #117

Merged
merged 6 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ analyzer:
- "**/*.g.dart"
- "**/*.freezed.dart"
- "bin/cache/**"

errors:
todo: false
fixme: false
Comment on lines +15 to +18
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! 🤙

2 changes: 2 additions & 0 deletions app/lib/app/router/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class AppRouter {
static const String quran = '/quran';
static const String read = '/read';
static const String login = '/login';
static const String signIn = '/sign-in';

static const String settingsPage = '/settings';
static const String langSettings = '/lang-settings';
Expand All @@ -27,6 +28,7 @@ class AppRouter {
hatim => CupertinoPageRoute(builder: (_) => const HatimView()),
quran => CupertinoPageRoute(builder: (_) => const QuranView()),
login => CupertinoPageRoute(builder: (_) => const LoginView()),
signIn => CupertinoPageRoute(builder: (_) => const SignInView()),
settingsPage => CupertinoPageRoute(builder: (_) => const SettingsView()),
aboutUs => CupertinoPageRoute(builder: (_) => const AboutUsVuew()),
developers => CupertinoPageRoute(builder: (_) => const DevelopersView()),
Expand Down
3 changes: 3 additions & 0 deletions app/lib/constants/api/api_const.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ class ApiConst {
static Map<String, String> authMap(String token) => {'Authorization': 'Bearer $token'};

static const urlGitHub = 'https://github.com/Eldar2021/my_quran';

// TODO(eldiiar): Replace the privacy policy URL with the actual [URL] of your privacy policy page.
Comment on lines +24 to +25
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice TODO 👍

static const provicyPolicy = 'https://github.com/Eldar2021/my_quran';
Joldubaev marked this conversation as resolved.
Show resolved Hide resolved
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "للمطورين",
"profileDevsDesc": "إذا لاحظت أي عيوب فنية في تطبيقنا ، أو إذا كانت لديك أفكار مثيرة للاهتمام لإضافة ميزات جديدة إلى التطبيق ، يسعدنا دائمًا أن نسمع منك! تواصل معنا على جيثب. من فضلك لا تخجل! نحن مهتمون جدًا بتطوير هذا التطبيق معًا",
"allDonePages": " عدد صفحات القرآن المقروءة من تطبيقنا",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": " أهلاً وسهلاً ",
"google": "Google",
"orSignInWith": "---أو تسجيل الدخول باستخدام---",
"apple": "Apple",
"signinWithoutAnAccount": " ادخل بدون حساب ",
"privacyPolicy": " سياسة الخصوصية "
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "For developers",
"profileDevsDesc": "If you've noticed any technical flaws in our app, or if you have interesting ideas for adding new features to the app, we're always happy to hear from you! Get in touch with us on GitHub. Please don't be shy! We are very interested in developing this app together.",
"allDonePages": "Total number of Quran pages read from our app",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": "Welcome",
"google": "Google",
"orSignInWith": "---Or sign in with---",
Joldubaev marked this conversation as resolved.
Show resolved Hide resolved
"apple": "Apple",
"signInWithoutAnAccount": "Sign in without an account",
"privacyPolicy": "Privacy Policy"
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_id.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "Untuk pengembangs",
"profileDevsDesc": "Jika Anda melihat ada kekurangan teknis di aplikasi kami, atau jika Anda memiliki ide menarik untuk menambahkan fitur baru ke aplikasi, kami selalu senang mendengar dari Anda! Hubungi kami di GitHub. Tolong jangan malu! Kami sangat tertarik untuk mengembangkan aplikasi ini bersama.",
"allDonePages": "Jumlah halaman Quran yang dibaca dari aplikasi kami",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": "Selamat datang",
"google": "Google",
"orSignInWith": "---Atau masuk dengan---",
"apple": "Apple",
"signInWithoutAnAccount": "Masuk tanpa akun",
"privacyPolicy": " Kebijakan Privasi"
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_kk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "Әзірлеушілер үшін",
"profileDevsDesc": "Қолданбамызда қандай да бір техникалық кемшіліктерді байқасаңыз немесе қосымшаға жаңа мүмкіндіктерді қосу туралы қызықты идеяларыңыз болса, біз сізден әрқашан қуаныштымыз! GitHub арқылы бізбен байланысыңыз. Өтінемін, ойланбаңыз! Біз бұл қосымшаны бірлесіп әзірлеуге өте мүдделіміз.",
"allDonePages": "Біздің қолмен оқылған Коран бет саны",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": "Қош келдіңіз",
"google": "Google",
"orSignInWith": " ---Немесе кіруге мүмкіндік береді---",
"apple": "Apple",
"signInWithoutAnAccount": "Тіркелуісіз кіріңіз",
"privacyPolicy": " Құпиялылық саясаты"
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_ky.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "Тиркемени иштеп чыккандар",
"profileDevsDesc": "Эгер сиз биздин тиркемеден кандайдыр бир техникалык кемчиликтерди байкасаңыз же тиркемеге жаңы өзгөчөлүктөрдү киргизүү боюнча кызыктуу идеяларыңыз болсо, биз ар дайым кубанычта болобуз ! Биз менен гитхаб аркылуу байланышууңузду өтүнөбүз. Сураныч, эч тартынбаңыз! Бул тиркемени биргеликте өнүктүрүүгө биз абдан кызыктарбыз.",
"allDonePages": "Тиркемебиз аркылуу жалпы окулган Куран беттери",
"allDonePagesDesc": "Аллах бул Куран менен кээ бир коомдордун мартабасын көтөргөндөй эле, кээ бир коомдордун даражасын түшүрөт."
"allDonePagesDesc": "Аллах бул Куран менен кээ бир коомдордун мартабасын көтөргөндөй эле, кээ бир коомдордун даражасын түшүрөт.",
"welcome": "Кош келиңиз",
"google": "Google",
"orSignInWith": "---Немесе кирүү менен---",
"apple": "Apple",
"signInWithoutAnAccount": "Акаунту жок кирүү",
"privacyPolicy": "Конфиденциальдик саясат"
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_ru.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "Для разработчиков",
"profileDevsDesc": "Если вы заметили какие-либо технические недочеты в нашем приложении или у вас есть интересные идеи по добавлению новых функций в приложение, мы всегда рады вас услышать! Свяжитесь с нами по GitHub. Пожалуйста, не стесняйтесь! Мы очень заинтересованы в совместном развитии этого приложения.",
"allDonePages": "Общее количество страниц Корана, прочитанных из нашего приложения",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": "Добро пожаловать",
"google": "Google",
"orSignInWith": "---Или войти с помощью---",
"apple": "Apple",
"signInWithoutAnAccount": "Войдите без учетной записи",
"privacyPolicy": "Политика Конфиденциальности"
}
8 changes: 7 additions & 1 deletion app/lib/l10n/arb/app_tr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@
"profileDevs": "Geliştiriciler için",
"profileDevsDesc": "Uygulamamızda herhangi bir teknik kusur fark ettiyseniz veya uygulamaya yeni özellikler eklemek için ilginç fikirleriniz varsa, sizden haber almaktan her zaman mutluluk duyarız! GitHub'da bizimle iletişime geçin. Lütfen utanma! Bu uygulamayı birlikte geliştirmekle çok ilgileniyoruz.",
"allDonePages": "Uygulamamızdan okunan toplam Kuran sayfa sayısı",
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır."
"allDonePagesDesc": "Allah şu Kur’an’la bazı kavimleri yükseltir, bazılarını da alçaltır.",
"welcome": "Hoş geldiniz",
"google": "Google",
"orSignInWith": "---Veya ile giriş yap---",
"apple": "Apple",
"signInWithoutAnAccount": "Hesapsız giriş yap",
"privacyPolicy": "Gizlilik Politikası"
}
1 change: 1 addition & 0 deletions app/lib/modules/login/login.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export 'logic/login_cubit.dart';
export 'view/login_view.dart';
export 'view/sign_in_view.dart';
export 'widget/widgets.dart';
4 changes: 4 additions & 0 deletions app/lib/modules/login/view/login_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class LoginView extends StatelessWidget {
),
),
),
// You can enable it to see the SignIn page
// floatingActionButton: FloatingActionButton(
// onPressed: () => Navigator.pushNamed(context, AppRouter.signIn),
// ),
Comment on lines +27 to +30
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tam istediğim gibi teşekkürler :)

);
}
}
Expand Down
62 changes: 62 additions & 0 deletions app/lib/modules/login/view/sign_in_view.dart
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bu dosyayı henüz test etmedim, ama temiz ve iyi görünüyor. O yüzden onaylıyorum. Elinize sağlık abi.

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';

import 'package:my_quran/components/components.dart';
import 'package:my_quran/constants/contants.dart';
import 'package:my_quran/core/core.dart';
import 'package:my_quran/l10n/l10.dart';
import 'package:my_quran/theme/theme.dart';

class SignInView extends StatelessWidget {
const SignInView({super.key});

@override
Widget build(BuildContext context) {
return Scaffold(
body: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 25, vertical: 20),
child: Assets.images.splash.image(),
),
const SizedBox(height: 12),
Text(context.l10n.welcome, style: context.titleLarge!.copyWith(color: context.colors.primary, fontSize: 50)),
const SizedBox(height: 30),
CustomButtonWithIcon(
icon: const Icon(FontAwesomeIcons.google),
onPressed: () {},
text: context.l10n.google,
),
const SizedBox(height: 30),
Text(
context.l10n.orSignInWith,
textAlign: TextAlign.center,
style: context.bodyLarge!.copyWith(color: context.colors.shadow, fontSize: 17),
),
const SizedBox(height: 33),
CustomButtonWithIcon(
icon: const Icon(FontAwesomeIcons.apple),
onPressed: () {},
text: context.l10n.apple,
),
const SizedBox(height: 90),
CustomButton(onPressed: () {}, text: context.l10n.signInWithoutAnAccount),
const Spacer(),
TextButton(
onPressed: () => AppLaunch.launchURL(ApiConst.provicyPolicy),
child: Text(
context.l10n.privacyPolicy,
style: context.bodyLarge!.copyWith(
color: context.colors.primary,
decoration: TextDecoration.underline,
),
),
),
const SizedBox(height: 20),
],
),
);
}
}
8 changes: 8 additions & 0 deletions app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
font_awesome_flutter:
dependency: "direct main"
description:
name: font_awesome_flutter
sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206"
url: "https://pub.dev"
source: hosted
version: "10.4.0"
frontend_server_client:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies:
url_launcher: ^6.1.11
json_annotation: ^4.8.1
google_fonts: ^5.0.0
font_awesome_flutter: ^10.4.0
mq_storage:
path: ../packages/mq_storage/
# flutter_native_splash: ^2.2.18
Expand Down