Skip to content

Commit fe783f0

Browse files
WishyutCpkongkha
WishyutC
authored and
pkongkha
committed
fix quality check
1 parent 477f4e9 commit fe783f0

20 files changed

Lines changed: 343 additions & 232 deletions

‎lib/design/colors.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ final ThemeData darkTheme = ThemeData(
2525
final LinearGradient mainGradient = LinearGradient(
2626
colors: [Color(0xFF00C6FB), Color(0xFF005BEA)],
2727
begin: Alignment.topCenter,
28-
end: Alignment.bottomCenter
28+
end: Alignment.bottomCenter,
2929
);

‎lib/design/custom_icons.dart‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ class CustomIcons {
66
static const _kFontFam = 'CustomIcons';
77
static const String? _kFontPkg = null;
88

9-
static const IconData ping = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
10-
static const IconData download = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg);
11-
static const IconData upload = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg);
9+
static const IconData ping = IconData(
10+
0xe800,
11+
fontFamily: _kFontFam,
12+
fontPackage: _kFontPkg,
13+
);
14+
static const IconData download = IconData(
15+
0xe801,
16+
fontFamily: _kFontFam,
17+
fontPackage: _kFontPkg,
18+
);
19+
static const IconData upload = IconData(
20+
0xe802,
21+
fontFamily: _kFontFam,
22+
fontPackage: _kFontPkg,
23+
);
1224
}

‎lib/design/dimensions.dart‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CustomString {
2424
return _localized('disconnecting');
2525
}
2626

27-
String get All_app{
27+
String get All_app {
2828
return _localized('all_apps');
2929
}
3030

@@ -37,18 +37,14 @@ class CustomString {
3737
'connecting': 'ПОДКЛЮЧЕНИЕ',
3838
'disconnecting': 'ОТКЛЮЧЕНИЕ',
3939
"all_apps": "Все приложения",
40-
41-
4240
}[key]!;
4341
case 'th':
44-
return{
42+
return {
4543
"connected": "เชื่อมต่อแล้ว",
4644
"disconnected": "ไม่ได้เชื่อมต่อ",
4745
"connecting": "กำลังเชื่อมต่อ",
4846
"disconnecting": "กำลังตัดการเชื่อมต่อ",
4947
"all_apps": "แอปทั้งหมด",
50-
51-
5248
}[key]!;
5349
case 'en':
5450
default:
@@ -58,11 +54,11 @@ class CustomString {
5854
'connecting': 'CONNECTING',
5955
'disconnecting': 'DISCONNECTING',
6056
"all_apps": "All Applications",
61-
6257
}[key]!;
6358
}
6459
}
6560
}
61+
6662
// style
6763
const double elevation0 = 0;
6864

‎lib/design/images.dart‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
import 'package:flutter_svg/flutter_svg.dart';
22

33
final SvgPicture homeIcon = SvgPicture.asset('assets/images/home.svg');
4-
final SvgPicture activeHomeIcon = SvgPicture.asset('assets/images/active_home.svg');
4+
final SvgPicture activeHomeIcon = SvgPicture.asset(
5+
'assets/images/active_home.svg',
6+
);
57
final SvgPicture appIcon = SvgPicture.asset('assets/images/app.svg');
6-
final SvgPicture activeAppIcon = SvgPicture.asset('assets/images/active_app.svg');
8+
final SvgPicture activeAppIcon = SvgPicture.asset(
9+
'assets/images/active_app.svg',
10+
);
711
final SvgPicture serverIcon = SvgPicture.asset('assets/images/server.svg');
8-
final SvgPicture activeServerIcon = SvgPicture.asset('assets/images/active_server.svg');
12+
final SvgPicture activeServerIcon = SvgPicture.asset(
13+
'assets/images/active_server.svg',
14+
);
915
final SvgPicture settingsIcon = SvgPicture.asset('assets/images/settings.svg');
1016
final SvgPicture speedIcon = SvgPicture.asset('assets/images/speed.svg');
11-
final SvgPicture deFlag = SvgPicture.asset('assets/images/de.svg');
17+
final SvgPicture deFlag = SvgPicture.asset('assets/images/de.svg');

‎lib/main.dart‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ void main() {
2020
class App extends StatelessWidget {
2121
const App({super.key});
2222

23-
24-
2523
@override
2624
Widget build(BuildContext context) {
2725
final themeProvider = Provider.of<ThemeProvider>(context);
2826

29-
var language = const Locale('th');//<-- You can change language here manually
27+
var language = const Locale(
28+
'th',
29+
); //<-- You can change language here manually
3030

3131
return MaterialApp(
3232
debugShowCheckedModeBanner: false,
@@ -37,19 +37,13 @@ class App extends StatelessWidget {
3737
themeMode: themeProvider.themeMode,
3838
home: const MainScreen(),
3939

40-
4140
localizationsDelegates: const [
4241
AppLocalizations.delegate,
4342
GlobalMaterialLocalizations.delegate,
4443
GlobalWidgetsLocalizations.delegate,
4544
GlobalCupertinoLocalizations.delegate,
4645
],
47-
supportedLocales: const [
48-
Locale('en'),
49-
Locale('ru'),
50-
Locale('th'),
51-
52-
],
46+
supportedLocales: const [Locale('en'), Locale('ru'), Locale('th')],
5347
);
5448
}
5549
}

‎lib/nav_bar.dart‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ class NavBarState extends State<NavBar> {
5858
return GestureDetector(
5959
onTap: () => _onItemTapped(index),
6060
child: SizedBox(
61-
width: (MediaQuery.of(context).size.width-60)/5,
62-
child: AnimatedContainer(
63-
duration: const Duration(milliseconds: 200),
64-
curve: Curves.easeInOut,
65-
padding: const EdgeInsets.all(8),
66-
child: isActive ? _activeIcons[index] : _inactiveIcons[index],
67-
),)
61+
width: (MediaQuery.of(context).size.width - 60) / 5,
62+
child: AnimatedContainer(
63+
duration: const Duration(milliseconds: 200),
64+
curve: Curves.easeInOut,
65+
padding: const EdgeInsets.all(8),
66+
child: isActive ? _activeIcons[index] : _inactiveIcons[index],
67+
),
68+
),
6869
);
6970
}),
7071
),

