Skip to content

Commit

Permalink
Merge pull request #38 from Joran-Dob/null-safety
Browse files Browse the repository at this point in the history
Initial implementation for null safety 🦺and fixed some critical issues.
  • Loading branch information
Joran-Dob committed Feb 3, 2021
2 parents d02c00c + b823f45 commit 2064724
Show file tree
Hide file tree
Showing 29 changed files with 327 additions and 328 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [2.0.0-nullsafety.0] - 3/02/2021.

* Migrated to sound null safety.
* Fixed some deprecation issues.

## [1.0.4] - 27 november 2020.

* Added a check to see if content-types end with a semicolon 👀.
Expand Down
207 changes: 105 additions & 102 deletions coverage/lcov.info
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ LF:3
LH:3
end_of_record
SF:lib/bloc/subtitle/subtitle_bloc.dart
DA:22,2
DA:26,4
DA:27,4
DA:31,2
DA:20,2
DA:24,4
DA:25,4
DA:29,2
DA:32,2
DA:33,2
DA:34,2
DA:35,2
DA:36,2
DA:37,4
DA:38,1
DA:39,3
DA:43,2
DA:35,4
DA:36,1
DA:37,3
DA:41,2
DA:42,4
DA:43,8
DA:44,4
DA:45,8
DA:46,4
DA:49,1
DA:50,2
DA:51,2
DA:47,1
DA:48,2
DA:49,2
DA:50,0
DA:52,0
DA:53,0
DA:54,0
DA:55,0
DA:56,0
DA:57,0
DA:58,0
DA:59,0
DA:66,1
DA:68,2
DA:69,1
DA:64,1
DA:66,2
DA:67,1
LF:27
LH:20
end_of_record
Expand All @@ -54,101 +54,104 @@ LF:13
LH:11
end_of_record
SF:lib/data/repository/subtitle_repository.dart
DA:18,4
DA:21,1
DA:17,4
DA:20,1
DA:22,1
DA:23,1
DA:24,1
DA:33,1
DA:34,1
DA:35,1
DA:36,3
DA:35,3
DA:39,1
DA:40,1
DA:41,1
DA:42,1
DA:46,1
DA:50,1
DA:55,4
DA:56,8
DA:57,8
DA:62,6
DA:68,4
DA:70,8
DA:75,3
DA:76,6
DA:79,6
DA:81,6
DA:83,3
DA:84,3
DA:85,3
DA:90,2
DA:91,2
DA:92,2
DA:98,1
DA:99,1
DA:102,1
DA:103,1
DA:104,1
DA:109,1
DA:110,1
DA:111,1
DA:121,4
DA:124,4
DA:125,3
DA:130,1
DA:131,1
DA:140,8
DA:141,4
DA:143,7
DA:144,6
DA:145,6
DA:146,6
DA:147,6
DA:149,6
DA:150,6
DA:151,6
DA:152,6
DA:153,6
DA:155,3
DA:160,3
DA:166,3
DA:42,0
DA:44,1
DA:48,1
DA:49,5
DA:53,0
DA:54,0
DA:58,1
DA:62,1
DA:67,4
DA:68,8
DA:69,8
DA:74,6
DA:80,4
DA:82,8
DA:87,3
DA:88,6
DA:91,6
DA:92,3
DA:95,6
DA:97,3
DA:98,3
DA:99,3
DA:104,2
DA:105,2
DA:106,2
DA:112,1
DA:113,1
DA:116,1
DA:117,1
DA:118,1
DA:123,1
DA:124,1
DA:125,1
DA:135,4
DA:138,4
DA:139,3
DA:144,1
DA:145,1
DA:154,8
DA:155,4
DA:157,7
DA:158,6
DA:159,6
DA:160,6
DA:161,6
DA:163,6
DA:164,6
DA:165,6
DA:166,6
DA:167,6
DA:170,4
DA:169,3
DA:174,3
DA:175,3
DA:177,12
DA:178,6
DA:179,2
DA:181,4
LF:64
LH:64
DA:180,3
DA:181,6
DA:184,4
DA:188,3
DA:189,3
DA:191,12
DA:192,6
DA:193,2
DA:195,4
LF:71
LH:68
end_of_record
SF:lib/subtitle_controller.dart
DA:14,4
DA:13,4
DA:21,2
DA:22,2
DA:24,2
DA:25,2
DA:29,2
DA:30,2
DA:31,2
DA:23,2
DA:26,2
DA:27,2
DA:28,2
DA:31,1
DA:34,1
DA:35,1
DA:36,2
DA:37,1
DA:38,1
DA:39,2
DA:40,1
DA:45,1
DA:42,1
DA:46,1
DA:49,1
DA:50,1
DA:51,2
DA:52,1
DA:53,1
DA:54,2
DA:55,1
DA:60,1
DA:65,4
DA:66,4
DA:57,1
DA:62,4
DA:67,4
DA:70,4
DA:71,4
DA:72,4
LF:25
LH:25
LF:21
LH:21
end_of_record
SF:lib/data/models/subtitle.dart
DA:8,3
Expand All @@ -161,7 +164,7 @@ LF:6
LH:6
end_of_record
SF:lib/data/models/subtitles.dart
DA:6,4
DA:4,4
LF:1
LH:1
end_of_record
2 changes: 1 addition & 1 deletion example/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"video_player","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-0.10.9+1/","dependencies":[]},{"name":"wakelock","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.1.4+1/","dependencies":[]}],"android":[{"name":"video_player","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-0.10.9+1/","dependencies":[]},{"name":"wakelock","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.1.4+1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"video_player_web","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_web-0.1.2+3/","dependencies":[]}]},"dependencyGraph":[{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]}],"date_created":"2021-02-03 13:58:44.225273","version":"1.26.0-12.0.pre"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"video_player","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-1.0.1/","dependencies":[]},{"name":"wakelock","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.2.1+1/","dependencies":[]}],"android":[{"name":"video_player","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player-1.0.1/","dependencies":[]},{"name":"wakelock","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock-0.2.1+1/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"import_js_library","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/import_js_library-1.0.2/","dependencies":[]},{"name":"video_player_web","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_web-0.1.4+1/","dependencies":[]},{"name":"wakelock_web","path":"/Users/joran.dob/Flutter/flutter/.pub-cache/hosted/pub.dartlang.org/wakelock_web-0.1.0+3/","dependencies":["import_js_library"]}]},"dependencyGraph":[{"name":"import_js_library","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":["wakelock_web"]},{"name":"wakelock_web","dependencies":["import_js_library"]}],"date_created":"2021-02-03 15:06:02.615412","version":"1.26.0-12.0.pre"}
27 changes: 9 additions & 18 deletions example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.example">

