Skip to content

Commit

Permalink
Merge pull request #368 from dreautall/develop
Browse files Browse the repository at this point in the history
v1.0.3
  • Loading branch information
dreautall authored Apr 20, 2024
2 parents fd469e2 + f46b62d commit d9b18f5
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 10 deletions.
4 changes: 0 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ android {
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName

// Added: https://stackoverflow.com/a/36786721
multiDexEnabled true
}

signingConfigs {
Expand Down Expand Up @@ -95,7 +92,6 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.multidex:multidex:2.0.1' // Added: https://stackoverflow.com/a/36786721
implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' // Added: flutter_local_notifications
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.dreautall.waterflyiii">
<application android:label="Waterfly III" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" android:enableOnBackInvokedCallback="false">
<application android:label="Waterfly III" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" android:enableOnBackInvokedCallback="false" android:usesCleartextTraffic="true">
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" 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
Expand Down
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1024M
org.gradle.caching=true
android.useAndroidX=true
android.enableJetifier=true
5 changes: 5 additions & 0 deletions fastlane/metadata/android/de-DE/changelogs/291.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Hotfix für unverschlüsselte Instanzen
- Zeige Schlagwörter in der Transaktions-Liste
- Update der Übersetzungen
- Unterstützung für zusätzliche Banking-Apps
- Fehlerbehebungen
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/291.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Hotfix for HTTP installations
- Show tags on transaction screen
- Translation updates
- Add support for additional banking apps
- Bugfixes
4 changes: 2 additions & 2 deletions fastlane/metadata/android/version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=1.0.2
versionCode=289
versionName=1.0.3
versionCode=291
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -978,10 +978,10 @@ packages:
dependency: transitive
description:
name: pointycastle
sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
url: "https://pub.dev"
source: hosted
version: "3.8.0"
version: "3.9.0"
pool:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: waterflyiii
description: WaterFly III, a mobile client for Firefly III
publish_to: 'none'

version: 1.0.2
version: 1.0.3

environment:
sdk: '>=3.0.0 <4.0.0'
Expand Down

0 comments on commit d9b18f5

Please sign in to comment.