mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-23 22:37:55 +02:00
Merge pull request #6082 from kambala-decapitator/android-improvements
Android improvements
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'com.github.zellius.shortcut-helper'
|
||||
|
||||
android {
|
||||
/*******************************************************
|
||||
@@ -36,8 +37,6 @@ android {
|
||||
|
||||
versionCode 1700
|
||||
versionName "1.7.0"
|
||||
|
||||
setProperty("archivesBaseName", "vcmi")
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -102,6 +101,9 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
base.archivesName = "vcmi"
|
||||
shortcutHelper.filePath = "../shortcuts.xml"
|
||||
|
||||
def SigningPropertiesPath(final basePath, final signingConfigKey) {
|
||||
return file("${basePath}/${signingConfigKey}.properties")
|
||||
}
|
||||
@@ -147,6 +149,9 @@ def LoadSigningConfig(final signingConfigKey) {
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: '../libs', include: ['*.jar', '*.aar'])
|
||||
implementation 'androidx.annotation:annotation:1.7.1'
|
||||
implementation 'androidx.documentfile:documentfile:1.0.1'
|
||||
implementation('androidx.annotation:annotation:1.9.1')
|
||||
|
||||
// later versions require API level 21
|
||||
implementation('androidx.appcompat:appcompat:1.6.1')
|
||||
implementation('androidx.documentfile:documentfile:1.0.1')
|
||||
}
|
||||
|
||||
7
android/vcmi-app/src/main/res/values-v21/styles.xml
Normal file
7
android/vcmi-app/src/main/res/values-v21/styles.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
|
||||
<!-- for Android 15 + SDK 35 -->
|
||||
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
|
||||
</style>
|
||||
</resources>
|
||||
4
android/vcmi-app/src/main/res/values/styles.xml
Normal file
4
android/vcmi-app/src/main/res/values/styles.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="AppTheme" parent="@style/Theme.AppCompat.NoActionBar" />
|
||||
</resources>
|
||||
@@ -1,13 +0,0 @@
|
||||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shortcut
|
||||
android:shortcutId="play"
|
||||
android:enabled="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:shortcutShortLabel="@string/shortcut_play"
|
||||
android:shortcutLongLabel="@string/shortcut_play">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="is.xyz.vcmi"
|
||||
android:targetClass="eu.vcmi.vcmi.VcmiSDLActivity" />
|
||||
</shortcut>
|
||||
</shortcuts>
|
||||
@@ -1,13 +0,0 @@
|
||||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shortcut
|
||||
android:shortcutId="play"
|
||||
android:enabled="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:shortcutShortLabel="@string/shortcut_play"
|
||||
android:shortcutLongLabel="@string/shortcut_play">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="is.xyz.vcmi.daily"
|
||||
android:targetClass="eu.vcmi.vcmi.VcmiSDLActivity" />
|
||||
</shortcut>
|
||||
</shortcuts>
|
||||
@@ -1,13 +0,0 @@
|
||||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<shortcut
|
||||
android:shortcutId="play"
|
||||
android:enabled="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:shortcutShortLabel="@string/shortcut_play"
|
||||
android:shortcutLongLabel="@string/shortcut_play">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:targetPackage="is.xyz.vcmi.debug"
|
||||
android:targetClass="eu.vcmi.vcmi.VcmiSDLActivity" />
|
||||
</shortcut>
|
||||
</shortcuts>
|
||||
Reference in New Issue
Block a user