Skip to content

Commit

Permalink
Merge branch 'flutter_app' of github.personal:Jhalakupadhyay/badgemag…
Browse files Browse the repository at this point in the history
…ic-android into flutter_app
  • Loading branch information
Jhalakupadhyay committed Nov 23, 2024
2 parents d542904 + f8ba0ae commit 9f77806
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/actions/android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ runs:
using: "composite"
steps:
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/screenshot-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
using: "composite"
steps:
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'
Expand Down
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,14 @@ updates:
interval: "daily"
- package-ecosystem: "gradle"
directory: "/android/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directories:
- "/.github/workflows"
- "/.github/actions/android"
- "/.github/actions/common"
- "/.github/actions/ios"
- "/.github/actions/screenshot-android"
schedule:
interval: "daily"
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.7.1" apply false
id "com.android.application" version "8.7.2" apply false
id "org.jetbrains.kotlin.android" version "2.0.21" apply false
}

Expand Down
8 changes: 5 additions & 3 deletions lib/view/widgets/animation_container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ class _AniContainerState extends State<AniContainer> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
widget.animation,
height: 30.h,
Flexible(
child: Image.asset(
widget.animation,
fit: BoxFit.contain,
),
),
Text(
widget.animationName,
Expand Down
8 changes: 5 additions & 3 deletions lib/view/widgets/effects_container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ class _EffectContainerState extends State<EffectContainer> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
widget.effect,
height: 60.h,
Flexible(
child: Image.asset(
widget.effect,
fit: BoxFit.contain,
),
),
Text(widget.effectName),
],
Expand Down
12 changes: 6 additions & 6 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@ packages:
dependency: "direct main"
description:
name: flutter_blue_plus
sha256: "160ddacb839b244f86e96fbee7e9a823e5caf1b046ccf1f0a7901f9d5aa39eb9"
sha256: d2ac9fac56c4b3b08eb68752380e2d45e64c61db629b70e61bb36c95cb65d431
url: "https://pub.dev"
source: hosted
version: "1.34.4"
version: "1.34.5"
flutter_driver:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -246,10 +246,10 @@ packages:
dependency: "direct main"
description:
name: go_router
sha256: ce89c5a993ca5eea74535f798478502c30a625ecb10a1de4d7fef5cd1bcac2a4
sha256: "8ae664a70174163b9f65ea68dd8673e29db8f9095de7b5cd00e167c621f4fef5"
url: "https://pub.dev"
source: hosted
version: "14.4.1"
version: "14.6.0"
google_fonts:
dependency: "direct main"
description:
Expand Down Expand Up @@ -315,10 +315,10 @@ packages:
dependency: "direct main"
description:
name: logger
sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.5.0"
logging:
dependency: transitive
description:
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6
provider: ^6.1.2
flutter_blue_plus: ^1.34.4
logger: ^2.3.0
flutter_blue_plus: ^1.34.5
logger: ^2.5.0
flutter_svg: ^2.0.14
get_it: ^8.0.2
flutter_screenutil: ^5.9.3
extended_text_field: ^16.0.0
path_provider: ^2.1.5
uuid: ^4.5.0
go_router: ^14.4.1
go_router: ^14.6.0
share_plus: ^10.1.2
file_picker: ^8.1.4
google_fonts: ^6.2.1
Expand Down

0 comments on commit 9f77806

Please sign in to comment.