Skip to content

Commit 9b142b0

Browse files
SL-PirateSL-Pirate
authored
Merge pull request #26 from SL-Pirate/dev
refactoring and styling improvements
2 parents a7dcc8b + 40be7bf commit 9b142b0

27 files changed

+331
-207
lines changed

‎client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

-33 Bytes
Loading

‎client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png

-53 Bytes
Loading

‎client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

-56 Bytes
Loading

‎client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

-9 Bytes
Loading

‎client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

-483 Bytes
Loading

‎client/assets/img/logo.png

-15.9 KB
Loading

‎client/lib/widgets/channel_label.dart ‎client/lib/components/channel_label.dart

+8-6
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,26 @@ class ChannelLabel extends StatelessWidget {
1414
future: searchResultModel.channelThumbnailProvider,
1515
builder: (context, snap) {
1616
return CircleAvatar(
17-
radius: 10.5,
17+
radius: Styles.of(context).isMobile ? 12.58 : 15,
1818
backgroundColor: Styles.white,
1919
backgroundImage: snap.data,
20-
child: snap.data == null ? const Center(
20+
child: snap.data == null ? Center(
2121
child: Icon(
2222
Icons.person,
23-
size: 12.58,
23+
size: Styles.of(context).isMobile ? 12.58 : 15,
2424
)
2525
) : null,
2626
);
2727
}
2828
),
29-
const SizedBox(width: 10,),
29+
const SizedBox(
30+
width: 10,
31+
),
3032
Expanded(
3133
child: Text(
3234
searchResultModel.channelName,
33-
style: const TextStyle(
34-
fontSize: 10,
35+
style: TextStyle(
36+
fontSize: Styles.of(context).fontSizeSmall,
3537
fontWeight: FontWeight.bold,
3638
color: Styles.white,
3739
fontFamily: Styles.fontFamily

‎client/lib/components/download_section.dart

+21-12
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ class _DownloadSectionState extends State<DownloadSection> {
3939
SizedBox(
4040
width: double.infinity,
4141
child: Text(
42-
(type == DownloadType.video)
43-
? "Resolution"
44-
: "Bitrate",
45-
style: const TextStyle(
46-
fontSize: 15,
42+
"Select ${
43+
(type == DownloadType.video)
44+
? "Resolution"
45+
: "Bitrate"
46+
}",
47+
style: TextStyle(
48+
fontSize: Styles.of(context).subtitleFontSize,
4749
fontFamily: Styles.fontFamily,
50+
fontWeight: FontWeight.bold,
4851
color: Styles.white
4952
),
5053
),
@@ -55,6 +58,7 @@ class _DownloadSectionState extends State<DownloadSection> {
5558
children: [
5659
Expanded(
5760
child: Container(
61+
height: 40,
5862
margin: const EdgeInsets.only(right: 22),
5963
padding: const EdgeInsets.only(left: 15),
6064
decoration: BoxDecoration(
@@ -65,11 +69,15 @@ class _DownloadSectionState extends State<DownloadSection> {
6569
value: type == DownloadType.video
6670
? widget.videoResolution.value : audioQuality,
6771
isExpanded: true,
68-
style: const TextStyle(
72+
style: TextStyle(
6973
color: Styles.black,
70-
fontSize: 12,
74+
fontSize: Styles.of(context).bodyFontSize,
7175
fontFamily: Styles.fontFamily
7276
),
77+
icon: const Padding(
78+
padding: EdgeInsets.only(right: 8.0),
79+
child: Icon(Icons.arrow_drop_down),
80+
),
7381
underline: const SizedBox(),
7482
items: () {
7583
List<DropdownMenuItem> entries = [
@@ -82,8 +90,12 @@ class _DownloadSectionState extends State<DownloadSection> {
8290
)
8391
];
8492
entries.sort((a, b) {
85-
int? aQuality = int.tryParse(a.value.replaceAll(RegExp(r'(p|kbps)$'), ''));
86-
int? bQuality = int.tryParse(b.value.replaceAll(RegExp(r'(p|kbps)$'), ''));
93+
int? aQuality = int.tryParse(
94+
a.value.replaceAll(RegExp(r'(p|kbps)$'), '')
95+
);
96+
int? bQuality = int.tryParse(
97+
b.value.replaceAll(RegExp(r'(p|kbps)$'), '')
98+
);
8799

88100
if (aQuality == null || bQuality == null) {
89101
return 0;
@@ -102,9 +114,6 @@ class _DownloadSectionState extends State<DownloadSection> {
102114
else {
103115
audioQuality = selection;
104116
}
105-
106-
// // preventing sending requests when usr has not requested a video
107-
// widget.onDownload(type, selection);
108117
},
109118
),
110119
),

‎client/lib/widgets/search_result_widget.dart ‎client/lib/components/search_result_component.dart

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import 'package:html_unescape/html_unescape.dart';
33
import 'package:ytd_web/util/api.dart';
44
import 'package:ytd_web/modals/search_result_model.dart';
55
import 'package:ytd_web/util/styles.dart';
6-
import 'package:ytd_web/widgets/channel_label.dart';
6+
import 'package:ytd_web/components/channel_label.dart';
77

8-
class SearchResultWidget extends StatelessWidget {
8+
class SearchResultComponent extends StatelessWidget {
99
final SearchResultModel searchResultModel;
10-
const SearchResultWidget(this.searchResultModel, {super.key});
10+
const SearchResultComponent(this.searchResultModel, {super.key});
1111

1212
@override
1313
Widget build(BuildContext context) {
1414
return Row(
1515
children: [
1616
SizedBox(
17-
width: 186,
18-
height: 109,
17+
width: Styles.of(context).isMobile ? 186 : 444,
18+
height: Styles.of(context).isMobile ? 109: 241,
1919
child: FutureBuilder(
2020
future: searchResultModel.thumbnail,
2121
builder: (context, snapshot) {
@@ -32,21 +32,21 @@ class SearchResultWidget extends StatelessWidget {
3232
}
3333
),
3434
),
35-
const SizedBox(width: 10,),
35+
SizedBox(width: Styles.of(context).isMobile ? 10 : 16),
3636
Expanded(
3737
child: Column(
3838
crossAxisAlignment: CrossAxisAlignment.start,
3939
children: [
4040
Text(
4141
HtmlUnescape().convert(searchResultModel.title),
42-
style: const TextStyle(
43-
fontSize: 12,
42+
style: TextStyle(
43+
fontSize: Styles.of(context).subtitleFontSize,
4444
fontWeight: FontWeight.bold,
4545
color: Styles.white,
4646
fontFamily: Styles.fontFamily
4747
)
4848
),
49-
const SizedBox(height: 18,),
49+
SizedBox(height: Styles.of(context).isMobile ? 15 : 20,),
5050
ChannelLabel(searchResultModel: searchResultModel)
5151
],
5252
),

‎client/lib/screens/base_frame.dart

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import 'package:flutter/material.dart';
2+
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
3+
import 'package:url_launcher/url_launcher.dart';
24
import 'package:ytd_web/util/styles.dart';
5+
import 'package:ytd_web/widgets/generic_button.dart';
36

47
class BaseFrame extends StatelessWidget {
58
final Widget child;
@@ -25,6 +28,23 @@ class BaseFrame extends StatelessWidget {
2528
child: Row(
2629
mainAxisAlignment: MainAxisAlignment.spaceBetween,
2730
children: [
31+
Padding(
32+
padding: const EdgeInsets.all(20.0),
33+
child: InkWell(
34+
onTap: () {
35+
launchUrl(
36+
Uri.parse(
37+
"https://www.github.com/SL-Pirate/ytd-web"
38+
)
39+
);
40+
},
41+
child: const Icon(
42+
FontAwesomeIcons.github,
43+
color: Styles.white,
44+
size: 35,
45+
),
46+
),
47+
),
2848
Padding(
2949
padding: const EdgeInsets.all(20.0),
3050
child: Image.asset(
@@ -41,18 +61,7 @@ class BaseFrame extends StatelessWidget {
4161
color: Styles.red,
4262
borderRadius: BorderRadius.all(Radius.circular(5))
4363
),
44-
child: TextButton(
45-
onPressed: () {},
46-
child: const Text(
47-
"Log In",
48-
style: TextStyle(
49-
color: Styles.white,
50-
fontSize: 12,
51-
fontFamily: Styles.fontFamily,
52-
fontWeight: FontWeight.bold
53-
),
54-
),
55-
),
64+
child: const GenericButton("Log In"),
5665
)
5766
],
5867
),
@@ -73,10 +82,10 @@ class BaseFrame extends StatelessWidget {
7382
child: Center(
7483
child: Text(
7584
"Copyright © ${DateTime.now().year} $product. "
76-
"All Rights Reserved",
85+
"All Rights Reserved.",
7786
style: TextStyle(
7887
color: Styles.grey.withOpacity(0.5),
79-
fontSize: 12,
88+
fontSize: Styles.of(context).fontSizeSmall,
8089
fontFamily: Styles.fontFamily
8190
),
8291
),

0 commit comments

Comments
 (0)