Skip to content
Open
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
2 changes: 1 addition & 1 deletion lib/binding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ArticleBinding implements Bindings {
@override
void dependencies() {
// TODO: implement dependencies
Get.put(ListArcticleController());
Get.put(ListArticleController());

Get.lazyPut(() => SingleArcticleController());
}
Expand Down
2 changes: 1 addition & 1 deletion lib/controller/home_screen_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class HomeScreenController extends GetxController {
getHomeItems() async {
loading.value = true;

var response = await DioSevice().getMethod(ApiConstant.getHomeItems);
var response = await DioService().getMethod(ApiConstant.getHomeItems);

if (response.statusCode == 200) {
response.data['top_visited'].forEach((element) {
Expand Down
6 changes: 3 additions & 3 deletions lib/controller/list_article_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:tec/component/api_constant.dart';
import 'package:tec/models/article_model.dart';
import 'package:tec/services/dio_service.dart';

class ListArcticleController extends GetxController {
class ListArticleController extends GetxController {
RxList<ArticleModel> articleList = RxList();
RxBool loading = false.obs;

Expand All @@ -16,7 +16,7 @@ class ListArcticleController extends GetxController {
getList() async {
loading.value = true;
//TODO get userid from getStorage ApiConstant.getArticleList+userid
var response = await DioSevice().getMethod(ApiConstant.getArticleList);
var response = await DioService().getMethod(ApiConstant.getArticleList);

if (response.statusCode == 200) {
response.data.forEach((element) {
Expand All @@ -31,7 +31,7 @@ class ListArcticleController extends GetxController {
articleList.clear();
loading.value = true;
//TODO get userid from getStorage ApiConstant.getArticleList+userid
var response = await DioSevice().getMethod(ApiConstant.baseUrl +
var response = await DioService().getMethod(ApiConstant.baseUrl +
'article/get.php?command=get_articles_with_tag_id&tag_id=$id&user_id=');

if (response.statusCode == 200) {
Expand Down
4 changes: 2 additions & 2 deletions lib/controller/register_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RegisterController extends GetxController {
'command': 'register'
};

var response = await DioSevice().postMethod(map, ApiConstant.postRsgister);
var response = await DioService().postMethod(map, ApiConstant.postRsgister);

email = emailTextEditingController.text;
userId = response.data['user_id'];
Expand All @@ -38,7 +38,7 @@ class RegisterController extends GetxController {
};

debugPrint(map.toString());
var response = await DioSevice().postMethod(map, ApiConstant.postRsgister);
var response = await DioService().postMethod(map, ApiConstant.postRsgister);
debugPrint(response.data.toString());
var status = response.data['response'];

Expand Down
2 changes: 1 addition & 1 deletion lib/controller/single_article_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SingleArcticleController extends GetxController {
'article/get.php?command=info&id=$id&user_id=$userId');
//TODO user id is hard code

var response = await DioSevice().getMethod(ApiConstant.baseUrl +
var response = await DioService().getMethod(ApiConstant.baseUrl +
'article/get.php?command=info&id=$id&user_id=$userId');

if (response.statusCode == 200) {
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class MyApp extends StatelessWidget {
binding: ArticleBinding())
],
// home: Single()
home: SplashScreen());
home: const SplashScreen());
}

ThemeData lightTheme(TextTheme textTheme) {
Expand Down
2 changes: 1 addition & 1 deletion lib/services/dio_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:dio/dio.dart';
import 'package:dio/dio.dart' as dio_service;


class DioSevice {
class DioService {
Dio dio = Dio();

Future<dynamic> getMethod(String url) async {
Expand Down
20 changes: 10 additions & 10 deletions lib/view/articel_list_sceen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ class ArticleListScreen extends StatelessWidget {
String title;
ArticleListScreen({required this.title,Key? key}) : super(key: key);

ListArcticleController listarcticleController =
Get.put(ListArcticleController());
SingleArcticleController singleArcticleController =
ListArticleController listArticleController =
Get.put(ListArticleController());
SingleArcticleController singleArticleController =
Get.put(SingleArcticleController());
@override
Widget build(BuildContext context) {
Expand All @@ -29,15 +29,15 @@ class ArticleListScreen extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: SizedBox(
child: Obx(
() => !singleArcticleController.loading.value ? ListView.builder(
() => !singleArticleController.loading.value ? ListView.builder(
scrollDirection: Axis.vertical,
itemCount: listarcticleController.articleList.length,
itemCount: listArticleController.articleList.length,
itemBuilder: ((context, index) {
return GestureDetector(
onTap: (() async{


await singleArcticleController.getArticleInfo(listarcticleController.articleList[index].id);
await singleArticleController.getArticleInfo(listArticleController.articleList[index].id);

Get.toNamed(routeSingleArticle);
}),
Expand All @@ -50,7 +50,7 @@ class ArticleListScreen extends StatelessWidget {
height: Get.height / 6,
width: Get.width / 3,
child: CachedNetworkImage(
imageUrl: listarcticleController
imageUrl: listArticleController
.articleList[index].image!,
imageBuilder: (((context, imageProvider) {
return Container(
Expand Down Expand Up @@ -82,7 +82,7 @@ class ArticleListScreen extends StatelessWidget {
SizedBox(
width: Get.width / 2,
child: Text(
listarcticleController
listArticleController
.articleList[index].title!,
overflow: TextOverflow.ellipsis,
maxLines: 2,
Expand All @@ -96,15 +96,15 @@ class ArticleListScreen extends StatelessWidget {
MainAxisAlignment.spaceBetween,
children: [
Text(
listarcticleController
listArticleController
.articleList[index].author!,
style: textTheme.caption,
),
const SizedBox(
width: 20,
),
Text(
listarcticleController
listArticleController
.articleList[index].view! +
" بازدید ",
style: textTheme.caption,
Expand Down
4 changes: 2 additions & 2 deletions lib/view/main_screen/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class HomeScreen extends StatelessWidget {
}) : super(key: key);

HomeScreenController homeScreenController = Get.put(HomeScreenController());
SingleArcticleController singleArcticleController = Get.put(SingleArcticleController());
SingleArcticleController singleArticleController = Get.put(SingleArcticleController());


final Size size;
Expand Down Expand Up @@ -80,7 +80,7 @@ class HomeScreen extends StatelessWidget {
return GestureDetector(
onTap: (() {

singleArcticleController.getArticleInfo(
singleArticleController.getArticleInfo(
homeScreenController.topVisitedList[index].id);
}),
child: Padding(
Expand Down
2 changes: 1 addition & 1 deletion lib/view/main_screen/main_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class _MainScreenState extends State<MainScreen> {
}

class BottomNavigation extends StatelessWidget {
BottomNavigation({
const BottomNavigation({
Key? key,
required this.size,
required this.bodyMargin,
Expand Down
12 changes: 6 additions & 6 deletions lib/view/single.dart
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class Single extends StatelessWidget {
));
}

Widget tags(textheme) {
Widget tags(textTheme) {
return SizedBox(
height: 35,
child: ListView.builder(
Expand All @@ -156,7 +156,7 @@ class Single extends StatelessWidget {
return GestureDetector(
onTap: () async {
var tagId = singleArcticleController.tagList[index].id!;
await Get.find<ListArcticleController>()
await Get.find<ListArticleController>()
.getArticleListWithTagsId(tagId);
String tagName = singleArcticleController.tagList[index].title!;
Get.to(ArticleListScreen(
Expand All @@ -174,7 +174,7 @@ class Single extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(8, 8, 8, 8),
child: Text(
singleArcticleController.tagList[index].title!,
style: textheme.headline2,
style: textTheme.headline2,
)),
),
),
Expand All @@ -183,7 +183,7 @@ class Single extends StatelessWidget {
);
}

Widget simmilar(textheme) {
Widget simmilar(textTheme) {
return SizedBox(
height: Get.height / 3.5,
child: ListView.builder(
Expand Down Expand Up @@ -246,14 +246,14 @@ class Single extends StatelessWidget {
Text(
singleArcticleController
.releatedList[index].author!,
style: textheme.subtitle1,
style: textTheme.subtitle1,
),
Row(
children: [
Text(
singleArcticleController
.releatedList[index].view!,
style: textheme.subtitle1,
style: textTheme.subtitle1,
),
const SizedBox(
width: 8,
Expand Down