Merge pull request #26 from ardinbig/dev

Add french translation

.gitignore

@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -40,3 +41,11 @@ app.*.symbols
 # Obfuscation related
 app.*.map.json
 android/app/key.jks
+
+# Symbolication related
+app.*.symbols
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

.metadata

@@ -1,10 +1,33 @@
 # 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: 9b2d32b605630f28625709ebd9d78ab3016b2bf6
+ revision: eb6d86ee27deecba4a83536aa20f366a6044895c
  channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+ platforms:
+ - platform: root
+ create_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+ base_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+ - platform: android
+ create_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+ base_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+ - platform: ios
+ create_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+ base_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+
+ # 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'

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

android/app/build.gradle

@@ -26,15 +26,23 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
- def keystorePropertiesFile = rootProject.file('key.properties')
- if (keystorePropertiesFile.exists()) {
-  keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
- }
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
 
 android {
- compileSdkVersion 29
+ compileSdkVersion 33
+ ndkVersion flutter.ndkVersion
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
 
- // ndkVersion "22.1.7171670"
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
 
  sourceSets {
  main.java.srcDirs += 'src/main/kotlin'
@@ -47,45 +55,34 @@ android {
  defaultConfig {
  applicationId "com.kylekun.one_second_diary"
  minSdkVersion 24
- targetSdkVersion 29
+ targetSdkVersion 33
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
-
- // ndk {
- // debugSymbolLevel 'SYMBOL_TABLE'
- // }
  }
- 
+
  signingConfigs {
- release {
- keyAlias keystoreProperties['keyAlias']
- keyPassword keystoreProperties['keyPassword']
- storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
- storePassword keystoreProperties['storePassword']
- }
- }
+  release {
+  keyAlias keystoreProperties['keyAlias']
+  keyPassword keystoreProperties['keyPassword']
+  storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+  storePassword keystoreProperties['storePassword']
+  }
+  }
 
  buildTypes {
  release {
- // Signing with the debug keys for now, so `flutter run --release` works. 
- signingConfig signingConfigs.release 
-
+ signingConfig signingConfigs.release
  minifyEnabled true
- useProguard true
-
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 
-
  }
  }
 
-
  packagingOptions {
- pickFirst 'lib/x86/libc++_shared.so'
- pickFirst 'lib/x86_64/libc++_shared.so'
- pickFirst 'lib/armeabi-v7a/libc++_shared.so'
- pickFirst 'lib/arm64-v8a/libc++_shared.so'
+ jniLibs {
+ pickFirsts += ['lib/x86/libc++_shared.so', 'lib/x86_64/libc++_shared.so', 'lib/armeabi-v7a/libc++_shared.so', 'lib/arm64-v8a/libc++_shared.so']
+ }
  }
 
+ namespace 'com.kylekun.one_second_diary'
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  package="com.kylekun.one_second_diary">
- <!-- Flutter needs it to communicate with the running application
+ <!-- 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"/>
+ <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,59 +1,58 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
  package="com.kylekun.one_second_diary">
- 
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
  <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
  <application
- android:name="io.flutter.app.FlutterApplication"
- android:label="One Second Diary"
- android:requestLegacyExternalStorage="true"
- android:icon="@mipmap/ic_launcher">
+ android:name="${applicationName}"
+ android:icon="@mipmap/ic_launcher"
+ android:label="One Second Diary">
  <activity
  android:name=".MainActivity"
- android:launchMode="singleTop"
- android:theme="@style/LaunchTheme"
  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+ android:exported="true"
  android:hardwareAccelerated="true"
+ android:launchMode="singleTop"
+ android:theme="@style/LaunchTheme"
  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"
- />
+ android:name="io.flutter.embedding.android.NormalTheme"
+ android:resource="@style/NormalTheme" />
  <!-- Displays an Android View that continues showing the launch screen
  Drawable until Flutter paints its first frame, then this splash
  screen fades out. A splash screen is useful to avoid any visual
  gap between the end of Android's launch screen and the painting of
  Flutter's first frame. -->
  <meta-data
- android:name="io.flutter.embedding.android.SplashScreenDrawable"
- android:resource="@drawable/launch_background"
- />
+ android:name="io.flutter.embedding.android.SplashScreenDrawable"
+ android:resource="@drawable/launch_background" />
  <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>
  <!-- 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" />
- <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED"></action>
- </intent-filter>
- </receiver>
- <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
-
+
+ <service
+ android:name="com.dexterous.flutterlocalnotifications.ForegroundService"
+ android:exported="false"
+ android:stopWithTask="false"
+ tools:targetApi="ice_cream_sandwich" />
 
  </application>
 </manifest>

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

@@ -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>

android/app/src/profile/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  package="com.kylekun.one_second_diary">
- <!-- Flutter needs it to communicate with the running application
+ <!-- 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"/>
+ <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

android/build.gradle

@@ -1,14 +1,12 @@
 buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.7.10'
  repositories {
  google()
  mavenCentral()
- jcenter()
-
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0'
+ classpath 'com.android.tools.build:gradle:7.1.3'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }
@@ -18,7 +16,6 @@ allprojects {
  maven { url 'https://jitpack.io' }
  google()
  mavenCentral()
- jcenter()
  }
 }
 
@@ -30,9 +27,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-ext.flutterFFmpegPackage = 'min-gpl-lts'
-
-
 task clean(type: Delete) {
  delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

ios/.gitignore

@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
+Flutter/ephemeral/
 Flutter/app.flx
 Flutter/app.zip
 Flutter/flutter_assets/

ios/Flutter/AppFrameworkInfo.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
  <key>CFBundleDevelopmentRegion</key>
- <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <string>en</string>
  <key>CFBundleExecutable</key>
  <string>App</string>
  <key>CFBundleIdentifier</key>
@@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
- <string>8.0</string>
+ <string>11.0</string>
 </dict>
 </plist>