Skip to content

Commit

Permalink
Update 16++
Browse files Browse the repository at this point in the history
  • Loading branch information
Ellet committed Dec 3, 2023
1 parent 11428cc commit 8132055
Show file tree
Hide file tree
Showing 124 changed files with 1,023 additions and 10,265 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ migrate_working_dir/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/
Expand All @@ -47,6 +46,7 @@ app.*.map.json
pubspec_overrides.yaml
pubspec.lock

# All env files
*.env

# Google && Firebase
Expand Down
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: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a"
revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: android
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: ios
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: linux
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: macos
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: web
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: windows
create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2

# User provided section

Expand Down
21 changes: 7 additions & 14 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
}

def localProperties = new Properties()
Expand Down Expand Up @@ -32,8 +30,10 @@ if (keystorePropertiesFile.exists()) {

android {
namespace "net.freshplatform.fresh_notes"
compileSdk flutter.compileSdkVersion
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
// One or more plugins require a higher Android NDK version.
ndkVersion "25.1.8937393"

def javaVersion = JavaVersion.VERSION_17

Expand All @@ -58,9 +58,8 @@ android {
applicationId "net.freshplatform.fresh_notes"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 24
// targetSdkVersion flutter.targetSdkVersion
targetSdkVersion 34
minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand All @@ -75,8 +74,7 @@ android {
}
buildTypes {
release {
// signingConfig signingConfigs.release
signingConfig signingConfigs.debug
signingConfig signingConfigs.release

minifyEnabled true
shrinkResources true
Expand All @@ -88,8 +86,6 @@ android {
}
debug {
signingConfig signingConfigs.debug
minifyEnabled true
shrinkResources true
debuggable true
}
}
Expand All @@ -100,7 +96,4 @@ flutter {
source '../..'
}

dependencies {
implementation 'androidx.core:core-splashscreen:1.1.0-alpha02'

}
dependencies {}
8 changes: 0 additions & 8 deletions android/app/src/debug/res/xml/network_security_config.xml

This file was deleted.

18 changes: 10 additions & 8 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-feature
android:name="android.hardware.camera"
Expand All @@ -8,14 +8,14 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="32"
tools:ignore="ScopedStorage" />

<application
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:networkSecurityConfig="@xml/network_security_config"
android:label="@string/app_name">
<activity
android:name=".MainActivity"
Expand All @@ -32,21 +32,23 @@
<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>
<meta-data android:name="flutter_deeplinking_enabled" android:value="true" />
<intent-filter android:autoVerify="true">
<meta-data
android:name="flutter_deeplinking_enabled"
android:value="true" />
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="https" />
<data android:host="freshplatform.net" />
<data android:host="notes.freshplatform.net" />
</intent-filter>

</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
Expand Down
Binary file added android/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ package net.freshplatform.fresh_notes

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity()
class MainActivity: FlutterActivity() {
}
5 changes: 5 additions & 0 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file removed android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#E2F5F6</color>
</resources>
5 changes: 0 additions & 5 deletions android/app/src/main/res/xml/locales_config.xml

This file was deleted.

5 changes: 0 additions & 5 deletions android/app/src/main/res/xml/network_security_config.xml

This file was deleted.

6 changes: 1 addition & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

classpath "com.google.gms:google-services:4.4.0"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
}
}

Expand All @@ -27,6 +23,7 @@ rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"

// For mode details visit https://gist.github.com/freshtechtips/93fefb39e48c40592bda3931e05fd35c
afterEvaluate {
// check if android block is available

Expand All @@ -43,7 +40,6 @@ subprojects {
println("Changes will be applied for the following packages:")
android {
def androidApiVersion = 34
compileSdkVersion androidApiVersion
compileSdk androidApiVersion
defaultConfig {
targetSdkVersion androidApiVersion
Expand Down
3 changes: 1 addition & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
13 changes: 11 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@ pluginManagement {

includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")

repositories {
google()
mavenCentral()
gradlePluginPortal()
}

plugins {
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
}
}

include ":app"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.2.0' apply false
}

apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
include ":app"
Binary file added assets/images/app_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/lottie/onboarding/cloud.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/cloud_data.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/cross_platform.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/customizable_settings.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/open_source.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/privacy_protection.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/type_notes.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/lottie/onboarding/under_development.json

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions doc/setup_platform_projects.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Setup Platform Projects

This file contains info about how to setup all the
native projects after create the flutter project using `flutter create`

This page is incomplete.

## Table of Contents
- [Setup Platform Projects](#setup-platform-projects)
- [Table of Contents](#table-of-contents)
- [Android Project](#android-project)
- [Update the Project](#update-the-project)

## Android Project

### Update the Project

The first steps is to update Android Gradle Plugin, Gradle and Kotlin version

1. Open the `android` project with Android Studio
2. Click on Tools/AGP Upgrade Assistant
3. Use the latest version of AGP (for example 8.2.0)
4. Run the selected steps
5. Switch from Android Project View to Project View

You can also go to the `gradle-wraper.properties` and update the `distributionUrl`

6. Now go to `build.gradle` or `build.gradle.kts` at the project level
7. Update the `kotlin_version` to the latest version, you can find the latest version in Kotlin website

8. Follow the steps in this [gist](https://gist.github.com/freshtechtips/93fefb39e48c40592bda3931e05fd35c) to fix AGP 8.0 build issue
9. Let's move to `build.gradle` in the `app` module, update any deprecated properties, for example `compileSdkVersion` to `compikeSdk`
2 changes: 1 addition & 1 deletion firebase/.firebaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projects": {
"default": "mynotes-eb717"
"default": "fresh-platform-notes"
}
}
16 changes: 0 additions & 16 deletions firebase/firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,6 @@
"rules": "firestore.rules",
"indexes": "firestore.indexes.json"
},
"functions": [
{
"source": "functions",
"codebase": "default",
"ignore": [
"node_modules",
".git",
"firebase-debug.log",
"firebase-debug.*.log"
],
"predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint",
"npm --prefix \"$RESOURCE_DIR\" run build"
]
}
],
"hosting": {
"public": "public",
"ignore": [
Expand Down
32 changes: 0 additions & 32 deletions firebase/functions/.eslintrc.js

This file was deleted.

9 changes: 0 additions & 9 deletions firebase/functions/.gitignore

This file was deleted.

Loading

0 comments on commit 8132055

Please sign in to comment.