Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
mo7amedaliEbaid committed Oct 3, 2023
1 parent 2502ed8 commit f03ea1a
Show file tree
Hide file tree
Showing 71 changed files with 34 additions and 2,890 deletions.
2 changes: 1 addition & 1 deletion lib/config/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'ui.dart';
import 'ui_props.dart';
import 'app_theme.dart';

class App {
sealed class App {
static bool? isLtr;
static bool showAds = false;

Expand Down
5 changes: 3 additions & 2 deletions lib/config/app_core_theme.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';

class AppCoreTheme {
part of 'app_theme.dart';

interface class AppCoreTheme {
Color? primary;
Color? primaryLight;
Color? primaryDark;
Expand Down
2 changes: 1 addition & 1 deletion lib/config/app_dimensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'dart:ui' as ui;
import 'ui.dart';

class AppDimensions {
sealed class AppDimensions {
static double? maxContainerWidth;
static double? miniContainerWidth;

Expand Down
5 changes: 3 additions & 2 deletions lib/config/app_theme.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'package:flutter/material.dart';

import 'app_core_theme.dart';
part 'app_core_theme.dart';
part 'core_theme.dart';

class AppTheme {
sealed class AppTheme {
static final _core = AppCoreTheme(
primary: const Color(0xff5BA897),
primaryDark: const Color(0xff46536D),
Expand Down
4 changes: 2 additions & 2 deletions lib/config/app_typography.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';

import 'app_dimensions.dart';
import 'core_theme.dart';
import 'app_theme.dart';

class AppText {
sealed class AppText {
static TextStyle? btn;

// Headings
Expand Down
2 changes: 0 additions & 2 deletions lib/config/configs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ export 'space.dart';
export 'space_ext.dart';
export 'ui.dart';

export 'core_theme.dart' show fontFamily;
export 'date_ext.dart';
export 'routes.dart';
3 changes: 1 addition & 2 deletions lib/config/core_theme.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';

import 'app_theme.dart';
part of 'app_theme.dart';

const fontFamily = '';

Expand Down
2 changes: 1 addition & 1 deletion lib/config/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import '../features/articles/presentation/pages/bookmarked_article/bookmarked_ar
import '../features/articles/presentation/pages/home/news.dart';


class AppRoutes {
sealed class AppRoutes {
static Route onGenerateRoutes(RouteSettings settings) {
switch (settings.name) {
case '/':
Expand Down
2 changes: 1 addition & 1 deletion lib/config/space.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'ui.dart';
import 'app_dimensions.dart';

class Space {
sealed class Space {
static Widget? x;
static Widget? y;
static Widget? x1;
Expand Down
2 changes: 1 addition & 1 deletion lib/config/ui.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:math';
import 'package:flutter/widgets.dart';

class UI {
sealed class UI {
static MediaQueryData? _mediaQueryData;
static double? width;
static double? height;
Expand Down
14 changes: 9 additions & 5 deletions lib/core/consts/consts.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import 'package:news_clean_arch_bloc/apikey.dart';

const String BASEURL = 'https://newsapi.org/v2';
const String APIKEY = MYAPIKEY;
const String COUNTRY = 'us';
const String CATEGORY = 'general';
const String kDefaultImage = "https://cdn.pixabay.com/photo/2015/02/15/09/33/news-636978_1280.jpg";
sealed class APPCONSTS {

static const String BASEURL = 'https://newsapi.org/v2';
static const String APIKEY = MYAPIKEY;
static const String COUNTRY = 'us';
static const String CATEGORY = 'general';
static const String kDefaultImage =
"https://cdn.pixabay.com/photo/2015/02/15/09/33/news-636978_1280.jpg";
}

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

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:dio/dio.dart';
import '../../models/article.dart';
part 'news_api_service.g.dart';

@RestApi(baseUrl:BASEURL)
@RestApi(baseUrl:APPCONSTS.BASEURL)
abstract class NewsApiService {
factory NewsApiService(Dio dio) = _NewsApiService;

Expand Down
3 changes: 2 additions & 1 deletion lib/features/articles/data/models/article.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import '../../../../core/consts/consts.dart';
import '../../domain/entities/article.dart';

@Entity(tableName: 'article',primaryKeys: ['id'])

interface class ArticleModel extends ArticleEntity {
const ArticleModel({
int? id,
Expand Down Expand Up @@ -30,7 +31,7 @@ interface class ArticleModel extends ArticleEntity {
title: map['title'] ?? "",
description: map['description'] ?? "",
url: map['url'] ?? "",
urlToImage: map['urlToImage'] != null && map['urlToImage'] != "" ? map['urlToImage'] : kDefaultImage,
urlToImage: map['urlToImage'] != null && map['urlToImage'] != "" ? map['urlToImage'] : APPCONSTS.kDefaultImage,
publishedAt: map['publishedAt'] ?? "",
content: map['content'] ?? "",
);
Expand Down
6 changes: 3 additions & 3 deletions lib/features/articles/data/repository/article_repo_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ interface class ArticleRepoImpl implements ArticleRepository {
Future<DataState<List<ArticleModel>>> getArticles() async {
try {
final httpResponse = await _newsApiService.getArticles(
apiKey:APIKEY,
country:COUNTRY,
category:CATEGORY,
apiKey:APPCONSTS.APIKEY,
country:APPCONSTS.COUNTRY,
category:APPCONSTS.CATEGORY,
);

if (httpResponse.response.statusCode == HttpStatus.ok) {
Expand Down
3 changes: 1 addition & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:news_clean_arch_bloc/config/core_theme.dart'as theme;
import 'package:news_clean_arch_bloc/config/app_theme.dart'as theme;

import 'config/routes.dart';
import 'features/articles/presentation/bloc/article/remote/remote_article_bloc.dart';
Expand All @@ -23,7 +23,6 @@ class MyApp extends StatelessWidget {
create: (context) => sl()..add(const GetArticleEvent()),
child: MaterialApp(
debugShowCheckedModeBanner: false,
themeMode: ThemeMode.light,
theme: theme.themeLight,
onGenerateRoute: AppRoutes.onGenerateRoutes,
home: const NewsPage()
Expand Down
1 change: 0 additions & 1 deletion linux/.gitignore

This file was deleted.

139 changes: 0 additions & 139 deletions linux/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit f03ea1a

Please sign in to comment.