Skip to content

Commit

Permalink
Merge pull request #8 from powerpaul17/import-export
Browse files Browse the repository at this point in the history
Import/Export
  • Loading branch information
powerpaul17 authored Oct 6, 2024
2 parents 8166651 + e632d7d commit a097449
Show file tree
Hide file tree
Showing 29 changed files with 3,490 additions and 2,143 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [Unreleased]

- add import/export plugin

## [0.9.0] - 2024-09-27

- allow creation of labels in selection dialog
Expand Down
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
namespace "com.paultirk.yatoo"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.paultirk.yatoo"
minSdkVersion rootProject.ext.minSdkVersion
Expand All @@ -19,9 +19,9 @@ android {
signingConfigs {
release {
keyAlias "yatoo"
keyPassword System.env.ANDROID_KEYSTORE_PASSWORD
storeFile file(System.env.ANDROID_KEYSTORE_PATH)
storePassword System.env.ANDROID_KEYSTORE_PASSWORD
keyPassword System.env.ANDROID_KEYSTORE_PASSWORD ?: ''
storeFile file(System.env.ANDROID_KEYSTORE_PATH ?: '.')
storePassword System.env.ANDROID_KEYSTORE_PASSWORD ?: ''
}
}
buildTypes {
Expand Down
3 changes: 2 additions & 1 deletion android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ android {

apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {

implementation project(':capacitor-device')
implementation project(':capacitor-filesystem')

}

Expand Down
3 changes: 3 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@
<!-- Permissions -->

<!-- <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" />
</manifest>
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.google.gms:google-services:4.4.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
6 changes: 6 additions & 0 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
// 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')

include ':capacitor-device'
project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android')

include ':capacitor-filesystem'
project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ext {
minSdkVersion = 22
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
compileSdkVersion = 34
targetSdkVersion = 34
androidxActivityVersion = '1.8.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
androidxCoreVersion = '1.12.0'
androidxFragmentVersion = '1.6.2'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
Expand Down
21 changes: 21 additions & 0 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"NavigationBar": {
"labels": "Labels",
"noLabels": "no labels",
"settings": "Settings",
"todos": "Todos"
},
"todos": {
Expand All @@ -49,8 +50,28 @@
"name": "Name"
}
},
"errors": {
"wrongFileFormat": "Wrong file format"
},
"plugins": {
"importExportPlugin": {
"export": "Export",
"fileSaved": "File saved",
"import": "Import",
"importSuccessful": "Import successful",
"label": "Import / Export",
"overwrite": "Overwrite",
"storedDataNewerThanImportData": "Stored data is newer than import data"
}
},
"routes": {
"label": "Label",
"settings": "Settings",
"todos": "Todos"
},
"views": {
"settings": {
"plugins": "Plugins"
}
}
}
Loading

0 comments on commit a097449

Please sign in to comment.