Merge pull request #227 from camarm-dev/dev

Version 1.4.0-beta

.github/workflows/build.desktop.yml

@@ -1,9 +1,7 @@
 name: 'Build Remède desktop applications'
 
 on:
-  push:
-    branches:
-      - dev
+  workflow_dispatch:
 
 jobs:
   publish-tauri:

.github/workflows/checks.yml

@@ -49,6 +49,22 @@ jobs:
 
       - name: Build code
         run: cd app && npm run build
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Environnement
+        run: cd app && npm install
+
+      - name: Build code
+        run: cd app && npm run typecheck
   generation:
     name: Ressources generation (wordlist, IPA list)
     runs-on: ubuntu-latest

.gitignore

@@ -10,3 +10,6 @@
 /data/remede.db
 /data/remede-less.db
 /data/remede.*.db
+/data/missing-wordlist.txt
+/builds/*.exe
+/builds/*.msi

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "api-definition"]
 	path = api-definition
-	url = https://github.com/LabseSoftware/api-definition
+	url = https://github.com/LabseStudio/api-definition

PARSING.md

@@ -56,7 +56,7 @@ Cette opération prend plusieurs jours !
 
 Cette API, originellement écrite par [Frederic Gainza](https://api-definition.fgainza.fr/), scrap les données du [Wictionary français](https://fr.wiktionary.org/wiki/Wiktionnaire:Page_d%E2%80%99accueil).
 
-Pour ce projet, **une réadaptation a été effectuée** par [Labse Software](https://github.com/LabseSoftware/api-definition)
+Pour ce projet, **une réadaptation a été effectuée** par [Labse Studio](https://github.com/LabseStudio/api-definition)
 
 ### Lancer avec docker
 

README.md

@@ -12,11 +12,15 @@ Open Source and free alternative to Antidote dictionary.
 
 </div>
 
+## Breaking changes with Remède 1.4.0
+
+Remède 1.4.0 is released and old version of Remède are not supported anymore ! You can continue to search on Remède if you have downloaded the dictionary, but you must update your Remède application !
+
 ## Why Remède ?
 
 Remède is a dictionary, which can replace any proprietary dictionary, with these advantages:
-- Simple UI
-- Nice UX
+- Ready for all situations: rimes, examples, plurals, synonyms, antonyms, conjugation, even a corrector !
+- Simple and nice interface
 - Free
 - Cross-platform
 - Self-hostable
@@ -29,13 +33,16 @@ Remède is a dictionary, which can replace any proprietary dictionary, with thes
 - [Documentation](#documentation)
 - [Screenshots](#screenshots)
 
-## Current: 1.3.0-beta — Phenomenal Feather
+## Current: 1.4.0-beta — Phenomenal Feather
 
-La version `1.3.0`, nom de code `Phenomenal Feather` inclue les nouvelles fonctionnalités suivantes :
+La version `1.4.0`, nom de code `Phenomenal Feather` inclue les nouvelles fonctionnalités suivantes :
 - [x] Application traduite en anglais
-- [ ] Nouvelle structure de données
-- [ ] Applications de bureau
-- [ ] **Base révisée** avec +900 000 mots !
+- [x] Nouvelle structure de données
+- [x] Applications de bureau
+- [x] **Base révisée** avec +800 000 mots !
+- [x] Support avancé des phonemes
+- [x] Support avancé des rimes
+- [x] Pluriels des mots
 - [ ] Téléchargeable sur le **Play Store** !
 
 ## Télécharger

SECURITY.md

@@ -6,8 +6,11 @@
 |------------|--------------------|
 | < 1.0.0    | :x:                |
 | 1.0.0-rc   | :x:                |
-| 1.0.0 <    | :white_check_mark: |
+| 1.0.0 <    | :x:                |
 | 1.1.0-beta | :x:                |
+| 1.2.3      | :white_check_mark: |
+| 1.3.0-beta | :white_check_mark: |
+| 1.3.0 <    | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/android/app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "dev.camarm.remede"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 124
-        versionName '1.3.0-beta — Phenomenal Feather, Beta'
+        versionCode 126
+        versionName '1.4.0-beta — Phenomenal Feather, Beta'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

app/android/app/release/output-metadata.json

@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 124,
-      "versionName": "1.3.0-beta — Phenomenal Feather, Beta",
+      "versionCode": 126,
+      "versionName": "1.4.0-beta — Phenomenal Feather, Beta",
       "outputFile": "app-release.apk"
     }
   ],
   "elementType": "File"
-}
+}

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

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -26,10 +25,10 @@
                 <action android:name="dev.camarm.remede.action.OPEN_WORD_OF_DAY" />
             </intent-filter>
 
-
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/remede_word_of_day_widget_info" />
+                android:resource="@xml/remede_word_of_day_widget_info"
+            />
         </receiver>
         <receiver
             android:name=".RemedeSearchbarWidget"
@@ -43,9 +42,7 @@
                 <action android:name="dev.camarm.remede.action.OPEN_SEARCHBAR" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/remede_searchbar_info" />
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/remede_searchbar_info" />
         </receiver>
 
         <activity
@@ -87,10 +84,7 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
     </application>
-
 </manifest>

app/android/app/src/main/res/drawable/background_color.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/background" />
+</shape>

app/android/app/src/main/res/drawable/splash_background.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/background_color" />
+    <item>
+        <bitmap android:gravity="center"
+            android:src="@drawable/splash" />
+    </item>
+</layer-list>

app/android/app/src/main/res/values/styles.xml

@@ -17,9 +17,7 @@
 
 
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
-        <item name="android:background">@drawable/splash</item>
-        <item name="android:scaleType">fitCenter</item>
-        <item name="android:gravity">center_horizontal|center_vertical</item>
+        <item name="android:background">@drawable/splash_background</item>
     </style>
 
     <style name="Widget.Android.AppWidget.Container" parent="android:Widget">

app/android/capacitor.settings.gradle

@@ -1,30 +1,30 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/device/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/share/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar/android')

app/capacitor.config.ts

@@ -5,12 +5,12 @@ const config: CapacitorConfig = {
   appName: 'Remède',
   webDir: 'dist',
   plugins: {
-    "SplashScreen": {
+    SplashScreen: {
       "launchAutoHide": false,
       "androidScaleType": "CENTER_CROP",
       "splashFullScreen": true,
       "splashImmersive": false,
-      "backgroundColor": "#ffffff"
+      "backgroundColor": "#ffffff" // YOUR SPLASH SCREEN MAIN COLOR
     },
     CapacitorHttp: {
       enabled: false

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "remede",
   "private": true,
-  "version": "1.3.0-beta",
+  "version": "1.4.0-beta",
   "type": "module",
   "license": "CECILL-2.1",
   "author": {
@@ -19,6 +19,7 @@
     "test": "cypress run",
     "lint": "eslint src",
     "lint:fix": "eslint src --fix",
+    "typecheck": "vue-tsc --noEmit",
     "tauri": "tauri"
   },
   "dependencies": {
@@ -34,12 +35,13 @@
     "@capacitor/preferences": "^5.0.6",
     "@capacitor/share": "^5.0.6",
     "@capacitor/status-bar": "5.0.6",
+    "@ionic/core": "^7.8.6",
     "@ionic/vue": "^7.0.0",
     "@ionic/vue-router": "^7.5.3",
     "@types/sql.js": "^1.4.9",
     "install": "^0.13.0",
     "ionicons": "^7.0.0",
-    "sql.js": "^1.8.0",
+    "sql.js": "^1.12.0",
     "swiper": "^11.0.5",
     "vue": "^3.2.45",
     "vue-i18n": "^9.13.1",
@@ -48,7 +50,7 @@
   "devDependencies": {
     "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "5.5.1",
-    "@tauri-apps/cli": "^1.5.14",
+    "@tauri-apps/cli": "^2.1.0",
     "@vitejs/plugin-legacy": "^4.0.2",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vue/eslint-config-typescript": "^11.0.2",
@@ -59,7 +61,7 @@
     "jsdom": "^22.1.0",
     "typescript": "^5.1.6",
     "vite": "^4.5.3",
-    "vue-tsc": "^1.0.24"
+    "vue-tsc": "^2.1.10"
   },
   "description": "A french mobile and offline dictionary."
 }

app/src-tauri/Cargo.toml

@@ -14,12 +14,12 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.2", features = [] }
+tauri-build = { version = "2", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.5", features = [] }
+tauri = { version = "2", features = [] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

app/src-tauri/capabilities/migrated.json

@@ -0,0 +1,11 @@
+{
+  "identifier": "migrated",
+  "description": "permissions that were migrated from v1",
+  "local": true,
+  "windows": [
+    "main"
+  ],
+  "permissions": [
+    "core:default"
+  ]
+}

app/src-tauri/gen/schemas/capabilities.json

@@ -0,0 +1 @@
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default"]}}