Skip to content

Commit 33f4188

Browse files
chore: v0.13.1
1 parent d314ca8 commit 33f4188

14 files changed

+39
-51
lines changed

bin/generate.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void _generateConfigFile(File configFile) {
8383

8484
const _configFileTemplate = '''
8585
# flutter pub run flutter_launcher_icons
86-
flutter_icons:
86+
flutter_launcher_icons:
8787
image_path: "assets/icon/icon.png"
8888
8989
android: "launcher_icon"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
flutter_icons:
1+
flutter_launcher_icons:
22
android: true
33
ios: true
44
image_path: "assets/launcher_icon/demo-icon-dev.png"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
flutter_icons:
1+
flutter_launcher_icons:
22
android: true
33
ios: true
44
image_path: "assets/launcher_icon/demo-icon-int.png"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
flutter_icons:
1+
flutter_launcher_icons:
22
android: true
33
ios: true
44
image_path: "assets/launcher_icon/demo-icon.png"

lib/android.dart

+5-11
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import 'dart:io';
44

5+
import 'package:flutter_launcher_icons/config/config.dart';
56
import 'package:flutter_launcher_icons/constants.dart';
67
import 'package:flutter_launcher_icons/constants.dart' as constants;
78
import 'package:flutter_launcher_icons/custom_exceptions.dart';
8-
import 'package:flutter_launcher_icons/config/config.dart';
99
import 'package:flutter_launcher_icons/utils.dart' as utils;
1010
import 'package:flutter_launcher_icons/xml_templates.dart' as xml_template;
1111
import 'package:image/image.dart';
@@ -95,10 +95,8 @@ void createAdaptiveIcons(
9595
utils.printStatus('Creating adaptive icons Android');
9696

9797
// Retrieve the necessary Flutter Launcher Icons configuration from the pubspec.yaml file
98-
final String? backgroundConfig =
99-
config.adaptiveIconBackground;
100-
final String? foregroundImagePath =
101-
config.adaptiveIconForeground;
98+
final String? backgroundConfig = config.adaptiveIconBackground;
99+
final String? foregroundImagePath = config.adaptiveIconForeground;
102100
if (backgroundConfig == null || foregroundImagePath == null) {
103101
throw const InvalidConfigException(errorMissingImagePath);
104102
}
@@ -161,9 +159,7 @@ void createAdaptiveIconMipmapXmlFile(
161159
) {
162160
if (config.isCustomAndroidFile) {
163161
File(
164-
constants.androidAdaptiveXmlFolder(flavor) +
165-
config.android +
166-
'.xml',
162+
constants.androidAdaptiveXmlFolder(flavor) + config.android + '.xml',
167163
).create(recursive: true).then((File adaptiveIcon) {
168164
adaptiveIcon.writeAsString(xml_template.icLauncherXml);
169165
});
@@ -205,9 +201,7 @@ void _createAdaptiveBackgrounds(
205201
// FILE LOCATED HERE: res/mipmap-anydpi/{icon-name-from-yaml-config}.xml
206202
if (config.isCustomAndroidFile) {
207203
File(
208-
constants.androidAdaptiveXmlFolder(flavor) +
209-
config.android +
210-
'.xml',
204+
constants.androidAdaptiveXmlFolder(flavor) + config.android + '.xml',
211205
).create(recursive: true).then((File adaptiveIcon) {
212206
adaptiveIcon.writeAsString(xml_template.icLauncherDrawableBackgroundXml);
213207
});

lib/ios.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import 'dart:convert';
44
import 'dart:io';
55

6+
import 'package:flutter_launcher_icons/config/config.dart';
67
import 'package:flutter_launcher_icons/constants.dart';
78
import 'package:flutter_launcher_icons/custom_exceptions.dart';
8-
import 'package:flutter_launcher_icons/config/config.dart';
99
import 'package:flutter_launcher_icons/utils.dart';
1010
import 'package:image/image.dart';
1111

lib/macos/macos_icon_generator.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ class MacOSIconGenerator extends IconGenerator {
6565
if (macOSConfig.imagePath == null && context.config.imagePath == null) {
6666
context.logger
6767
..verbose({
68-
'flutter_icons.macos.image_path': macOSConfig.imagePath,
69-
'flutter_icons.image_path': context.config.imagePath,
68+
'flutter_launcher_icons.macos.image_path': macOSConfig.imagePath,
69+
'flutter_launcher_icons.image_path': context.config.imagePath,
7070
})
7171
..error(
72-
'Missing image_path. Either provide "flutter_icons.macos.image_path" or "flutter_icons.image_path"',
72+
'Missing image_path. Either provide "flutter_launcher_icons.macos.image_path" or "flutter_launcher_icons.image_path"',
7373
);
7474

7575
return false;

lib/main.dart

+6-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import 'dart:io';
55
import 'package:args/args.dart';
66
import 'package:flutter_launcher_icons/abs/icon_generator.dart';
77
import 'package:flutter_launcher_icons/android.dart' as android_launcher_icons;
8+
import 'package:flutter_launcher_icons/config/config.dart';
89
import 'package:flutter_launcher_icons/constants.dart' as constants;
910
import 'package:flutter_launcher_icons/constants.dart';
1011
import 'package:flutter_launcher_icons/custom_exceptions.dart';
11-
import 'package:flutter_launcher_icons/config/config.dart';
1212
import 'package:flutter_launcher_icons/ios.dart' as ios_launcher_icons;
1313
import 'package:flutter_launcher_icons/logger.dart';
1414
import 'package:flutter_launcher_icons/macos/macos_icon_generator.dart';
15-
import 'package:flutter_launcher_icons/macos/macos_icon_template.dart';
1615
import 'package:flutter_launcher_icons/web/web_icon_generator.dart';
1716
import 'package:flutter_launcher_icons/windows/windows_icon_generator.dart';
1817
import 'package:path/path.dart' as path;
@@ -172,11 +171,10 @@ Config? loadConfigFileFromArgResults(
172171
ArgResults argResults,
173172
) {
174173
final String prefixPath = argResults[prefixOption];
175-
final flutterLauncherIconsConfigs =
176-
Config.loadConfigFromPath(
177-
argResults[fileOption],
178-
prefixPath,
179-
) ??
180-
Config.loadConfigFromPubSpec(prefixPath);
174+
final flutterLauncherIconsConfigs = Config.loadConfigFromPath(
175+
argResults[fileOption],
176+
prefixPath,
177+
) ??
178+
Config.loadConfigFromPubSpec(prefixPath);
181179
return flutterLauncherIconsConfigs;
182180
}

test/all_tests.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:test/test.dart';
22

33
import 'abs/icon_generator_test.dart' as icon_generator_test;
44
import 'android_test.dart' as android_test;
5-
import 'flutter_launcher_icons_config_test.dart' as fli_config;
5+
import 'config_test.dart' as fli_config;
66
import 'macos/macos_icon_generator_test.dart' as macos_icons_gen_test;
77
import 'macos/macos_icon_template_test.dart' as macos_template_test;
88
import 'main_test.dart' as main_test;

test/android_test.dart

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'dart:io';
22

33
import 'package:flutter_launcher_icons/android.dart' as android;
4-
import 'package:flutter_launcher_icons/constants.dart';
54
import 'package:flutter_launcher_icons/config/config.dart';
5+
import 'package:flutter_launcher_icons/constants.dart';
66
import 'package:test/test.dart';
77

88
// unit tests for android.dart
@@ -35,8 +35,7 @@ void main() {
3535
'ios': true
3636
};
3737
expect(
38-
Config.fromJson(flutterIconsConfig)
39-
.isCustomAndroidFile,
38+
Config.fromJson(flutterIconsConfig).isCustomAndroidFile,
4039
isFalse,
4140
);
4241

@@ -46,8 +45,7 @@ void main() {
4645
'ios': true
4746
};
4847
expect(
49-
Config.fromJson(flutterIconsNewIconConfig)
50-
.isCustomAndroidFile,
48+
Config.fromJson(flutterIconsNewIconConfig).isCustomAndroidFile,
5149
isTrue,
5250
);
5351
});
@@ -60,8 +58,7 @@ void main() {
6058
'ios': true
6159
};
6260
expect(
63-
Config.fromJson(flutterIconsNewIconConfig)
64-
.getImagePathAndroid(),
61+
Config.fromJson(flutterIconsNewIconConfig).getImagePathAndroid(),
6562
equals('assets/images/icon-android.png'),
6663
);
6764
});

test/config/test_pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dev_dependencies:
33
flutter_launcher_icons:
44
path: ../../
55

6-
flutter_icons:
6+
flutter_launcher_icons:
77
image_path: "assets/images/icon-710x599.png"
88
android: true # can specify file name here e.g. "ic_launcher"
99
ios: true # can specify file name here e.g. "My-Launcher-Icon"

test/flutter_launcher_icons_config_test.dart test/config_test.dart

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import 'package:flutter_launcher_icons/custom_exceptions.dart';
21
import 'package:flutter_launcher_icons/config/config.dart';
2+
import 'package:flutter_launcher_icons/custom_exceptions.dart';
33
import 'package:path/path.dart' as path;
44
import 'package:test/test.dart';
55
import 'package:test_descriptor/test_descriptor.dart' as d;
66

77
import './templates.dart' as templates;
88

99
void main() {
10-
group('FlutterLauncherIconsConfig', () {
10+
group('Config', () {
1111
late String prefixPath;
1212
setUpAll(() {
1313
prefixPath = path.join(d.sandbox, 'fli_test');
@@ -98,8 +98,7 @@ void main() {
9898
group('#loadConfigFromTestPubSpec', () {
9999
test('should return valid configs', () {
100100
const String path = 'test/config/test_pubspec.yaml';
101-
final configs =
102-
Config.loadConfigFromPath(path, '.');
101+
final configs = Config.loadConfigFromPath(path, '.');
103102
expect(configs, isNotNull);
104103
const String imagePath = 'assets/images/icon-710x599.png';
105104
expect(configs!.imagePath, equals(imagePath));
@@ -132,8 +131,7 @@ void main() {
132131
]).create();
133132
});
134133
test('should return valid configs', () {
135-
final configs =
136-
Config.loadConfigFromPubSpec(prefixPath);
134+
final configs = Config.loadConfigFromPubSpec(prefixPath);
137135
expect(configs, isNotNull);
138136
// android configs
139137
expect(configs!.android, isTrue);

test/main_test.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ void main() {
5454
tearDown(() {
5555
Directory.current = currentDirectory;
5656
});
57+
5758
test('default', () async {
5859
await setCurrentDirectory('default');
5960
await File('flutter_launcher_icons.yaml').writeAsString('''
60-
flutter_icons:
61+
flutter_launcher_icons:
6162
android: true
6263
ios: false
6364
''');
@@ -70,7 +71,7 @@ flutter_icons:
7071
test('default_use_pubspec', () async {
7172
await setCurrentDirectory('pubspec_only');
7273
await File('pubspec.yaml').writeAsString('''
73-
flutter_icons:
74+
flutter_launcher_icons:
7475
android: true
7576
ios: false
7677
''');
@@ -88,7 +89,7 @@ flutter_icons:
8889
test('custom', () async {
8990
await setCurrentDirectory('custom');
9091
await File('custom.yaml').writeAsString('''
91-
flutter_icons:
92+
flutter_launcher_icons:
9293
android: true
9394
ios: true
9495
''');

test/templates.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const fliConfigTemplate = r'''
2-
flutter_icons:
2+
flutter_launcher_icons:
33
android: true
44
ios: true
55
image_path: "assets/images/icon-128x128.png"
@@ -28,7 +28,7 @@ flutter_icons:
2828
const flavorFLIConfigTemplate = fliConfigTemplate;
2929

3030
const fliWebConfig = r'''
31-
flutter_icons:
31+
flutter_launcher_icons:
3232
web:
3333
generate: true
3434
image_path: "app_icon.png" # filepath
@@ -39,15 +39,15 @@ flutter_icons:
3939
''';
4040

4141
const fliWindowsConfig = r'''
42-
flutter_icons:
42+
flutter_launcher_icons:
4343
windows:
4444
generate: true
4545
image_path: "app_icon.png"
4646
icon_size: 48
4747
''';
4848

4949
const invalidfliConfigTemplate = r'''
50-
# flutter_icons
50+
# flutter_launcher_icons
5151
android: true
5252
ios: true
5353
image_path: "assets/images/icon-128x128.png"
@@ -103,7 +103,7 @@ flutter:
103103
- asset: fonts/TrajanPro_Bold.ttf
104104
weight: 700
105105
106-
flutter_icons:
106+
flutter_launcher_icons:
107107
android: true
108108
ios: true
109109
image_path: "assets/images/icon-128x128.png"
@@ -167,7 +167,7 @@ flutter:
167167
- asset: fonts/TrajanPro_Bold.ttf
168168
weight: 700
169169
170-
flutter_icons:
170+
flutter_launcher_icons:
171171
android: true
172172
invalid_indented_key_key
173173
ios: true

0 commit comments

Comments
 (0)