Skip to content

Commit 7893866

Browse files
committed
fixConflict
2 parents ed12b51 + d123982 commit 7893866

36 files changed

+68
-45
lines changed

android/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.streams.kit">
3-
3+
4+
<uses-permission android:name="android.permission.INTERNET"/>
45
<queries>
56
<provider android:authorities="com.facebook.katana.provider.PlatformProvider" />
67

@@ -11,7 +12,7 @@
1112

1213
</queries>
1314
<application
14-
android:label="StreamKit"
15+
android:label="StreamOS"
1516
android:name="${applicationName}"
1617
android:icon="@mipmap/launcher_icon">
1718
<activity
62 Bytes
Loading
20 Bytes
Loading
159 Bytes
Loading
196 Bytes
Loading
272 Bytes
Loading
-8.49 KB
Binary file not shown.

assets/icons/launcher_icon.png

268 Bytes
Loading

ios/Podfile.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ PODS:
88
- sqflite (0.0.2):
99
- Flutter
1010
- FMDB (>= 2.7.5)
11+
- url_launcher_ios (0.0.1):
12+
- Flutter
1113

1214
DEPENDENCIES:
1315
- Flutter (from `Flutter`)
1416
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
1517
- sqflite (from `.symlinks/plugins/sqflite/ios`)
18+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
1619

1720
SPEC REPOS:
1821
trunk:
@@ -25,12 +28,15 @@ EXTERNAL SOURCES:
2528
:path: ".symlinks/plugins/path_provider_ios/ios"
2629
sqflite:
2730
:path: ".symlinks/plugins/sqflite/ios"
31+
url_launcher_ios:
32+
:path: ".symlinks/plugins/url_launcher_ios/ios"
2833

2934
SPEC CHECKSUMS:
3035
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
3136
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
3237
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
3338
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
39+
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
3440

3541
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
3642

10.3 KB
Loading

0 commit comments

Comments
 (0)