Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: restructure the project based on features #32

Merged
merged 161 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
3a7f181
refactor: replace state management library
BBarisKilic Dec 3, 2023
96efdaf
refactor: replace state management library (#4)
BBarisKilic Dec 3, 2023
5b66886
refactor: update localization files
BBarisKilic Dec 31, 2023
b6d1fa4
build(deps): update dependencies
BBarisKilic Dec 31, 2023
68d3b32
refactor: update android files
BBarisKilic Dec 31, 2023
f72e9b6
refactor: update fonts in assets
BBarisKilic Dec 31, 2023
97d220e
refactor: update images in assets
BBarisKilic Dec 31, 2023
91df52e
feat: improve localization support
BBarisKilic Jan 1, 2024
347cb19
feat: change animations in more feature
BBarisKilic Jan 2, 2024
a74ab91
feat: update icon assets
BBarisKilic Jan 2, 2024
447e146
feat: create licenses folder and inject them to the project
BBarisKilic Jan 2, 2024
fdf4f65
feat: create custom app bar
BBarisKilic Jan 2, 2024
b42781c
feat: remove old video adapter
BBarisKilic Jan 2, 2024
600ea63
feat: change animations in more feature
BBarisKilic Jan 2, 2024
a98f1be
feat: add dynamic theme selection sheet
BBarisKilic Jan 6, 2024
0f8c1e8
feat: update design of the theme selection sheet
BBarisKilic Jan 6, 2024
e7e6858
refactor: update close button style in modal bottom sheet
BBarisKilic Jan 10, 2024
2641046
refactor: update icons and icon sizes
BBarisKilic Jan 11, 2024
90d3468
feat: add new translations
BBarisKilic Jan 11, 2024
b56ec14
refactor: update VideoThumbnail
BBarisKilic Jan 11, 2024
67bad2c
feat: create NoVideoWarning component
BBarisKilic Jan 11, 2024
8bb7f54
feat: add NoVideoWarning to Merge feature
BBarisKilic Jan 11, 2024
601d0c8
feat: create ControlButtons with in merge feature
BBarisKilic Jan 12, 2024
26c2e5e
refactor: rename preview feature as preview_video
BBarisKilic Jan 12, 2024
9a6b0f5
refactor: rename edit feature as merge
BBarisKilic Jan 12, 2024
9c99dc1
feat: create SelectedVideoList widget in merge feature
BBarisKilic Jan 13, 2024
4884a90
feat: add animations to merge feature
BBarisKilic Jan 13, 2024
5a45a4c
feat: add animations to preview_video feature
BBarisKilic Jan 13, 2024
498431d
feat: add logic for passing selected videos from video_preview featur…
BBarisKilic Jan 13, 2024
cd3f975
feat: change size and border radius of the VideoThumbnail
BBarisKilic Jan 14, 2024
a28cdfe
refactor: adjust spaces in merge feature
BBarisKilic Jan 14, 2024
fedddc5
refactor: update VideoPlayer widget
BBarisKilic Jan 14, 2024
32ce65d
refactor: activate video player button animation
BBarisKilic Jan 16, 2024
e10c9fa
refactor: update settings in merge feature
BBarisKilic Jan 17, 2024
7b96ccc
feat: add resolution setting to the settings in merge feature
BBarisKilic Jan 17, 2024
6fe1bf5
refactor: update VideoPlayer and AnimatedControlButton widgets
BBarisKilic Jan 18, 2024
9f8753a
refactor: add bottom padding to the VideoThumbnail
BBarisKilic Jan 18, 2024
663b72a
feat: create CustomDropdownButton widget
BBarisKilic Jan 20, 2024
5cf2aed
refactor: add assertations to the widget
BBarisKilic Jan 20, 2024
5d56977
refactor: update offset parameter of the CustomDropdownButton
BBarisKilic Jan 21, 2024
2c10138
feat: create ResolutionSelector and AspectRatioSelector widgets
BBarisKilic Jan 21, 2024
3273a27
refactor: update animations on AnimatedControlButtonController
BBarisKilic Jan 21, 2024
4efd981
feat: create SpeedSelector widget
BBarisKilic Jan 21, 2024
b158cdd
refactor: change DropdownButton with CustomDropdownButton in ThemeBot…
BBarisKilic Jan 22, 2024
d6e3cbd
feat: improve animation experience on MergePage
BBarisKilic Jan 22, 2024
b3daa18
feat: improve animation experience on PreviewVideo and More pages
BBarisKilic Jan 22, 2024
fb7bd90
feat: create new AppAnimationDuration class and use it app-wide
BBarisKilic Jan 22, 2024
adf11ad
refactor: update animation durations
BBarisKilic Mar 1, 2024
3968511
feat: add ffmpeg_kit_flutter as a dependency and remove deprecated fl…
BBarisKilic Mar 1, 2024
7233170
feat: create experimental FFmpegService to handle merge tasks
BBarisKilic Mar 1, 2024
a34f65a
refactor: update widgets
BBarisKilic Mar 1, 2024
b654e83
fix: resolve a bug caused by unformatted audios when try to merge som…
BBarisKilic Mar 5, 2024
119fbe3
build(deps): add collection as a dependency
BBarisKilic Mar 6, 2024
1dbe3b8
refactor: update SaveModalBottomSheet
BBarisKilic Mar 7, 2024
2db98fb
refactor: update Preview feature
BBarisKilic Mar 11, 2024
3384118
refactor: update Merge feature
BBarisKilic Mar 11, 2024
979370f
docs: add explanations to constants
BBarisKilic Mar 11, 2024
7a57095
docs: add explanations to extensions
BBarisKilic Mar 11, 2024
d364792
refactor: update core layer
BBarisKilic Mar 11, 2024
334a039
feat: add format config to l10 yaml file
BBarisKilic Mar 18, 2024
0d2bf62
refactor: update core layer (#10)
BBarisKilic Mar 18, 2024
96f5d64
refactor: update switch statement in AppMainColor enum
BBarisKilic Mar 19, 2024
dd33e66
refactor: organize imports in DarkAppTheme
BBarisKilic Mar 19, 2024
0f5b9cb
refactor: configure AssetPicker to localize it based on the locale of…
BBarisKilic Mar 19, 2024
66b7932
refactor: fix bug-prone logic of the asset loading process and make j…
BBarisKilic Mar 19, 2024
ebec4fb
feat: create SettingsService interface in data layer
BBarisKilic Mar 21, 2024
2f61213
feat: update SettingsService interface in data layer
BBarisKilic Mar 22, 2024
54ad2c5
feat: create data layer for merge feature
BBarisKilic Mar 23, 2024
342c592
feat: add objectbox as a dependency to project
BBarisKilic Mar 23, 2024
d4e27bd
feat: create resources in core layer to use project-wide
BBarisKilic Mar 23, 2024
65f59a8
feat: create domain layer for merge feature
BBarisKilic Mar 23, 2024
d8038dc
refactor: create SettingsModalBottomSheetCubit to reduce complexity o…
BBarisKilic Mar 24, 2024
e1a28b6
refactor: update DomainEntity
BBarisKilic Mar 24, 2024
d9163e6
refactor: update Failure class
BBarisKilic Mar 24, 2024
268dd01
refactor: update DataState class
BBarisKilic Mar 24, 2024
d8f54dc
refactor: update ObjectBox class
BBarisKilic Mar 24, 2024
60b7866
feat: complete data layer of merge feature
BBarisKilic Mar 24, 2024
b3b25ec
feat: create ThemeConfiguration entity in app domain
BBarisKilic Mar 25, 2024
7201cfc
feat: create LocalThemeConfiguration model in app data layer
BBarisKilic Mar 25, 2024
1ee4acd
feat: create ThemeConfigurationService model in app data_sources layer
BBarisKilic Mar 25, 2024
256ac1d
feat: create ThemeConfigurationRepository and its implementation in app
BBarisKilic Mar 25, 2024
4fc6fdc
feat: create use cases in app domain layer
BBarisKilic Mar 25, 2024
6119492
feat: bind domain layer with app cubit
BBarisKilic Mar 25, 2024
d04a5e4
refactor: connect theme bottom sheet directly with app cubit
BBarisKilic Mar 25, 2024
1e0cd55
refactor: make refactoring project-wide
BBarisKilic Mar 25, 2024
694585f
refactor: update data layers (#18)
BBarisKilic Mar 25, 2024
7bc1ba5
feat: update ThemeBottomSheet theme to use material you guidelines
BBarisKilic Mar 27, 2024
e9745b6
feat: update AppNavigationBar and its icons
BBarisKilic Mar 27, 2024
5a98e96
feat: update SettingsBottomSheet and SaveBottomSheet to follow materi…
BBarisKilic Mar 27, 2024
deb416d
build(deps): upgrade packages and set min dart sdk to 3.3.0
BBarisKilic Apr 5, 2024
d6d687f
refactor: removed useMaterial3 assignment from ThemeData since it is …
BBarisKilic Apr 6, 2024
f87824a
feat: add SystemUiOverlayStyle to match systemNavigationBarColor with…
BBarisKilic Apr 6, 2024
c262255
build(deps): upgrade video_player_service to version 1.1.0
BBarisKilic Apr 7, 2024
17c1e8e
feat: add NavigationConfirmDialog
BBarisKilic Apr 7, 2024
6271ffd
build: migrate from deprecated imperative apply of Flutter's Gradle p…
BBarisKilic Apr 8, 2024
bf843cf
refactor: disable preview on AssetPicker
BBarisKilic Apr 8, 2024
3ca50f8
feat: add enableProgressCallback operation to the FFmpegService
BBarisKilic Apr 9, 2024
e2b532c
refactor: apply linter rules
BBarisKilic Apr 9, 2024
75a42ef
refactor: update FFmpegService and add custom exceptions
BBarisKilic Apr 13, 2024
3d36291
docs: add documentations to the FFmpegService
BBarisKilic Apr 13, 2024
663a912
refactor: apply try-catch in FFmpeg service where necessary
BBarisKilic Apr 13, 2024
04e86a5
feat: create SaveBottomSheetCubit and its state
BBarisKilic Apr 13, 2024
4b32617
feat: connect SaveBottomSheetState with SaveBottomSheet widget
BBarisKilic Apr 13, 2024
fbe11b4
feat: add localization support for SaveBottomSheet
BBarisKilic Apr 13, 2024
c2b68b5
feat: redesign SaveBottomSheet
BBarisKilic Apr 14, 2024
4496d12
build(deps): add android_intent_plus as a dependency
BBarisKilic Apr 15, 2024
761327c
refactor: create sub-widgets for _SaveBottomSheet widget
BBarisKilic Apr 15, 2024
614af40
refactor: update SaveBottomSheetCubit
BBarisKilic Apr 15, 2024
a817909
feat: create FFmpegService package
BBarisKilic Apr 15, 2024
3812d82
build(deps): add newly created FFmpegService package as a dependency
BBarisKilic Apr 15, 2024
91586f4
build(deps): add wakelock_service as a dependency
BBarisKilic Apr 15, 2024
890865b
feat: use wakelock_service in SaveBottomSheetCubit
BBarisKilic Apr 15, 2024
f94a43f
build: create devtools_options.yaml
BBarisKilic Apr 15, 2024
2af61ee
build(deps): upgrade wakelock_service version to 1.1.0
BBarisKilic Apr 16, 2024
518dd36
refactor: update ffmpeg service (#20)
BBarisKilic Apr 16, 2024
073e82b
refactor: update components layer
BBarisKilic Apr 17, 2024
ec89ee4
refactor: remove models layer
BBarisKilic Apr 17, 2024
18a5d96
refactor: remove services layer
BBarisKilic Apr 17, 2024
8b877b8
refactor: update constants layer
BBarisKilic Apr 17, 2024
c2a36ec
refactor: update video_select feature
BBarisKilic Apr 18, 2024
c9372bd
feat: add localization support for NavigationConfirmDialog
BBarisKilic Apr 18, 2024
3382424
refactor: rename variable in AnimatedControlButton
BBarisKilic Apr 19, 2024
4bd4f5d
refactor: update MorePage
BBarisKilic Apr 19, 2024
93f60b4
refactor: add buildWhen to SelectedVideoList to prevent unnecessary r…
BBarisKilic Apr 19, 2024
c4e282e
refactor: update error feature
BBarisKilic Apr 20, 2024
e8c7edd
refactor: update widgets
BBarisKilic Apr 20, 2024
d2df807
refactor: update icons
BBarisKilic Apr 20, 2024
a77c87e
fix: resolve url parsing issue
BBarisKilic Apr 20, 2024
f0ba748
refactor: make SaveBottomSheet states better
BBarisKilic Apr 22, 2024
0909fb4
refactor: update SaveBottomSheetCubit and inject services
BBarisKilic Apr 28, 2024
0cb5f49
refactor: update CustomAppBar and add about action
BBarisKilic Apr 28, 2024
e3c344d
refactor: update AnimatedControlButton
BBarisKilic Apr 28, 2024
84b86cf
refactor: update icon colors in CustomAppBar
BBarisKilic Apr 28, 2024
24905e1
build(deps): upgrade video_player_service package version
BBarisKilic Apr 29, 2024
c70d697
refactor: update SettingsBottomSheet widget and its cubit to handle s…
BBarisKilic May 1, 2024
4f0bcda
refactor: update SettingsBottomSheetCubit to set videoAspectRatio whe…
BBarisKilic May 1, 2024
438f7ee
feat: add new merge params to the FFmpegService package
BBarisKilic May 6, 2024
1ee7664
refactor: update widget tree (#28)
BBarisKilic May 6, 2024
9d03af5
feat: extend MergePageError state and add error types etc
BBarisKilic May 7, 2024
68478d8
refactor: make error and stackTrace nullable in error state
BBarisKilic May 7, 2024
34cc990
refactor: update ErrorDialog and make parameters nullable
BBarisKilic May 7, 2024
ee8a008
feat: create MergePageListener widget to listen state changes
BBarisKilic May 7, 2024
8e53f07
feat: create SaveBottomSheetListener widget to listen state changes
BBarisKilic May 7, 2024
14e84b4
feat: create SettingsBottomSheetListener widget to listen state changes
BBarisKilic May 7, 2024
1c7be62
feat: create more states based on SettingsBottomSheetState
BBarisKilic May 7, 2024
9e9db68
refactor: handle error cases for more feature
BBarisKilic May 7, 2024
be70f14
feat: create VideoSelectPageListener to listen state changes
BBarisKilic May 7, 2024
076c3aa
feat: extend features of the FFmpegService package
BBarisKilic May 9, 2024
2d3b8bf
refactor: update error handling and resources (#29)
BBarisKilic May 9, 2024
e23def8
feat: increase limit to 4 videos for previewing and merging
BBarisKilic May 9, 2024
bf42a4a
feat: add speed adjustment option to the FFmpegService plugin
BBarisKilic May 9, 2024
a2a699d
refactor: adjust theme data of the picker
BBarisKilic May 9, 2024
223e05b
feat: create SettingsWarningDialog to warn user about outcomes of cha…
BBarisKilic May 9, 2024
85c8c07
fix: resolve audio related command issue on FFmpegService package
BBarisKilic May 10, 2024
1122b71
feat: create SaveCancellationConfirmDialog to confirm cancellation of…
BBarisKilic May 10, 2024
1a4bd10
build: update kotlin version
BBarisKilic May 10, 2024
9f50c57
feat: add support for merging four videos (#30)
BBarisKilic May 10, 2024
ce7089a
build(deps): upgrade packages and remove unnecessary dependencies
BBarisKilic May 10, 2024
d4a09b8
build(deps): upgrade packages (#31)
BBarisKilic May 10, 2024
c84ab3e
refactor: update ObjectBoxService details
BBarisKilic May 10, 2024
d779a3c
test: pass copyright header test
BBarisKilic May 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ app.*.map.json
!.idea/codeStyles/
!.idea/dictionaries/
!.idea/runConfigurations/
/.fvmrc
117 changes: 117 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,25 @@
"request": "launch",
"type": "dart",
"program": "lib/main_staging.dart",
"args": ["--flavor", "staging", "--target", "lib/main_staging.dart"]
"args": [
"--flavor",
"staging",
"--target",
"lib/main_staging.dart"
]
},
{
"name": "Launch production",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/main_production.dart",
"args": ["--flavor", "production", "--target", "lib/main_production.dart"]
"args": [
"--flavor",
"production",
"--target",
"lib/main_production.dart"
]
}
]
}
}
9 changes: 9 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
analyzer:
exclude:
- '**.freezed.dart'
- '**.g.dart'
- '**.gr.dart'
- '**.gen.dart'
- '**/app_localizations**.dart'
- '**/generated_plugin_registrant.dart'

include: package:very_good_analysis/analysis_options.5.1.0.yaml
linter:
rules:
Expand Down
23 changes: 8 additions & 15 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "kotlin-kapt"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -27,11 +29,6 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.BBKDevelopment.VMerge"
compileSdkVersion localProperties.getProperty('flutter.compileSdkVersion').toInteger()
Expand All @@ -51,10 +48,7 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.BBKDevelopment.VMerge"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger()
targetSdkVersion localProperties.getProperty('flutter.targetSdkVersion').toInteger()
versionCode flutterVersionCode.toInteger()
Expand All @@ -80,7 +74,7 @@ android {
}

flavorDimensions "default"
productFlavors {
productFlavors {
production {
dimension "default"
applicationIdSuffix ""
Expand Down Expand Up @@ -115,7 +109,6 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.github.bumptech.glide:glide:4.14.2'
kapt 'com.github.bumptech.glide:compiler:4.14.2'
}
9 changes: 8 additions & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,12 @@
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
</manifest>
29 changes: 18 additions & 11 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.BBKDevelopment.VMerge">
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
<application
android:label="${appName}"

<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />

<application
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/ic_launcher"
android:label="${appName}">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:exported="true"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
Expand Down
3 changes: 3 additions & 0 deletions android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
</manifest>
15 changes: 1 addition & 14 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand All @@ -28,4 +15,4 @@ subprojects {

tasks.register("clean", Delete) {
delete rootProject.buildDir
}
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
30 changes: 22 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()

def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.0" apply false
}

include ":app"
File renamed without changes.
3 changes: 0 additions & 3 deletions assets/images/application_logo.svg

This file was deleted.

Binary file removed assets/images/bbk_logo.png
Binary file not shown.
Loading
Loading