Skip to content

Commit 825b0ee

Browse files
committed
Merge branch 'release/1.10.0'
2 parents 3dbfc5d + 75988f5 commit 825b0ee

File tree

57 files changed

+693
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+693
-152
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ Cryptomator for Android is currently available in the following distribution ch
1212
1. [Using Google Play](https://play.google.com/store/apps/details?id=org.cryptomator)
1313
2. [Using Cryptomator's Website](https://cryptomator.org/android/)
1414
3. [Using Cryptomator's F-Droid Repository](https://cryptomator.org/android/)
15-
4. Building from source using Gradle (instructions below)
15+
4. [Using F-Droid's Main Repository](https://f-droid.org/en/packages/org.cryptomator.lite)
16+
5. Building from source using Gradle (instructions below)
1617

1718
## Building
1819

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def getVersionCode = { ->
3838
allprojects {
3939
ext {
4040
androidApplicationId = 'org.cryptomator'
41-
androidVersionCode = 2807 // must be getVersionCode(). only at release tag set the actual value
42-
androidVersionName = '1.9.1'
41+
androidVersionCode = 2824 // must be getVersionCode(). only at release tag set the actual value
42+
androidVersionName = '1.10.0'
4343
}
4444
repositories {
4545
mavenCentral()

fastlane/izzyscript/result_lite.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

fastlane/release-notes-de.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
- Weitere Anpassungen zur Integration in das F-Droid Haupt-Repository
1+
- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
2+
- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
3+
- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
24
- Übersetzungen aktualisiert

fastlane/release-notes-en.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
- Further customizations for integration into the F-Droid main repository
1+
- Add workaround for editing files in Microsoft Office apps
2+
- Add support for themed Cryptomator icon
3+
- Refresh stale authentication token during auto upload
24
- Update translations

fastlane/release-notes.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<ul>
2-
<li>Further customizations for integration into the F-Droid main repository</li>
2+
<li>Add workaround for editing files in Microsoft Office apps</li>
3+
<li>Add support for themed Cryptomator icon</li>
4+
<li>Refresh stale authentication token during auto upload</li>
35
<li>Update translations</li>
46
</ul>

presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
33
<background android:drawable="@color/ic_launcher_background"/>
44
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
56
</adaptive-icon>

presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
33
<background android:drawable="@color/ic_launcher_background"/>
44
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
56
</adaptive-icon>

presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
33
<background android:drawable="@color/ic_launcher_background"/>
44
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
56
</adaptive-icon>

0 commit comments

Comments
 (0)