‎lib/pages/apps/apps_list.dart‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ class AppsListState extends State<AppsList> {
3636
bool _initialized = false;
3737

3838
@override
39-
void didChangeDependencies() {
40-
super.didChangeDependencies();
41-
if (!_initialized) {
42-
final statusText = CustomString(context);
43-
Text_All_Apps = statusText.All_app;
44-
_loadApps();
45-
_initialized = true;
46-
}
47-
39+
void didChangeDependencies() {
40+
super.didChangeDependencies();
41+
if (!_initialized) {
42+
final statusText = CustomString(context);
43+
Text_All_Apps = statusText.All_app;
44+
_loadApps();
45+
_initialized = true;
46+
}
4847
}
4948

5049
@override
@@ -63,7 +62,6 @@ class AppsListState extends State<AppsList> {
6362
setState(() {
6463
_isLoading = true;
6564
});
66-
6765

6866
try {
6967
List<Map<String, dynamic>> appsList = [

‎lib/pages/apps/apps_list_item.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ class AppListItem extends StatelessWidget {
8383
child: CupertinoSwitch(
8484
value: isActive,
8585
onChanged: null,
86-
inactiveTrackColor: Theme.of(context).colorScheme.onSecondary,
86+
inactiveTrackColor:
87+
Theme.of(context).colorScheme.onSecondary,
8788
),
8889
)
8990
: Checkbox(

‎lib/pages/apps/apps_list_item.dart.orig‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ class AppListItem extends StatelessWidget {
3939
BoxShadow(
4040
<<<<<<< HEAD
4141
color: Colors.grey.withValues(alpha: 0.2),
42-
||||||| parent of c1ee28a (Add localized support and clean up with flutter analyze)
43-
color: Colors.grey.withOpacity(0.2),
44-
=======
42+
||||||| parent of f5f79a8 (fix quality check)
4543
color: Colors.grey.withAlpha((255 * 0.2).toInt()),
46-
>>>>>>> c1ee28a (Add localized support and clean up with flutter analyze)
44+
=======
45+
color: Colors.grey.withAlpha((255 * 0.2).toInt()),
46+
>>>>>>> f5f79a8 (fix quality check)
4747
blurRadius: 10,
4848
offset: const Offset(0, 1),
4949
),
@@ -89,7 +89,8 @@ class AppListItem extends StatelessWidget {
8989
child: CupertinoSwitch(
9090
value: isActive,
9191
onChanged: null,
92-
inactiveTrackColor: Theme.of(context).colorScheme.onSecondary,
92+
inactiveTrackColor:
93+
Theme.of(context).colorScheme.onSecondary,
9394
),
9495
)
9596
: Checkbox(
@@ -120,11 +121,11 @@ class AppListItem extends StatelessWidget {
120121
decoration: BoxDecoration(
121122
<<<<<<< HEAD
122123
color: Colors.grey.withValues(alpha: 0.4),
123-
||||||| parent of c1ee28a (Add localized support and clean up with flutter analyze)
124-
color: Colors.grey.withOpacity(0.4),
125-
=======
124+
||||||| parent of f5f79a8 (fix quality check)
126125
color: Colors.grey.withAlpha((255 * 0.2).toInt()),
127-
>>>>>>> c1ee28a (Add localized support and clean up with flutter analyze)
126+
=======
127+
color: Colors.grey.withAlpha((255 * 0.2).toInt()),
128+
>>>>>>> f5f79a8 (fix quality check)
128129
borderRadius: BorderRadius.circular(10),
129130
),
130131
),

‎lib/pages/apps/apps_page.dart‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import 'package:vpn_client/pages/apps/apps_list.dart';
33
import 'package:vpn_client/search_dialog.dart';
44
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
55

6-
7-
86
class AppsPage extends StatefulWidget {
97
const AppsPage({super.key});
108

@@ -20,7 +18,11 @@ class AppsPageState extends State<AppsPage> {
2018
final updatedApps = await showDialog<List<Map<String, dynamic>>>(
2119
context: context,
2220
builder: (BuildContext context) {
23-
return SearchDialog(placeholder: AppLocalizations.of(context)!.app_name , items: _apps, type: 1,);
21+
return SearchDialog(
22+
placeholder: AppLocalizations.of(context)!.app_name,
23+
items: _apps,
24+
type: 1,
25+
);
2426
},
2527
);
2628

@@ -74,4 +76,4 @@ class AppsPageState extends State<AppsPage> {
7476
),
7577
);
7678
}
77-
}
79+
}

0 commit comments

Comments
 (0)