Skip to content

Commit 7e3b5a4

Browse files
refactor: changed functions to private
1 parent f2ae2d9 commit 7e3b5a4

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

lib/android.dart

+21-16
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void createDefaultIcons(Map<String, dynamic> flutterLauncherIconsConfig, String?
4343
isAndroidIconNameCorrectFormat(iconName);
4444
final String iconPath = '$iconName.png';
4545
for (AndroidIconTemplate template in androidIcons) {
46-
saveNewImages(template, image, iconPath, flavor);
46+
_saveNewImages(template, image, iconPath, flavor);
4747
}
4848
overwriteAndroidManifestWithNewLauncherIcon(iconName, androidManifestFile);
4949
} else {
@@ -82,7 +82,7 @@ void createAdaptiveIcons(Map<String, dynamic> flutterLauncherIconsConfig, String
8282

8383
// Create adaptive icon background
8484
if (isAdaptiveIconConfigPngFile(backgroundConfig)) {
85-
createAdaptiveBackgrounds(flutterLauncherIconsConfig, backgroundConfig, flavor);
85+
_createAdaptiveBackgrounds(flutterLauncherIconsConfig, backgroundConfig, flavor);
8686
} else {
8787
createAdaptiveIconMipmapXmlFile(flutterLauncherIconsConfig, flavor);
8888
updateColorsXmlFile(backgroundConfig, flavor);
@@ -127,8 +127,11 @@ void createAdaptiveIconMipmapXmlFile(Map<String, dynamic> flutterLauncherIconsCo
127127
}
128128

129129
/// creates adaptive background using png image
130-
void createAdaptiveBackgrounds(
131-
Map<String, dynamic> yamlConfig, String adaptiveIconBackgroundImagePath, String? flavor) {
130+
void _createAdaptiveBackgrounds(
131+
Map<String, dynamic> yamlConfig,
132+
String adaptiveIconBackgroundImagePath,
133+
String? flavor,
134+
) {
132135
final String filePath = adaptiveIconBackgroundImagePath;
133136
final Image? image = decodeImageFile(filePath);
134137
if (image == null) {
@@ -138,7 +141,7 @@ void createAdaptiveBackgrounds(
138141
// creates a png image (ic_adaptive_background.png) for the adaptive icon background in each of the locations
139142
// it is required
140143
for (AndroidIconTemplate androidIcon in adaptiveForegroundIcons) {
141-
saveNewImages(androidIcon, image, constants.androidAdaptiveBackgroundFileName, flavor);
144+
_saveNewImages(androidIcon, image, constants.androidAdaptiveBackgroundFileName, flavor);
142145
}
143146

144147
// Creates the xml file required for the adaptive launcher icon
@@ -225,7 +228,7 @@ void overwriteExistingIcons(
225228
/// Saves new launcher icons to the project, keeping the old launcher icons.
226229
/// Note: Do not change interpolation unless you end up with better results
227230
/// https://github.com/fluttercommunity/flutter_launcher_icons/issues/101#issuecomment-495528733
228-
void saveNewImages(AndroidIconTemplate template, Image image, String iconFilePath, String? flavor) {
231+
void _saveNewImages(AndroidIconTemplate template, Image image, String iconFilePath, String? flavor) {
229232
final Image newFile = createResizedImage(template.size, image);
230233
File(constants.androidResFolder(flavor) + template.directoryName + '/' + iconFilePath)
231234
.create(recursive: true)
@@ -241,12 +244,12 @@ void saveNewImages(AndroidIconTemplate template, Image image, String iconFilePat
241244
Future<void> overwriteAndroidManifestWithNewLauncherIcon(String iconName, File androidManifestFile) async {
242245
// we do not use `file.readAsLinesSync()` here because that always gets rid of the last empty newline
243246
final List<String> oldManifestLines = (await androidManifestFile.readAsString()).split('\n');
244-
final List<String> transformedLines = transformAndroidManifestWithNewLauncherIcon(oldManifestLines, iconName);
247+
final List<String> transformedLines = _transformAndroidManifestWithNewLauncherIcon(oldManifestLines, iconName);
245248
await androidManifestFile.writeAsString(transformedLines.join('\n'));
246249
}
247250

248251
/// Updates only the line containing android:icon with the specified iconName
249-
List<String> transformAndroidManifestWithNewLauncherIcon(List<String> oldManifestLines, String iconName) {
252+
List<String> _transformAndroidManifestWithNewLauncherIcon(List<String> oldManifestLines, String iconName) {
250253
return oldManifestLines.map((String line) {
251254
if (line.contains('android:icon')) {
252255
// Using RegExp replace the value of android:icon to point to the new icon
@@ -274,13 +277,15 @@ int? minSdk() {
274277
final androidLocalPropertiesFile = File(constants.androidLocalPropertiesFile);
275278

276279
// looks for minSdk value in build.gradle, flutter.gradle & local.properties.
277-
return getMinSdkFlutterGradle(androidLocalPropertiesFile) ??
278-
getMinSdkFromFile(androidGradleFile) ??
279-
getMinSdkFromFile(androidLocalPropertiesFile);
280+
// this should always be order
281+
// first check build.gradle, then local.properties, then flutter.gradle
282+
return _getMinSdkFromFile(androidGradleFile) ??
283+
_getMinSdkFromFile(androidLocalPropertiesFile) ??
284+
_getMinSdkFlutterGradle(androidLocalPropertiesFile);
280285
}
281286

282287
/// Retrieves the minSdk value from [File]
283-
int? getMinSdkFromFile(File file) {
288+
int? _getMinSdkFromFile(File file) {
284289
final List<String> lines = file.readAsLinesSync();
285290
for (String line in lines) {
286291
if (line.contains('minSdkVersion')) {
@@ -297,9 +302,9 @@ int? getMinSdkFromFile(File file) {
297302
return null; // Didn't find minSdk, assume the worst
298303
}
299304

300-
/// A helper function to [getMinSdkFlutterGradle]
305+
/// A helper function to [_getMinSdkFlutterGradle]
301306
/// which retrives value of `flutter.sdk` from `local.properties` file
302-
String? getFlutterSdkPathFromLocalProperties(File file) {
307+
String? _getFlutterSdkPathFromLocalProperties(File file) {
303308
final List<String> lines = file.readAsLinesSync();
304309
for (String line in lines) {
305310
if (!line.contains('flutter.sdk=')) {
@@ -318,8 +323,8 @@ String? getFlutterSdkPathFromLocalProperties(File file) {
318323
}
319324

320325
/// Retrives value of `minSdkVersion` from `flutter.gradle`
321-
int? getMinSdkFlutterGradle(File localPropertiesFile) {
322-
final flutterRoot = getFlutterSdkPathFromLocalProperties(localPropertiesFile);
326+
int? _getMinSdkFlutterGradle(File localPropertiesFile) {
327+
final flutterRoot = _getFlutterSdkPathFromLocalProperties(localPropertiesFile);
323328
if (flutterRoot == null) {
324329
return null;
325330
}

0 commit comments

Comments
 (0)