Skip to content
Snippets Groups Projects
Commit a7ea5e06 authored by Vectura Games's avatar Vectura Games
Browse files

Android 15 fixes

parent 0c1bf44d
No related branches found
No related tags found
No related merge requests found
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.9.24'
ext.kotlin_version = '2.0.21'
repositories {
mavenCentral()
maven {
......
......@@ -28,7 +28,7 @@ android {
compileSdk 35
targetSdkVersion 35
buildToolsVersion = '35.0.0'
versionCode 10
versionCode 11
versionName "1.4.0"
resourceConfigurations += ['en']
multiDexEnabled true
......@@ -37,6 +37,9 @@ android {
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}
}
buildTypes {
release {
......@@ -44,13 +47,6 @@ android {
signingConfig signingConfigs.release
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}
buildFeatures {
viewBinding true
}
......@@ -68,10 +64,11 @@ dependencies {
implementation "androidx.navigation:navigation-ui-ktx:2.8.4"
implementation "androidx.preference:preference-ktx:1.2.1"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.core:core-splashscreen:1.2.0-alpha02"
implementation "com.android.support:multidex:1.0.3"
implementation "com.google.android.material:material:1.12.0"
implementation "com.leinardi.android:speed-dial:3.3.0"
implementation "joda-time:joda-time:2.12.7"
implementation "joda-time:joda-time:2.13.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation ("de.slackspace:openkeepass:0.8.2") {
exclude module: 'stax'
......
......@@ -110,7 +110,7 @@ object Util {
return Math.round(px / (dpi / DisplayMetrics.DENSITY_DEFAULT))
}
fun getVersionName(context: Context): String {
fun getVersionName(context: Context): String? {
try {
return context.packageManager.getPackageInfo(context.packageName, 0).versionName
}
......
......@@ -2,7 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true" >
<ScrollView
android:layout_width="match_parent"
......
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:fitsSystemWindows="true"
tools:context=".activity.EntryActivity">
<include
......
......@@ -149,7 +149,7 @@
<string name="app_name" translatable="false">Password Master</string>
<string name="other_author" translatable="false">Vectura Games OÜ, 2023</string>
<string name="other_author" translatable="false">Vectura Games OÜ, 2024</string>
<string name="other_website">https://vecturagames.com</string>
<string name="other_privacy_policy_website" translatable="false">https://vecturagames.com/privacy_passwordmaster</string>
<string name="other_contact_email" translatable="false">passwordmaster@vecturagames.com</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment