\ No newline at end of file
diff --git a/.metadata b/.metadata
index be74985..49936cf 100644
--- a/.metadata
+++ b/.metadata
@@ -1,10 +1,42 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
version:
- revision: adc687823a831bbebe28bdccfac1a628ca621513
+ revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
channel: stable
project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+ platforms:
+ - platform: root
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ - platform: android
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ - platform: ios
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ - platform: linux
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ - platform: macos
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ - platform: windows
+ create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+ base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+
+ # User provided section
+
+ # List of Local paths (relative to this file) that should be
+ # ignored by the migrate tool.
+ #
+ # Files that are not part of the templates will be ignored by default.
+ unmanaged_files:
+ - 'lib/main.dart'
+ - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 18b3eaa..3b9e61c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -45,6 +45,13 @@
"args": ["pub", "upgrade"],
"problemMatcher": [],
"label": "flutter: flutter pub upgrade"
+ },
+ {
+ "type": "flutter",
+ "command": "flutter",
+ "args": ["pub", "outdated"],
+ "problemMatcher": [],
+ "label": "flutter: flutter pub outdated"
}
]
}
diff --git a/LICENSE b/LICENSE
index fdddb29..82321e8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,24 +1,29 @@
-This is free and unencumbered software released into the public domain.
+BSD 3-Clause License
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
+Copyright (c) 2022, Tony Bark
+All rights reserved.
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
-For more information, please refer to
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 08885a0..67cd583 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
# Bullseye
-A game written in Flutter based on a tutorial, with my own tweaks added.
\ No newline at end of file
+A game written in Flutter based on a tutorial, with my own tweaks added.
+
+## Requirements
+
+- Flutter 3 or later
+- See Install Guide for [platform-specific](https://docs.flutter.dev/get-started/install) requirements
+
+## License
+
+This project is dual-licensed under the [BSD-3-Clause](LICENSE) or the [UNLICENSE](UNLICENSE).
diff --git a/Todo.md b/Todo.md
index 0d3d133..1e03082 100644
--- a/Todo.md
+++ b/Todo.md
@@ -6,4 +6,8 @@
- [x] Show a pop-up when the user taps it
- [x] Put game info on the screen
- [x] Put slider on screen: 1 -> 100
-- [x] Read value of the slider
\ No newline at end of file
+- [x] Read value of the slider
+
+## Part 2
+
+TBA
diff --git a/UNLICENSE b/UNLICENSE
new file mode 100644
index 0000000..00d2e13
--- /dev/null
+++ b/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to
\ No newline at end of file
diff --git a/analysis_options.yaml b/analysis_options.yaml
new file mode 100644
index 0000000..61b6c4d
--- /dev/null
+++ b/analysis_options.yaml
@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+ # The lint rules applied to this project can be customized in the
+ # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+ # included above or to enable additional rules. A list of all available lints
+ # and their documentation is published at
+ # https://dart-lang.github.io/linter/lints/index.html.
+ #
+ # Instead of disabling a lint rule for the entire project in the
+ # section below, it can also be suppressed for a single line of code
+ # or a specific dart file by using the `// ignore: name_of_lint` and
+ # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+ # producing the lint.
+ rules:
+ # avoid_print: false # Uncomment to disable the `avoid_print` rule
+ # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/android/.gitignore b/android/.gitignore
index 0a741cb..6f56801 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
key.properties
+**/*.keystore
+**/*.jks
diff --git a/android/app/build.gradle b/android/app/build.gradle
index b2d0ce4..636f5a7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,17 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion 30
+ compileSdkVersion flutter.compileSdkVersion
+ ndkVersion flutter.ndkVersion
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@@ -34,9 +44,11 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.tonybark.bullseye"
- minSdkVersion 16
- targetSdkVersion 30
+ applicationId "com.tonybark.bullseye.bullseye"
+ // You can update the following values to match your application needs.
+ // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
+ minSdkVersion flutter.minSdkVersion
+ targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 98aa2a4..12618ca 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,7 @@
-
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b5eace4..5ecb6e7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,12 @@
+ package="com.tonybark.bullseye.bullseye">
-
-
diff --git a/android/app/src/main/kotlin/com/example/bullseye/MainActivity.kt b/android/app/src/main/kotlin/com/tonybark/bullseye/bullseye/MainActivity.kt
similarity index 71%
rename from android/app/src/main/kotlin/com/example/bullseye/MainActivity.kt
rename to android/app/src/main/kotlin/com/tonybark/bullseye/bullseye/MainActivity.kt
index 2edfc91..93a59c5 100644
--- a/android/app/src/main/kotlin/com/example/bullseye/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/tonybark/bullseye/bullseye/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.bullseye
+package com.tonybark.bullseye.bullseye
import io.flutter.embedding.android.FlutterActivity
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 449a9f9..06952be 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@