<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:label="example"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
<application android:label="example" android:icon="@mipmap/ic_launcher">
<activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if
there is no splash screen (such as the default splash screen
defined in @style/LaunchTheme). -->
<meta-data
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
android:value="true" />
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
<meta-data 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>
</application>
<meta-data android:name="flutterEmbedding" android:value="2" />

</manifest>
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
package com.example.example

import android.os.Bundle

import io.flutter.app.FlutterActivity
import io.flutter.plugins.GeneratedPluginRegistrant

class MainActivity: FlutterActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
GeneratedPluginRegistrant.registerWith(this)
}

}
3 changes: 3 additions & 0 deletions example/android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@
Flutter draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
</resources>
8 changes: 4 additions & 4 deletions example/ios/Flutter/Flutter.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# NOTE: This podspec is NOT to be published. It is only used as a local source!
# This is a generated file; do not edit or check into version control.
#

Pod::Spec.new do |s|
s.name = 'Flutter'
s.version = '1.0.0'
s.summary = 'High-performance, high-fidelity mobile apps.'
s.description = <<-DESC
Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
DESC
s.homepage = 'https://flutter.io'
s.license = { :type => 'MIT' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.vendored_frameworks = 'Flutter.framework'
# Framework linking is handled by Flutter tooling, not CocoaPods.
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
s.vendored_frameworks = 'path/to/nothing'
end
Loading

0 comments on commit 2064724

Please sign in to comment.