Skip to content

Commit 3a8baa4

Browse files
authored
Merge pull request #107 from CCExtractor/develop
Merge develop to master.
2 parents cc6b56c + 7566ac4 commit 3a8baa4

File tree

92 files changed

+7494
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+7494
-558
lines changed

.github/workflows/dart.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- run: flutter pub get
2222
# - run: flutter analyze
2323
- run: flutter format -n --set-exit-if-changed .
24+
- run: flutter test
2425
- run: flutter build apk
2526

2627
- uses: actions/upload-artifact@v1

android/app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,23 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
29-
28+
compileSdkVersion 33
29+
3030
defaultConfig {
3131
multiDexEnabled true
3232
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
33+
multiDexEnabled true
3334
applicationId "com.hustlecreatives.flood_mobile"
34-
minSdkVersion 19
35+
minSdkVersion 21
3536
targetSdkVersion 31
3637
versionCode flutterVersionCode.toInteger()
3738
versionName flutterVersionName
3839
}
3940

41+
dependencies {
42+
implementation 'com.android.support:multidex:1.0.3'
43+
}
44+
4045
buildTypes {
4146
release {
4247
// TODO: Add your own signing config for the release build.
@@ -48,4 +53,4 @@ android {
4853

4954
flutter {
5055
source '../..'
51-
}
56+
}
Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.hustlecreatives.flood_mobile">
2+
package="com.hustlecreatives.flood_mobile">
33

44
<uses-permission android:name="android.permission.INTERNET"/>
55
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -13,53 +13,64 @@
1313
</queries>
1414

1515
<application
16-
android:requestLegacyExternalStorage="true"
17-
android:label="Flood"
18-
android:usesCleartextTraffic="true"
19-
android:icon="@mipmap/ic_launcher">
16+
android:requestLegacyExternalStorage="true"
17+
android:label="Flood"
18+
android:usesCleartextTraffic="true"
19+
android:icon="@mipmap/ic_launcher">
2020
<provider
21-
android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
22-
android:authorities="${applicationId}.flutter_downloader.provider"
23-
android:exported="false"
24-
android:grantUriPermissions="true">
21+
android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
22+
android:authorities="${applicationId}.flutter_downloader.provider"
23+
android:exported="false"
24+
android:grantUriPermissions="true">
2525
<meta-data
26-
android:name="android.support.FILE_PROVIDER_PATHS"
27-
android:resource="@xml/provider_paths"/>
26+
android:name="android.support.FILE_PROVIDER_PATHS"
27+
android:resource="@xml/provider_paths"/>
2828
</provider>
2929
<activity
30-
android:exported="true"
31-
android:name=".MainActivity"
32-
android:launchMode="singleTop"
33-
android:theme="@style/LaunchTheme"
34-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
35-
android:hardwareAccelerated="true"
36-
android:windowSoftInputMode="adjustResize">
30+
android:exported="true"
31+
android:name=".MainActivity"
32+
android:launchMode="singleTop"
33+
android:theme="@style/LaunchTheme"
34+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
35+
android:hardwareAccelerated="true"
36+
android:windowSoftInputMode="adjustResize">
3737
<!-- Specifies an Android theme to apply to this Activity as soon as
3838
the Android process has started. This theme is visible to the user
3939
while the Flutter UI initializes. After that, this theme continues
4040
to determine the Window background behind the Flutter UI. -->
4141
<meta-data
42-
android:name="io.flutter.embedding.android.NormalTheme"
43-
android:resource="@style/NormalTheme"
44-
/>
42+
android:name="io.flutter.embedding.android.NormalTheme"
43+
android:resource="@style/NormalTheme"
44+
/>
4545
<!-- Displays an Android View that continues showing the launch screen
4646
Drawable until Flutter paints its first frame, then this splash
4747
screen fades out. A splash screen is useful to avoid any visual
4848
gap between the end of Android's launch screen and the painting of
4949
Flutter's first frame. -->
5050
<meta-data
51-
android:name="io.flutter.embedding.android.SplashScreenDrawable"
52-
android:resource="@drawable/launch_background"
53-
/>
51+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
52+
android:resource="@drawable/launch_background"
53+
/>
5454
<intent-filter>
5555
<action android:name="android.intent.action.MAIN"/>
5656
<category android:name="android.intent.category.LAUNCHER"/>
5757
</intent-filter>
58+
<intent-filter android:icon="@mipmap/ic_launcher"
59+
android:label="Flood"
60+
android:priority="1">
61+
<action android:name="android.intent.action.VIEW"/>
62+
<category android:name="android.intent.category.DEFAULT"/>
63+
<category android:name="android.intent.category.BROWSABLE"/>
64+
<data android:scheme="content" />
65+
<data android:scheme="http" />
66+
<data android:scheme="file" />
67+
<data android:mimeType="application/x-bittorrent" />
68+
</intent-filter>
5869
</activity>
5970
<!-- Don't delete the meta-data below.
6071
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
6172
<meta-data
62-
android:name="flutterEmbedding"
63-
android:value="2"/>
73+
android:name="flutterEmbedding"
74+
android:value="2"/>
6475
</application>
65-
</manifest>
76+
</manifest>
40.1 KB
Loading

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
18.1 KB
Loading
43.8 KB
Loading
52.5 KB
Loading
251 KB
Binary file not shown.
255 KB
Binary file not shown.

0 commit comments

Comments
 (0)