From 7b482f8dcea1edde2109a1dfd7a1ebeb2272bcc9 Mon Sep 17 00:00:00 2001 From: thetwom Date: Sun, 14 Nov 2021 21:13:30 +0100 Subject: [PATCH] - Update libs - Update changelogs - Minor cleaning --- app/build.gradle | 14 +++++------ .../metronome/DummyViewGroupWithTransition.kt | 24 +++++++++---------- .../de/moekadu/metronome/ScenesFragment.kt | 11 ++++----- .../metadata/android/en-US/changelogs/45.txt | 5 ++-- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e03f84a..865058c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,23 +32,23 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.0-beta01' - implementation 'androidx.activity:activity-ktx:1.4.0-rc01' - implementation 'androidx.fragment:fragment-ktx:1.4.0-alpha10' - implementation 'com.google.android.material:material:1.5.0-alpha05' + implementation 'androidx.appcompat:appcompat:1.4.0-rc01' + implementation 'androidx.activity:activity-ktx:1.4.0' + implementation 'androidx.fragment:fragment-ktx:1.4.0-rc01' + implementation 'com.google.android.material:material:1.5.0-beta01' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt' implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'androidx.media:media:1.4.3' implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-rc01' - implementation 'androidx.lifecycle:lifecycle-service:2.4.0-rc01' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0' + implementation 'androidx.lifecycle:lifecycle-service:2.4.0' implementation "androidx.recyclerview:recyclerview:1.2.1" implementation "androidx.viewpager2:viewpager2:1.1.0-beta01" 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-rc01' + implementation 'androidx.core:core-ktx:1.7.0' } repositories { mavenCentral() diff --git a/app/src/main/java/de/moekadu/metronome/DummyViewGroupWithTransition.kt b/app/src/main/java/de/moekadu/metronome/DummyViewGroupWithTransition.kt index 20ba90b..096dbe4 100644 --- a/app/src/main/java/de/moekadu/metronome/DummyViewGroupWithTransition.kt +++ b/app/src/main/java/de/moekadu/metronome/DummyViewGroupWithTransition.kt @@ -48,16 +48,16 @@ class DummyViewGroupWithTransition(context : Context, attrs : AttributeSet?, def dummyView.layout(0, 0, 1, 1) } - fun dummyTransition() { - // Log.v("Metronome", "DummyViewGroupWithTransition.dummyTransition") - TransitionManager.beginDelayedTransition(this, - AutoTransition().apply { - duration = 1L - } - ) - if (dummyView.visibility == View.VISIBLE) - dummyView.visibility = View.GONE - else - dummyView.visibility = View.VISIBLE - } +// fun dummyTransition() { +// // Log.v("Metronome", "DummyViewGroupWithTransition.dummyTransition") +// TransitionManager.beginDelayedTransition(this, +// AutoTransition().apply { +// duration = 1L +// } +// ) +// if (dummyView.visibility == View.VISIBLE) +// dummyView.visibility = View.GONE +// else +// dummyView.visibility = View.VISIBLE +// } } \ No newline at end of file diff --git a/app/src/main/java/de/moekadu/metronome/ScenesFragment.kt b/app/src/main/java/de/moekadu/metronome/ScenesFragment.kt index a064822..6d6e50e 100644 --- a/app/src/main/java/de/moekadu/metronome/ScenesFragment.kt +++ b/app/src/main/java/de/moekadu/metronome/ScenesFragment.kt @@ -24,14 +24,12 @@ import android.content.SharedPreferences import android.graphics.Canvas import android.graphics.drawable.Animatable import android.os.Bundle -import android.util.Log import android.view.* import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.AppCompatImageButton import androidx.constraintlayout.widget.ConstraintLayout -import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.fragment.app.Fragment @@ -41,7 +39,6 @@ import androidx.preference.PreferenceManager import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.snackbar.Snackbar import java.io.File import kotlin.math.absoluteValue @@ -85,10 +82,10 @@ class ScenesFragment : Fragment() { super.onItemRangeRemoved(positionStart, itemCount) } - override fun onChanged() { -// Log.v("Metronome", "ScenesFragment: onChanged") - super.onChanged() - } +// override fun onChanged() { +//// Log.v("Metronome", "ScenesFragment: onChanged") +// super.onChanged() +// } override fun onItemRangeChanged(positionStart: Int, itemCount: Int) { // Log.v("Metronome", "ScenesFragment: onItemRangeChanged") diff --git a/fastlane/metadata/android/en-US/changelogs/45.txt b/fastlane/metadata/android/en-US/changelogs/45.txt index ca33f1b..7c400a9 100644 --- a/fastlane/metadata/android/en-US/changelogs/45.txt +++ b/fastlane/metadata/android/en-US/changelogs/45.txt @@ -6,5 +6,6 @@ v4.3.0: - Fix: volume-slider button did not always reappear v4.3.1: -- Slighly increase scenes in compact view of scenes -- Slighly increase player controls in scenes view +- Slightly increase scenes in compact view of scenes +- Slightly increase player controls in scenes view +- Update French translations (thanks to brilnius)