Skip to content

Commit

Permalink
v1.11.0 (#332)
Browse files Browse the repository at this point in the history
* hotfix: typo

* Choose the font (#335)

* [270] feat: add setting to change the app font

* [270] feat: allow to change font

* [333] fix: index existing notes (#334)

* [299] Add more actions on multi-selection (#336)

* [299] feat: allow to share multiple notes

* [299] feat: allow to add labels to multiple notes

* [308] Add swipe actions in the bin (#338)

* [308] feat: add bin tile swipe action

* [308] style: remove prefer_expression_function_bodies

* [308] style: move backup utils to services

* [308] style: refactor dismissible widgets

* [308] feat: add bin swipe actions settings tiles

* [308] fix: exit bin selection mode on back button tap

* [308] style: fix lint

* [308] doc: add README.md section about pre-releases

* [308] doc: add README.md note about conversion scripts

* [dev] fix: remove nullable

* [dev] docs: update README.md

* [dev] fix: uncomment code

* [347] fix: hidden label icon (#348)

* [293] fix: back button for the labels page (#346)

* [325] Build mimir (#339)

* [325] chore: build mimir

* [325] chore: upgrade to flutter 3.27.1

* [325] chore: improve mimir build

* [325] fix: notes shared plural

* [325] chore: fix submodules

* [325] chore: use flutter_mimir from pub.dev

* Prepare v1.11.0 (#352)

* upgrade Flutter and Dart versions

* bump application version

* bump dependencies versions

* fix: lint

* fix: todo

* update localizations

* update changelogs
  • Loading branch information
maelchiotti authored Jan 5, 2025
1 parent f27a81a commit 85bd707
Show file tree
Hide file tree
Showing 140 changed files with 10,233 additions and 1,236 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
- name: Setup mimir
run: bash scripts/mimir/fdroid_build_mimir.sh
run: bash scripts/mimir/fdroid_build_mimir.sh x64 armv7 arm64
- name: Add keystore
run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 -d > android/localmaterialnotes_keystore.jks
- name: Add key properties
Expand Down
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[submodule ".isar"]
path = .isar
url = https://github.com/isar-community/isar

[submodule ".mimir"]
path = .mimir
url = https://github.com/GregoryConrad/mimir
2 changes: 1 addition & 1 deletion .isar
2 changes: 1 addition & 1 deletion .mimir
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,23 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.11.0 - 2025-01-05

### Added

- Choose the font of the application and the notes editor
- More actions on multi-selection: share and add labels
- Swipe actions in the bin

### Fixed

- Already existing notes missing while searching
- Back action from the labels pages
- Wrong icon for hidden labels

## 1.10.1 - 2024-12-23

## Fixed
### Fixed

- Bin page not displaying the deleted notes
- Missing translation for "No labels" placeholder
Expand Down
20 changes: 16 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,24 @@ All the supported languages are listed here alphabetically. You can see more det

## External imports

> [!NOTE]
> The conversion scripts are not part of the application at the moment, they must be run on a computer.
The JSON import feature only supports JSON files created by the application. Scripts to convert exports from other applications to the format used by Material Notes are available in the [external_imports](docs/external_imports) directory. Please read [EXTERNAL_IMPORTS.md](docs/external_imports/EXTERNAL_IMPORTS.md) for more details.

## Pre-releases

> [!CAUTION]
> Pre-release versions can be buggy. Some features may not work. You might even loose all your data. That's why they are only meant to be installed manually, after making a backup from the settings.
Pre-release versions of the application are available on [GitHub releases](https://github.com/maelchiotti/LocalMaterialNotes/releases). You can filter by pre-releases only by typing `prerelease:true` in the search box.

When using a pre-release version, please report any issue you encounter in the discussion linked to that pre-release.

## Contributing

Please see [CONTRIBUTING.md](CONTRIBUTING.md).

## Credits

### Inspiration
Expand All @@ -118,7 +134,3 @@ The JSON import feature only supports JSON files created by the application. Scr
### Assets

- [Material Design Icons](https://github.com/google/material-design-icons) for the [notes](https://fonts.google.com/icons?selected=Material+Symbols+Outlined:notes) icon used for the logo.

## Contributing

Please see [CONTRIBUTING.md](CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ analyzer:

linter:
rules:
- require_trailing_commas
- public_member_api_docs
- prefer_relative_imports
- prefer_expression_function_bodies
- always_put_control_body_on_new_line
- curly_braces_in_flow_control_structures
4 changes: 2 additions & 2 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gradle-wrapper.jar
GeneratedPluginRegistrant.java

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
# See https://flutter.dev/to/reference-keystore
key.properties
**/*.keystore
**/*.jks
**/*.jks
13 changes: 5 additions & 8 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id "com.android.application"
id "kotlin-android"
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}

Expand Down Expand Up @@ -35,9 +36,9 @@ android.applicationVariants.all { variant ->
}

android {
namespace "com.maelchiotti.localmaterialnotes"
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
namespace = "com.maelchiotti.localmaterialnotes"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -48,10 +49,6 @@ android {
jvmTarget = JavaVersion.VERSION_1_8
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

dependenciesInfo {
includeInApk = false
includeInBundle = false
Expand Down Expand Up @@ -92,7 +89,7 @@ android {
}

flutter {
source '../..'
source = "../.."
}

dependencies {
Expand Down
8 changes: 7 additions & 1 deletion android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
-keep class androidx.lifecycle.DefaultLifecycleObserver
-keep class androidx.lifecycle.DefaultLifecycleObserver

# TODO: check if this can be removed by removing the dependency to encrypt
-dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
-dontwarn com.google.errorprone.annotations.CheckReturnValue
-dontwarn com.google.errorprone.annotations.Immutable
-dontwarn com.google.errorprone.annotations.RestrictedApi
11 changes: 11 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTask"
android:taskAffinity=""
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
Expand Down Expand Up @@ -38,5 +39,15 @@
android:name="flutterEmbedding"
android:value="2" />
</application>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility and
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT" />
<data android:mimeType="text/plain" />
</intent>
</queries>
</manifest>
4 changes: 0 additions & 4 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Expand Down
4 changes: 0 additions & 4 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ allprojects {
}
}

rootProject.buildDir = '../build'
rootProject.buildDir = "../build"
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
project.evaluationDependsOn(":app")
}

tasks.register("clean", Delete) {
Expand Down
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
distributionSha256Sum=fe696c020f241a5f69c30f763c5a7f38eec54b490db19cd2b0962dda420d7d12
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.2" apply false
id "com.android.application" version "8.1.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
}

Expand Down
Binary file added assets/fonts/Barlow/Barlow-Black.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-BlackItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-BoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-ExtraBold.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-ExtraBoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-ExtraLight.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-ExtraLightItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Light.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-LightItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-MediumItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-SemiBold.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-SemiBoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-Thin.ttf
Binary file not shown.
Binary file added assets/fonts/Barlow/Barlow-ThinItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Comic_Sans_MS/ComicSansMS.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Merriweather/Merriweather-Black.ttf
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Merriweather/Merriweather-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Merriweather/Merriweather-Light.ttf
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-BoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-Light.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-LightItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-MediumItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Ubuntu/Ubuntu-Regular.ttf
Binary file not shown.
Loading

0 comments on commit 85bd707

Please sign in to comment.