Skip to content

Commit

Permalink
chore: update runtimes (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
renancaraujo authored Apr 4, 2024
1 parent 6b7cbe6 commit 105130d
Show file tree
Hide file tree
Showing 25 changed files with 198 additions and 321 deletions.
6 changes: 6 additions & 0 deletions .idea/runConfigurations/main_dart.xml

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

30 changes: 15 additions & 15 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "2f708eb8396e362e280fac22cf171c2cb467343c"
revision: "ba393198430278b6595976de84fe170f553cc728"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: android
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: ios
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: linux
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: macos
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: web
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728
- platform: windows
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: ba393198430278b6595976de84fe170f553cc728
base_revision: ba393198430278b6595976de84fe170f553cc728

# User provided section

Expand Down
5 changes: 5 additions & 0 deletions android/app/src/main/kotlin/com/example/turi/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.example.turi

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity()
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
29 changes: 0 additions & 29 deletions ios/Podfile.lock

This file was deleted.

140 changes: 16 additions & 124 deletions ios/Runner.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 0 additions & 3 deletions ios/Runner.xcworkspace/contents.xcworkspacedata

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

14 changes: 6 additions & 8 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Crystal Ball</string>
<string>Turi</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>crystal_ball</string>
<string>turi</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand All @@ -26,8 +24,6 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand All @@ -38,14 +34,16 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>FLTEnableImpeller</key>
<false/>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
1 change: 0 additions & 1 deletion lib/bootstrap.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class AppBlocObserver extends BlocObserver {

Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
FlutterError.onError = (details) {
print(details.stack);
log(details.exceptionAsString(), stackTrace: details.stack);
};

Expand Down
2 changes: 1 addition & 1 deletion lib/game/components/camera_target.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:crystal_ball/game/crystal_ball.dart';
import 'package:crystal_ball/game/crystal_ball_game.dart';
import 'package:flame/components.dart';
import 'package:flame/effects.dart';
import 'package:flutter/animation.dart';
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions lib/game/flame_shaders/components.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import 'package:flame/camera.dart';
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';

// ignore: implementation_imports
import 'package:flame/src/camera/viewports/fixed_resolution_viewport.dart';

class SamplerCamera<OwnerType extends SamplerOwner> extends CameraComponent {
SamplerCamera({
required this.samplerOwner,
Expand Down
2 changes: 1 addition & 1 deletion lib/game/game.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export 'components/components.dart';
export 'constants.dart';
export 'crystal_ball.dart';
export 'crystal_ball_game.dart';
export 'cubit/cubit.dart';
export 'entities/entities.dart';
export 'flame_shaders/flame_shaders.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/game/samplers/ground_sampler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'dart:ui';
import 'package:crystal_ball/game/game.dart';
import 'package:flame/camera.dart';
import 'package:flame/extensions.dart';
import 'package:flutter/material.dart' show Colors;
import 'package:flutter_shaders/flutter_shaders.dart';

class GroundSamplerOwner extends SamplerOwner {
Expand Down
5 changes: 4 additions & 1 deletion lib/game/samplers/platforms_sampler.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:typed_data';
import 'dart:ui';

import 'package:crystal_ball/game/game.dart';
Expand Down Expand Up @@ -50,7 +51,9 @@ class PlatformsSamplerOwner extends SamplerOwner {

extension on UniformsSetter {
void setVector64(Vector vector) {
setFloats(vector.storage);
final storage = Float32List.fromList(vector.storage);

setFloats(storage);
}

void setRGB(Color color) {
Expand Down
5 changes: 4 additions & 1 deletion lib/game/samplers/the_ball_sampler.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:typed_data';
import 'dart:ui';

import 'package:crystal_ball/game/game.dart';
Expand Down Expand Up @@ -53,6 +54,8 @@ class TheBallSamplerOwner extends SamplerOwner {

extension on UniformsSetter {
void setVector64(Vector vector) {
setFloats(vector.storage);
final storage = Float32List.fromList(vector.storage);

setFloats(storage);
}
}
20 changes: 1 addition & 19 deletions lib/game/view/game_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -269,25 +269,7 @@ class _DynamicBackgroundState extends State<DynamicBackground> {
final isPlaying = context.read<GameCubit>().isPlaying;
return isPlaying && (current - lastComputedScore).abs() > 400;
},
listener: (context, state) {
lastComputedScore = state;
if (state > 600 && state < 10000) {
final progress = state / 9400;
setState(() {
data = Mesh25Data.lerp(postIntro, postIntro2, progress);
});
}
if (state > 10000 && state < 100000) {
final progress = (state - 10000) / 90000;
setState(() {
data = Mesh25Data.lerp(postIntro2, postIntro3, progress);
});
} else if (state > 100000 && data != postIntro3) {
setState(() {
data = postIntro3;
});
}
},
listener: (context, state) {},
),
],
child: AnimatedMeshGradient(
Expand Down
2 changes: 1 addition & 1 deletion macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

COCOAPODS: 1.12.1
COCOAPODS: 1.15.2
Loading

0 comments on commit 105130d

Please sign in to comment.