Full rewrite for additional features #95

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

Draft

0xpr03 wants to merge 31 commits into master from rewrite

.idea/gradle.xml

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

app/build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ android { @@
             abortOnError false
             disable 'MissingTranslation'
         }
+        namespace 'vocabletrainer.heinecke.aron.vocabletrainer'
     }
     dependencies {
@@ Expand Down @@

app/src/debug/AndroidManifest.xml

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="vocabletrainer.heinecke.aron.vocabletrainer">
+        xmlns:tools="http://schemas.android.com/tools">
         <application
     android:usesCleartextTraffic="true"
             />
@@ Expand Down @@

app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     <?xml version="1.0" encoding="utf-8"?>
     <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="vocabletrainer.heinecke.aron.vocabletrainer">
+        xmlns:tools="http://schemas.android.com/tools">
         <uses-permission android:name="android.permission.INTERNET" />
         <application
@@ Expand Down @@

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ buildscript { @@
             google()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.1.3'
+            classpath 'com.android.tools.build:gradle:7.2.0'
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
             // NOTE: Do not place your application dependencies here; they belong
@@ Expand Down @@

gradle/wrapper/gradle-wrapper.properties

-Original file 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.2-all.zip
+    distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

vocabletrainer/.gitignore

-Original file line number
+Diff line change
@@ -0,0 +1,44 @@
+    # Miscellaneous
+    *.class
+    *.log
+    *.pyc
+    *.swp
+    .DS_Store
+    .atom/
+    .buildlog/
+    .history
+    .svn/
+    migrate_working_dir/
+    # IntelliJ related
+    *.iml
+    *.ipr
+    *.iws
+    .idea/
+    # The .vscode folder contains launch configuration and tasks you configure in
+    # VS Code which you may wish to be included in version control, so this line
+    # is commented out by default.
+    #.vscode/
+    # Flutter/Dart/Pub related
+    **/doc/api/
+    **/ios/Flutter/.last_build_id
+    .dart_tool/
+    .flutter-plugins
+    .flutter-plugins-dependencies
+    .packages
+    .pub-cache/
+    .pub/
+    /build/
+    # Symbolication related
+    app.*.symbols
+    # Obfuscation related
+    app.*.map.json
+    # Android Studio will place build artifacts here
+    /android/app/debug
+    /android/app/profile
+    /android/app/release

vocabletrainer/.metadata

-Original file line number
+Diff line change
@@ -0,0 +1,45 @@
+    # 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.
+    version:
+      revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+      channel: stable
+    project_type: app
+    # Tracks metadata for the flutter migrate command
+    migration:
+      platforms:
+        - platform: root
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: android
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: ios
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: linux
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: macos
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: web
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+        - platform: windows
+          create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+          base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+      # 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'

vocabletrainer/.vscode/settings.json

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    {
+        "cmake.configureOnOpen": false
+    }

vocabletrainer/README.md

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    # vocabletrainer
+    A new Flutter project.
+    ## Getting Started
+    This project is a starting point for a Flutter application.
+    A few resources to get you started if this is your first Flutter project:
+    - [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+    - [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+    For help getting started with Flutter development, view the
+    [online documentation](https://docs.flutter.dev/), which offers tutorials,
+    samples, guidance on mobile development, and a full API reference.

vocabletrainer/analysis_options.yaml

-Original file line number
+Diff line change
@@ -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

vocabletrainer/android/.gitignore

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    gradle-wrapper.jar
+    /.gradle
+    /captures/
+    /gradlew
+    /gradlew.bat
+    /local.properties
+    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

vocabletrainer/android/app/build.gradle

-Original file line number
+Diff line change
@@ -0,0 +1,71 @@
+    def localProperties = new Properties()
+    def localPropertiesFile = rootProject.file('local.properties')
+    if (localPropertiesFile.exists()) {
+        localPropertiesFile.withReader('UTF-8') { reader ->
+            localProperties.load(reader)
+        }
+    }
+    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'
+    }
+    def flutterVersionName = localProperties.getProperty('flutter.versionName')
+    if (flutterVersionName == null) {
+        flutterVersionName = '1.0'
+    }
+    apply plugin: 'com.android.application'
+    apply plugin: 'kotlin-android'
+    apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+    android {
+        compileSdkVersion 33//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'
+        }
+        defaultConfig {
+            // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+            applicationId "com.example.vocabletrainer"
+            // 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 21//flutter.minSdkVersion
+            targetSdkVersion flutter.targetSdkVersion
+            versionCode flutterVersionCode.toInteger()
+            versionName flutterVersionName
+        }
+        buildTypes {
+            release {
+                // TODO: Add your own signing config for the release build.
+                // Signing with the debug keys for now, so `flutter run --release` works.
+                signingConfig signingConfigs.debug
+            }
+        }
+    }
+    flutter {
+        source '../..'
+    }
+    dependencies {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    }

vocabletrainer/android/app/src/debug/AndroidManifest.xml

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.example.vocabletrainer">
+        <!-- The INTERNET permission is required for development. Specifically,
+             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"/>
+    </manifest>

vocabletrainer/android/app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ -0,0 +1,34 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.example.vocabletrainer">
+       <application
+            android:label="vocabletrainer"
+            android:name="${applicationName}"
+            android:icon="@mipmap/ic_launcher">
+            <activity
+                android:name=".MainActivity"
+                android:exported="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"
+                  />
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN"/>
+                    <category android:name="android.intent.category.LAUNCHER"/>
+                </intent-filter>
+            </activity>
+            <!-- Don't delete the meta-data below.
+                 This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+            <meta-data
+                android:name="flutterEmbedding"
+                android:value="2" />
+        </application>
+    </manifest>

vocabletrainer/android/app/src/main/kotlin/com/example/vocabletrainer/MainActivity.kt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    package com.example.vocabletrainer
+    import io.flutter.embedding.android.FlutterActivity
+    class MainActivity: FlutterActivity() {
+    }

vocabletrainer/android/app/src/main/res/drawable-v21/launch_background.xml

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <!-- Modify this file to customize your launch splash screen -->
+    <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:drawable="?android:colorBackground" />
+        <!-- You can insert your own image assets here -->
+        <!-- <item>
+            <bitmap
+                android:gravity="center"
+                android:src="@mipmap/launch_image" />
+        </item> -->
+    </layer-list>

vocabletrainer/android/app/src/main/res/drawable/launch_background.xml

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <!-- Modify this file to customize your launch splash screen -->
+    <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:drawable="@android:color/white" />
+        <!-- You can insert your own image assets here -->
+        <!-- <item>
+            <bitmap
+                android:gravity="center"
+                android:src="@mipmap/launch_image" />
+        </item> -->
+    </layer-list>

vocabletrainer/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Sorry, something went wrong. Reload?