Skip to content

Commit 43e35e2

Browse files
authored
Merge pull request #24 from hegocre/maintenance/bug-fixes
Bug fixes
2 parents 06fba64 + 3536960 commit 43e35e2

49 files changed

Lines changed: 701 additions & 175 deletions

Some content is hidden

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

.github/workflows/android.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: set up JDK 17
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1818
with:
1919
java-version: '17'
20+
distribution: 'zulu'
2021
- name: Build with Gradle
2122
run: ./gradlew clean && ./gradlew assembleDebug
22-
- uses: actions/upload-artifact@v2
23+
- uses: actions/upload-artifact@v3
2324
with:
2425
name: app-universal-debug.apk
2526
path: app/build/outputs/apk/debug/app-universal-debug.apk

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ android {
4343
debug {
4444
debuggable true
4545
applicationIdSuffix ".debug"
46+
versionNameSuffix "-DEBUG"
4647
}
4748
}
4849
splits {
@@ -76,13 +77,13 @@ dependencies {
7677
implementation 'androidx.security:security-crypto:1.0.0'
7778
implementation "androidx.datastore:datastore-preferences:1.0.0"
7879

79-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
80+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
8081

8182
implementation 'com.goterl:lazysodium-android:5.1.0@aar'
8283
implementation 'net.java.dev.jna:jna:5.13.0@aar'
8384

8485
implementation 'org.commonmark:commonmark:0.21.0'
85-
implementation 'io.coil-kt:coil-compose:2.4.0'
86+
implementation 'io.coil-kt:coil-compose:2.5.0'
8687

8788
//Compose dependencies
8889
implementation platform('androidx.compose:compose-bom:2023.10.01')
@@ -94,6 +95,7 @@ dependencies {
9495
implementation 'androidx.navigation:navigation-compose:2.7.5'
9596
implementation 'androidx.activity:activity-compose:1.8.0'
9697
implementation 'androidx.biometric:biometric:1.1.0'
98+
implementation "androidx.autofill:autofill:1.1.0"
9799

98100
//Room dependencies
99101
implementation "androidx.room:room-ktx:$room_version"
@@ -104,7 +106,7 @@ dependencies {
104106
testImplementation 'junit:junit:4.13.2'
105107
androidTestImplementation 'androidx.arch.core:core-testing:2.2.0'
106108

107-
androidTestImplementation platform('androidx.compose:compose-bom:2023.09.01')
109+
androidTestImplementation platform('androidx.compose:compose-bom:2023.10.01')
108110
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
109111
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
110112
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
35.7 KB
Loading
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<group
8+
android:scaleX="0.08035714"
9+
android:scaleY="0.08035714">
10+
<path
11+
android:fillType="evenOdd"
12+
android:pathData="M0,0h1344v1344h-1344z"
13+
android:strokeLineJoin="round">
14+
<aapt:attr name="android:fillColor">
15+
<gradient
16+
android:endX="1343.9999"
17+
android:endY="1.2959057E-4"
18+
android:startX="163.34073"
19+
android:startY="1344.0002"
20+
android:type="linear">
21+
<item
22+
android:color="#F6A110"
23+
android:offset="0" />
24+
<item
25+
android:color="#F1BA5B"
26+
android:offset="1" />
27+
</gradient>
28+
</aapt:attr>
29+
</path>
30+
</group>
31+
</vector>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!-- drawable/ic_launcher_foreground.xml -->
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<group
8+
android:scaleX="1.98"
9+
android:scaleY="1.98"
10+
android:translateX="30.24"
11+
android:translateY="30.24">
12+
<path
13+
android:fillColor="#fff"
14+
android:pathData="M17,7H22V17H17V19A1,1 0 0,0 18,20H20V22H17.5C16.95,22 16,21.55 16,21C16,21.55 15.05,22 14.5,22H12V20H14A1,1 0 0,0 15,19V5A1,1 0 0,0 14,4H12V2H14.5C15.05,2 16,2.45 16,3C16,2.45 16.95,2 17.5,2H20V4H18A1,1 0 0,0 17,5V7M2,7H13V9H4V15H13V17H2V7M20,15V9H17V15H20M8.5,12A1.5,1.5 0 0,0 7,10.5A1.5,1.5 0 0,0 5.5,12A1.5,1.5 0 0,0 7,13.5A1.5,1.5 0 0,0 8.5,12M13,10.89C12.39,10.33 11.44,10.38 10.88,11C10.32,11.6 10.37,12.55 11,13.11C11.55,13.63 12.43,13.63 13,13.11V10.89Z" />
15+
</group>
16+
</vector>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@drawable/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
6+
</adaptive-icon>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@drawable/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
5+
</adaptive-icon>
3.8 KB
Loading
3.8 KB
Loading
2.58 KB
Loading

0 commit comments

Comments
 (0)