Skip to content

Commit ec4c969

Browse files
committed
Revert "Implement Build Flavor for Android Platform"
1 parent 214d279 commit ec4c969

22 files changed

+1049
-496
lines changed

analysis_options.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

android/app/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@ android {
5353
signingConfig signingConfigs.debug
5454
}
5555
}
56-
57-
flavorDimensions "production, development"
58-
productFlavors {
59-
production {
60-
resValue "string", "app_name", "News App"
61-
}
62-
development {
63-
resValue "string", "app_name", "dev-News App"
64-
applicationIdSuffix ".development"
65-
versionNameSuffix "-dev"
66-
}
67-
}
6856
}
6957

7058
flutter {

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
FlutterApplication and put your custom class here. -->
88
<application
99
android:name="io.flutter.app.FlutterApplication"
10-
android:label="@string/app_name"
10+
android:label="flutter_news_app"
1111
android:icon="@mipmap/ic_launcher">
1212
<activity
1313
android:name=".MainActivity"

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12+
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13+
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1214
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15+
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16+
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1317
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1418
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1519
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -23,6 +27,8 @@
2327
dstPath = "";
2428
dstSubfolderSpec = 10;
2529
files = (
30+
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
31+
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
2632
);
2733
name = "Embed Frameworks";
2834
runOnlyForDeploymentPostprocessing = 0;
@@ -33,6 +39,7 @@
3339
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3440
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3541
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
42+
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
3643
5B3FF722E95A2F7E61CC4A29 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3744
66E5B3579B8D3925846CAA9D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3845
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -41,6 +48,7 @@
4148
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4249
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4350
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
51+
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
4452
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4553
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4654
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -54,6 +62,8 @@
5462
isa = PBXFrameworksBuildPhase;
5563
buildActionMask = 2147483647;
5664
files = (
65+
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
66+
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
5767
E67F02A3DCFD50227C270464 /* Pods_Runner.framework in Frameworks */,
5868
);
5969
runOnlyForDeploymentPostprocessing = 0;
@@ -83,7 +93,9 @@
8393
9740EEB11CF90186004384FC /* Flutter */ = {
8494
isa = PBXGroup;
8595
children = (
96+
3B80C3931E831B6300D905FE /* App.framework */,
8697
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
98+
9740EEBA1CF902C7004384FC /* Flutter.framework */,
8799
9740EEB21CF90195004384FC /* Debug.xcconfig */,
88100
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
89101
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -218,30 +230,17 @@
218230
);
219231
runOnlyForDeploymentPostprocessing = 0;
220232
shellPath = /bin/sh;
221-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
233+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
222234
};
223235
5DEAE3B5ED2B6CBD3C04F985 /* [CP] Embed Pods Frameworks */ = {
224236
isa = PBXShellScriptBuildPhase;
225237
buildActionMask = 2147483647;
226238
files = (
227239
);
228240
inputPaths = (
229-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
230-
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
231-
"${PODS_ROOT}/../Flutter/Flutter.framework",
232-
"${BUILT_PRODUCTS_DIR}/flutter_stetho/flutter_stetho.framework",
233-
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
234-
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
235-
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
236241
);
237242
name = "[CP] Embed Pods Frameworks";
238243
outputPaths = (
239-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
240-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
241-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_stetho.framework",
242-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
243-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
244-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
245244
);
246245
runOnlyForDeploymentPostprocessing = 0;
247246
shellPath = /bin/sh;

lib/config/base_url_config.dart

Lines changed: 0 additions & 4 deletions
This file was deleted.

lib/config/device_utils.dart

Lines changed: 0 additions & 33 deletions
This file was deleted.

lib/config/flavor_config.dart

Lines changed: 0 additions & 68 deletions
This file was deleted.

lib/feature/presentation/page/home/home_page.dart

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/main.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:flutter_news_app/src/ui/app.dart';
3+
import 'package:flutter_stetho/flutter_stetho.dart';
4+
5+
void main() {
6+
Stetho.initialize();
7+
runApp(App());
8+
}

lib/main_development.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)