diff --git a/.editorconfig b/.editorconfig
index 3f25798..e0ba373 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,3 @@
[*.{kt,kts}]
-ktlint_code_style = android_studio
\ No newline at end of file
+ktlint_code_style = android_studio
+ktlint_standard_function-expression-body = disabled
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ddae8bf..cb57737 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,16 +5,16 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.application")
id("kotlin-android")
- id("org.jmailen.kotlinter") version "4.3.0"
+ id("org.jmailen.kotlinter") version "4.4.1"
}
android {
namespace = "com.github.gotify"
- compileSdk = 34
+ compileSdk = 35
defaultConfig {
applicationId = "com.github.gotify"
minSdk = 23
- targetSdk = 34
+ targetSdk = 35
versionCode = 32
versionName = "2.8.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -75,7 +75,7 @@ if (project.hasProperty("sign")) {
}
dependencies {
- val coilVersion = "2.6.0"
+ val coilVersion = "2.7.0"
val markwonVersion = "4.6.2"
val tinylogVersion = "2.7.0"
implementation(project(":client"))
@@ -87,7 +87,7 @@ dependencies {
implementation("androidx.vectordrawable:vectordrawable:1.2.0")
implementation("androidx.preference:preference-ktx:1.2.1")
- implementation("com.github.cyb3rko:QuickPermissions-Kotlin:1.1.3")
+ implementation("com.github.cyb3rko:QuickPermissions-Kotlin:1.1.5")
implementation("io.coil-kt:coil:$coilVersion")
implementation("io.coil-kt:coil-svg:$coilVersion")
implementation("io.noties.markwon:core:$markwonVersion")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07465df..c48f421 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
-
+
@@ -40,7 +40,6 @@
android:name=".messages.MessagesActivity"
android:exported="false"
android:launchMode="singleTask"
- android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" />
create(modelClass: Class): T {
if (modelClass == MessagesModel::class.java) {
@Suppress("UNCHECKED_CAST")
diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt
index 14cc1e4..65be17a 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt
@@ -2,8 +2,4 @@ package com.github.gotify.messages.provider
import com.github.gotify.client.model.Message
-internal class MessageDeletion(
- val message: Message,
- val allPosition: Int,
- val appPosition: Int
-)
+internal class MessageDeletion(val message: Message, val allPosition: Int, val appPosition: Int)
diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
index 9d1c293..2b1efb1 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
@@ -2,7 +2,4 @@ package com.github.gotify.messages.provider
import com.github.gotify.client.model.Message
-internal data class MessageWithImage(
- val message: Message,
- val image: String?
-)
+internal data class MessageWithImage(val message: Message, val image: String?)
diff --git a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt b/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
index bd57861..a4d32ce 100644
--- a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
@@ -23,7 +23,9 @@ import com.github.gotify.Utils
import com.github.gotify.databinding.SettingsActivityBinding
import com.google.android.material.dialog.MaterialAlertDialogBuilder
-internal class SettingsActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
+internal class SettingsActivity :
+ AppCompatActivity(),
+ OnSharedPreferenceChangeListener {
private lateinit var binding: SettingsActivityBinding
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f62713a..a91cf93 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:fillViewport="true"
+ android:fitsSystemWindows="true">
diff --git a/app/src/main/res/layout/activity_messages.xml b/app/src/main/res/layout/activity_messages.xml
index f66d2c1..894c804 100644
--- a/app/src/main/res/layout/activity_messages.xml
+++ b/app/src/main/res/layout/activity_messages.xml
@@ -5,6 +5,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
tools:openDrawer="start">
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index b581e95..4779e41 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
/dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 25da30d..9d21a21 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################