Skip to content

Commit

Permalink
Switch to launch-mode singleTask
Browse files Browse the repository at this point in the history
This mainly fixes a bug, that sometime scene-files could not
be loaded.
  • Loading branch information
thetwom committed Jun 14, 2022
1 parent a4dfc42 commit 740fd0f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
13 changes: 7 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "de.moekadu.metronome"
minSdkVersion 23
targetSdkVersion 32
versionCode 48
versionName "4.5.0"
versionCode 49
versionName "4.5.1"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand All @@ -28,16 +28,17 @@ android {
kotlinOptions {
jvmTarget = "11"
}
namespace 'de.moekadu.metronome'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.activity:activity-ktx:1.4.0'
implementation 'androidx.fragment:fragment-ktx:1.4.1'
implementation 'com.google.android.material:material:1.7.0-alpha01'
implementation 'com.google.android.material:material:1.7.0-alpha02'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.media:media:1.6.0'
implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
implementation 'androidx.preference:preference-ktx:1.2.0'
Expand All @@ -48,5 +49,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.core:core-ktx:1.8.0'
}
5 changes: 2 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
- along with Metronome. If not, see <http://www.gnu.org/licenses/>.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.moekadu.metronome">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.VIBRATE"/>
Expand All @@ -35,7 +34,7 @@
android:fullBackupContent="@xml/backup_descriptor">
<activity
android:name="de.moekadu.metronome.MainActivity"
android:launchMode="singleInstance"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"
android:theme="@style/AppTheme"
android:exported="true">
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.7.0'

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"


Expand Down
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/49.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
v4.5.0:
- Allow sharing only selected scenes
- Dialogs don't disappear on screen rotation

v4.5.1:
- Fix loading scenes files, which sometimes did not work.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

0 comments on commit 740fd0f

Please sign in to comment.