diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..074d630
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,256 @@
+# Created by https://www.toptal.com/developers/gitignore/api/androidstudio,android,java,kotlin,macos,gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,android,java,kotlin,macos,gradle
+
+### Android ###
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+### Android Patch ###
+gen-external-apklibs
+
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Kotlin ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Keystore files
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Android Patch
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+.idea/gradle.xml
+.idea/jarRepositories.xml
+.idea/navEditor.xml
+
+# Legacy Eclipse project files
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/androidstudio,android,java,kotlin,macos,gradle
diff --git a/.gradle/4.10.1/fileChanges/last-build.bin b/.gradle/4.10.1/fileChanges/last-build.bin
deleted file mode 100644
index f76dd23..0000000
Binary files a/.gradle/4.10.1/fileChanges/last-build.bin and /dev/null differ
diff --git a/.gradle/4.10.1/fileContent/fileContent.lock b/.gradle/4.10.1/fileContent/fileContent.lock
deleted file mode 100644
index f2aeab7..0000000
Binary files a/.gradle/4.10.1/fileContent/fileContent.lock and /dev/null differ
diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin
deleted file mode 100644
index dd0da19..0000000
Binary files a/.gradle/4.10.1/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/.gradle/4.10.1/fileHashes/fileHashes.lock b/.gradle/4.10.1/fileHashes/fileHashes.lock
deleted file mode 100644
index 73b8532..0000000
Binary files a/.gradle/4.10.1/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/.gradle/4.10.1/fileHashes/resourceHashesCache.bin b/.gradle/4.10.1/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index ec84ee0..0000000
Binary files a/.gradle/4.10.1/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/.gradle/4.10.1/gc.properties b/.gradle/4.10.1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/4.10.1/javaCompile/classAnalysis.bin b/.gradle/4.10.1/javaCompile/classAnalysis.bin
deleted file mode 100644
index b4f6a1c..0000000
Binary files a/.gradle/4.10.1/javaCompile/classAnalysis.bin and /dev/null differ
diff --git a/.gradle/4.10.1/javaCompile/jarAnalysis.bin b/.gradle/4.10.1/javaCompile/jarAnalysis.bin
deleted file mode 100644
index 6fd307a..0000000
Binary files a/.gradle/4.10.1/javaCompile/jarAnalysis.bin and /dev/null differ
diff --git a/.gradle/4.10.1/javaCompile/javaCompile.lock b/.gradle/4.10.1/javaCompile/javaCompile.lock
deleted file mode 100644
index ad69962..0000000
Binary files a/.gradle/4.10.1/javaCompile/javaCompile.lock and /dev/null differ
diff --git a/.gradle/4.10.1/javaCompile/taskHistory.bin b/.gradle/4.10.1/javaCompile/taskHistory.bin
deleted file mode 100644
index 5ec6e72..0000000
Binary files a/.gradle/4.10.1/javaCompile/taskHistory.bin and /dev/null differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin
deleted file mode 100644
index 4596a55..0000000
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.bin and /dev/null differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock
deleted file mode 100644
index 1ae42b8..0000000
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.lock and /dev/null differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 40d33fe..be2d57c 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 6cf7911..ad0acda 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Fri Apr 12 14:57:54 ICT 2019
-gradle.version=4.10.1
+#Sun Feb 26 18:50:28 CET 2023
+gradle.version=7.5
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index ef04769..709fbdb 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2996d53..7b46144 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="gradleJvm" value="11" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/libraries/Gradle____local_aars____Users_quang_StudioProjects_spectrogram_android_app_libs_sound_engine_android_1_0_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars____Users_quang_StudioProjects_spectrogram_android_app_libs_sound_engine_android_1_0_jar_unspecified_jar.xml
deleted file mode 100644
index e5af3c0..0000000
--- a/.idea/libraries/Gradle____local_aars____Users_quang_StudioProjects_spectrogram_android_app_libs_sound_engine_android_1_0_jar_unspecified_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: __local_aars__:/Users/quang/StudioProjects/spectrogram-android/app/libs/sound-engine-android-1.0.jar:unspecified@jar">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/sound-engine-android-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
deleted file mode 100644
index bf16fff..0000000
--- a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/ae9b923fc99c1fc5a7a9b6cedc6df8b2b8529c54/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
deleted file mode 100644
index 6672397..0000000
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/53209bb51b9af391e0a5166702d35022/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/53209bb51b9af391e0a5166702d35022/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
deleted file mode 100644
index 27b1867..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/bcdaa509a856d1430e736b102f899aa9870a8f83/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
deleted file mode 100644
index 71821ec..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/d558864ad1094d012da3a27da5ea2b6f/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/d558864ad1094d012da3a27da5ea2b6f/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
deleted file mode 100644
index aae250e..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/458882adeaaf0459a24b6cc0620a52d8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/458882adeaaf0459a24b6cc0620a52d8/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
deleted file mode 100644
index b31ccb8..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/41b5424526fc327abf4cfe4af30e63e7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/41b5424526fc327abf4cfe4af30e63e7/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
deleted file mode 100644
index 9aecdd9..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2d5e166dfd68db7616c8f4c73eaef12d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2d5e166dfd68db7616c8f4c73eaef12d/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
deleted file mode 100644
index dfedd5e..0000000
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e63434b796d7a8f88d558b9b87f1cb5e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e63434b796d7a8f88d558b9b87f1cb5e/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
deleted file mode 100644
index b9cd1f7..0000000
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
deleted file mode 100644
index bf7260a..0000000
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/114f4d34135580659871c08e858deac1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/114f4d34135580659871c08e858deac1/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
deleted file mode 100644
index 80e4d73..0000000
--- a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:collections:28.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
deleted file mode 100644
index 5ff7801..0000000
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
deleted file mode 100644
index 920f5ed..0000000
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9ae2592ca0df63dfcf3a4ba217776155/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9ae2592ca0df63dfcf3a4ba217776155/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
deleted file mode 100644
index 1d6cc10..0000000
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:customview:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9d361148eb61406ab66a6235205ff861/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9d361148eb61406ab66a6235205ff861/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
deleted file mode 100644
index a51c504..0000000
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:documentfile:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/9fbaeb11a1709f40b8c3e131e893d946/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/9fbaeb11a1709f40b8c3e131e893d946/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
deleted file mode 100644
index d138561..0000000
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
deleted file mode 100644
index 540cf5b..0000000
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:interpolator:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/49a1183b575ac6fc445fc1695ec0b0fe/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/49a1183b575ac6fc445fc1695ec0b0fe/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
deleted file mode 100644
index b03c60c..0000000
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:loader:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/1dce8232a7d3e55b77f211a51b94de51/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/1dce8232a7d3e55b77f211a51b94de51/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
deleted file mode 100644
index 31fa0a0..0000000
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/429ebc12fab666320c3d74e813ed4618/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/429ebc12fab666320c3d74e813ed4618/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
deleted file mode 100644
index 2b9d7fa..0000000
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:print:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
deleted file mode 100644
index 649424c..0000000
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b3588490389ed2b81d7eae59f1ebbfa9/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b3588490389ed2b81d7eae59f1ebbfa9/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
deleted file mode 100644
index 0fdecce..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-annotations:28.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
deleted file mode 100644
index 8e7c4d2..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
deleted file mode 100644
index 4c8d2e9..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/d851e19ff58f9ba16622170c4574d4d3/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/d851e19ff58f9ba16622170c4574d4d3/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
deleted file mode 100644
index 506823e..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/c5aaed92ca766d52464863f17fd27d0b/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/c5aaed92ca766d52464863f17fd27d0b/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
deleted file mode 100644
index 66f0095..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
deleted file mode 100644
index 17fc4d7..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/586109ee95c9971866ff1c3654b06856/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/586109ee95c9971866ff1c3654b06856/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
deleted file mode 100644
index 7af941d..0000000
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
deleted file mode 100644
index f1eb712..0000000
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
deleted file mode 100644
index 8600309..0000000
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/aa2b7f23bb691900cdbdcd102210777b/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/aa2b7f23bb691900cdbdcd102210777b/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
deleted file mode 100644
index f4f25a8..0000000
--- a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: junit:junit:4.12@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
deleted file mode 100644
index 50cf2b9..0000000
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-core:1.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..ef61796 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 703aa34..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/spectrogram-android.iml" filepath="$PROJECT_DIR$/spectrogram-android.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62cd3e9..bcde4a5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="0f5c618b-a140-42b6-983a-44144e71a3c5" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/taskHistory.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/SoundEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/SoundEngine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -23,6 +27,12 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[/Users/softwave/.android/avd/Pixel_3a_API_33_arm64-v8a.avd]" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
@@ -30,137 +40,6 @@
       </state>
     </system>
   </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-40705479">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.0" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="class" value="2" />
-          <entry key="gradle" value="1" />
-          <entry key="iml" value="1" />
-          <entry key="java" value="15" />
-          <entry key="md" value="1" />
-          <entry key="xml" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CLASS" value="2" />
-          <entry key="Groovy" value="1" />
-          <entry key="IDEA_MODULE" value="1" />
-          <entry key="JAVA" value="15" />
-          <entry key="PLAIN_TEXT" value="1" />
-          <entry key="XML" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="gradle" value="1" />
-          <entry key="java" value="12" />
-          <entry key="md" value="3" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="Groovy" value="1" />
-          <entry key="JAVA" value="12" />
-          <entry key="PLAIN_TEXT" value="3" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/SpectrogramActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="79" column="31" lean-forward="true" selection-start-line="79" selection-start-column="31" selection-end-line="79" selection-end-column="31" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#5895#5896#0" expanded="true" />
-                <element signature="e#5957#5958#0" expanded="true" />
-                <element signature="e#9328#9388#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/app.iml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/build.gradle">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="30" selection-start-line="30" selection-end-line="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/Misc.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-90">
-              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/PreferencesActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/SoundEngine.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/TimeView.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="413">
-              <caret line="101" column="29" selection-start-line="101" selection-start-column="29" selection-end-line="101" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="81" column="7" selection-start-line="81" selection-start-column="7" selection-end-line="81" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -179,6 +58,10 @@
       </map>
     </option>
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/README.md" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml" root0="FORCE_HIGHLIGHTING" />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -190,11 +73,15 @@
       </list>
     </option>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectFrameBounds">
     <option name="y" value="23" />
     <option name="width" value="1440" />
     <option name="height" value="822" />
   </component>
+  <component name="ProjectId" id="2MHoE1sdzHcD75NrOXXCZRCVJpf" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -277,28 +164,29 @@
       <pane id="Scope" />
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
-    <property name="device.picker.selection" value="cd89f4eb" />
-    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;android-custom-view/Users/softwave/Library/Android/sdk/sources/android-33/android/view/View.java_SELECTED&quot;: &quot;View&quot;,
+    &quot;android-custom-view/Users/softwave/Projects/spectrogram-android/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.kt_SELECTED&quot;: &quot;FrequencyView&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/softwave/Projects/spectrogram-android&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;,
+    &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;
+  }
+}</component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="net.galmiza.android.spectrogram" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -306,23 +194,23 @@
         <option name="Android.Gradle.BeforeRunTask" enabled="true" />
       </method>
     </configuration>
-    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-      <module name="app" />
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+      <module name="spectrogram-android.app.main" />
       <option name="DEPLOY" value="true" />
       <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
       <option name="DEPLOY_AS_INSTANT" value="false" />
       <option name="ARTIFACT_NAME" value="" />
       <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+      <option name="CLEAR_APP_STORAGE" value="false" />
       <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
       <option name="ACTIVITY_EXTRA_FLAGS" value="" />
       <option name="MODE" value="default_activity" />
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
+      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
       <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
       <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
       <option name="DEBUGGER_TYPE" value="Auto" />
@@ -350,16 +238,22 @@
       </Native>
       <Profilers>
         <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
         <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
       </Profilers>
       <option name="DEEP_LINK" value="" />
       <option name="ACTIVITY_CLASS" value="" />
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
       <method v="2">
         <option name="Android.Gradle.BeforeRunTask" enabled="true" />
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration>$USER_HOME$/.subversion</configuration>
   </component>
@@ -400,8 +294,16 @@
       <window_info anchor="right" id="Palette&#9;" />
     </layout>
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/README.md">
diff --git a/app/app.iml b/app/app.iml
deleted file mode 100644
index 5a9ba3a..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 31128b8..96d257b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,17 +1,18 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     defaultConfig {
         applicationId "net.galmiza.android.spectrogram"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,11 +22,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'net.galmiza.android.spectrogram'
 }
 
 dependencies {
     implementation fileTree(include: ['.jar'], dir: 'libs')
     implementation fileTree(include: ['.so'], dir: 'src/main/jniLibs')
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
 }
diff --git a/app/build/generated/source/buildConfig/debug/net/galmiza/android/spectrogram/BuildConfig.java b/app/build/generated/source/buildConfig/debug/net/galmiza/android/spectrogram/BuildConfig.java
index b17bb79..adcadd7 100644
--- a/app/build/generated/source/buildConfig/debug/net/galmiza/android/spectrogram/BuildConfig.java
+++ b/app/build/generated/source/buildConfig/debug/net/galmiza/android/spectrogram/BuildConfig.java
@@ -7,7 +7,6 @@ public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
   public static final String APPLICATION_ID = "net.galmiza.android.spectrogram";
   public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
 }
diff --git a/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json b/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
deleted file mode 100644
index 0637a08..0000000
--- a/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index 50696bf..dd53db1 100644
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1XbxCLiauKGjOYHsEhrvN_QBcpk= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1XbxCLiauKGjOYHsEhrvN_QBcpk=
deleted file mode 100644
index b12b287..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1XbxCLiauKGjOYHsEhrvN_QBcpk= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/397srTqJQbCUZ50aiEvHxLc8YIQ= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/397srTqJQbCUZ50aiEvHxLc8YIQ=
deleted file mode 100644
index f61d762..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/397srTqJQbCUZ50aiEvHxLc8YIQ= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4zmU62ztexQxx_kBFIbehaW1i1o= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4zmU62ztexQxx_kBFIbehaW1i1o=
deleted file mode 100644
index e27d24a..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4zmU62ztexQxx_kBFIbehaW1i1o= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7edKM4d4GB8dMCv_4lY_MSRBIUY= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7edKM4d4GB8dMCv_4lY_MSRBIUY=
deleted file mode 100644
index e7159a9..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7edKM4d4GB8dMCv_4lY_MSRBIUY= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8H852iyTJQOf7dMiThq+wjO3y8U= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8H852iyTJQOf7dMiThq+wjO3y8U=
deleted file mode 100644
index d0dcd9c..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8H852iyTJQOf7dMiThq+wjO3y8U= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8WuNtwtFP+DZ5GbKERAC_+kPllQ= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8WuNtwtFP+DZ5GbKERAC_+kPllQ=
deleted file mode 100644
index 483b42c..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8WuNtwtFP+DZ5GbKERAC_+kPllQ= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8x6P_VDeUlsZtno9xqZPOUezYYg= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8x6P_VDeUlsZtno9xqZPOUezYYg=
deleted file mode 100644
index 3c086f3..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8x6P_VDeUlsZtno9xqZPOUezYYg= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9W11qr_Ivgm+8GRwIUU4Tz6+Hlc= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9W11qr_Ivgm+8GRwIUU4Tz6+Hlc=
deleted file mode 100644
index 371b441..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9W11qr_Ivgm+8GRwIUU4Tz6+Hlc= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BT+kowzvf54CCHDuwhjItKev0pQ= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BT+kowzvf54CCHDuwhjItKev0pQ=
deleted file mode 100644
index 32d47c0..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BT+kowzvf54CCHDuwhjItKev0pQ= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BdsXfeC9BEDMzkVHQQjWUUuuunM= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BdsXfeC9BEDMzkVHQQjWUUuuunM=
deleted file mode 100644
index e9e7608..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BdsXfeC9BEDMzkVHQQjWUUuuunM= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRu6zFR0QY039hpm50djmsmSrls= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRu6zFR0QY039hpm50djmsmSrls=
deleted file mode 100644
index 25547cc..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRu6zFR0QY039hpm50djmsmSrls= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fjjlryn505liYi7uYwG_XJFaqYs= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fjjlryn505liYi7uYwG_XJFaqYs=
deleted file mode 100644
index 2365cb9..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fjjlryn505liYi7uYwG_XJFaqYs= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KmYojXvypmBY4i2bMtkl+qOUZDU= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KmYojXvypmBY4i2bMtkl+qOUZDU=
deleted file mode 100644
index 27924dd..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KmYojXvypmBY4i2bMtkl+qOUZDU= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NgsJr4_4ezPCUJxmXUYQuVT81F8= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NgsJr4_4ezPCUJxmXUYQuVT81F8=
deleted file mode 100644
index feebff2..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NgsJr4_4ezPCUJxmXUYQuVT81F8= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ORF+3TCXRZ4X+_AH_PcJ795hHSk= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ORF+3TCXRZ4X+_AH_PcJ795hHSk=
deleted file mode 100644
index 2b56acd..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ORF+3TCXRZ4X+_AH_PcJ795hHSk= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SkaqRUh0ft_0uPqYfD5h+hB7AbQ= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SkaqRUh0ft_0uPqYfD5h+hB7AbQ=
deleted file mode 100644
index 865488d..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SkaqRUh0ft_0uPqYfD5h+hB7AbQ= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z+WzjS4FCV0CmUFCfv26aUsY9jE= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z+WzjS4FCV0CmUFCfv26aUsY9jE=
deleted file mode 100644
index 6bb2c49..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Z+WzjS4FCV0CmUFCfv26aUsY9jE= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zt_5nJSRRtLq_hJGMPcQZ3dKKnc= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zt_5nJSRRtLq_hJGMPcQZ3dKKnc=
deleted file mode 100644
index a19a2a5..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zt_5nJSRRtLq_hJGMPcQZ3dKKnc= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c9mW14Ej2D5uFUswwyZYECmVPQg= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c9mW14Ej2D5uFUswwyZYECmVPQg=
deleted file mode 100644
index 1423435..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c9mW14Ej2D5uFUswwyZYECmVPQg= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dTdSyygocujg5vzpKB2yTdqNsQk= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dTdSyygocujg5vzpKB2yTdqNsQk=
deleted file mode 100644
index 083d96b..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dTdSyygocujg5vzpKB2yTdqNsQk= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e4ODIbDI3+anE_LCQXZJEEpJmkI= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e4ODIbDI3+anE_LCQXZJEEpJmkI=
deleted file mode 100644
index a69b1ec..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/e4ODIbDI3+anE_LCQXZJEEpJmkI= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f0tOgf49q2gy07qvfVj0UtONyNI= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f0tOgf49q2gy07qvfVj0UtONyNI=
deleted file mode 100644
index b6ac9fe..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f0tOgf49q2gy07qvfVj0UtONyNI= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kHqUif0ue+6BVmz9d33JJ8_sgVM= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kHqUif0ue+6BVmz9d33JJ8_sgVM=
deleted file mode 100644
index 0fb7130..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kHqUif0ue+6BVmz9d33JJ8_sgVM= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nYZmAb5he_9VUwdaa+teKwml6UM= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nYZmAb5he_9VUwdaa+teKwml6UM=
deleted file mode 100644
index 87586a5..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nYZmAb5he_9VUwdaa+teKwml6UM= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/r6xbb4rWuE3tY9BCv8vhkbZodoc= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/r6xbb4rWuE3tY9BCv8vhkbZodoc=
deleted file mode 100644
index c063f2b..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/r6xbb4rWuE3tY9BCv8vhkbZodoc= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rDpkyv4OA+LSG752VlFS7oupoGQ= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rDpkyv4OA+LSG752VlFS7oupoGQ=
deleted file mode 100644
index 8d3e763..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rDpkyv4OA+LSG752VlFS7oupoGQ= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rYvDCpXhIGZQZNuL6EVNt4Uw3HY= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rYvDCpXhIGZQZNuL6EVNt4Uw3HY=
deleted file mode 100644
index 1c79806..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rYvDCpXhIGZQZNuL6EVNt4Uw3HY= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/spPPG7x8f9oRX2WNsLH3PzLoYL8= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/spPPG7x8f9oRX2WNsLH3PzLoYL8=
deleted file mode 100644
index 06e914d..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/spPPG7x8f9oRX2WNsLH3PzLoYL8= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suSzNBBBsy3qZFj0fteD9mmNZHM= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suSzNBBBsy3qZFj0fteD9mmNZHM=
deleted file mode 100644
index e49acf7..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/suSzNBBBsy3qZFj0fteD9mmNZHM= and /dev/null differ
diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tgRu1UDE4I7YyGOxflcYy_nWX6Q= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tgRu1UDE4I7YyGOxflcYy_nWX6Q=
deleted file mode 100644
index 2dae2f9..0000000
Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tgRu1UDE4I7YyGOxflcYy_nWX6Q= and /dev/null differ
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index ef4683a..84a8ab8 100644
--- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/assets"/><source path="/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/debug/assets"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/main/assets"/><source path="/Users/softwave/Projects/spectrogram-android/app/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/debug/assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index cb5287f..eaae1da 100644
--- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs"><file name="mips/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/mips/libsound-engine.so"/><file name="armeabi-v7a/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/armeabi-v7a/libsound-engine.so"/><file name="mips64/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/mips64/libsound-engine.so"/><file name="x86/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/x86/libsound-engine.so"/><file name="arm64-v8a/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/arm64-v8a/libsound-engine.so"/><file name="armeabi/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/armeabi/libsound-engine.so"/><file name="x86_64/libsound-engine.so" path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/jniLibs/x86_64/libsound-engine.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs"><file name="mips/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/mips/libsound-engine.so"/><file name="armeabi-v7a/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/armeabi-v7a/libsound-engine.so"/><file name="mips64/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/mips64/libsound-engine.so"/><file name="x86/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/x86/libsound-engine.so"/><file name="arm64-v8a/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/arm64-v8a/libsound-engine.so"/><file name="armeabi/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/armeabi/libsound-engine.so"/><file name="x86_64/libsound-engine.so" path="/Users/softwave/Projects/spectrogram-android/app/src/main/jniLibs/x86_64/libsound-engine.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index e5233b1..87cb714 100644
--- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/quang/StudioProjects/spectrogram-android/app/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/softwave/Projects/spectrogram-android/app/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index a362b2e..3e6484c 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,34 +1,13 @@
-#Fri Apr 12 15:19:38 ICT 2019
-path.1=classes.dex
+#Tue Mar 07 21:38:20 CET 2023
+path.3=4/classes.dex
+path.2=1/classes.dex
+path.1=0/classes.dex
 path.0=classes.dex
-renamed.10=classes11.dex
-renamed.9=classes10.dex
-renamed.8=classes9.dex
-renamed.7=classes8.dex
-renamed.6=classes7.dex
-renamed.5=classes6.dex
-renamed.4=classes5.dex
+base.3=/Users/softwave/Projects/spectrogram-android/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
+base.2=/Users/softwave/Projects/spectrogram-android/app/build/intermediates/dex/debug/mergeProjectDexDebug/1/classes.dex
+base.1=/Users/softwave/Projects/spectrogram-android/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
+base.0=/Users/softwave/Projects/spectrogram-android/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
 renamed.3=classes4.dex
 renamed.2=classes3.dex
-base.9=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/14
 renamed.1=classes2.dex
-base.8=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/11
 renamed.0=classes.dex
-base.7=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/12
-base.6=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/20
-base.5=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/18
-base.4=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/15
-base.3=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/16
-base.2=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/13
-base.1=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/19
-base.0=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/17
-base.10=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/21
-path.10=classes.dex
-path.9=classes.dex
-path.8=classes.dex
-path.7=classes.dex
-path.6=classes.dex
-path.5=classes.dex
-path.4=classes.dex
-path.3=classes.dex
-path.2=classes.dex
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
deleted file mode 100644
index 31b2cb8..0000000
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-#Internal package file, do not edit.
-#Fri Apr 12 15:19:38 ICT 2019
-17.baseType=DIRECTORY
-4.path=classes.dex
-8.set=DEX
-11.set=NATIVE_RESOURCE
-2.baseType=DIRECTORY
-4.baseType=DIRECTORY
-14.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/12
-16.set=NATIVE_RESOURCE
-count=18
-6.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/13
-13.path=classes.dex
-6.baseType=DIRECTORY
-2.set=NATIVE_RESOURCE
-5.path=classes.dex
-8.baseType=DIRECTORY
-0.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-7.set=NATIVE_RESOURCE
-10.set=DEX
-10.baseType=DIRECTORY
-15.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/20
-7.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-14.path=classes.dex
-15.set=DEX
-6.path=classes.dex
-1.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-1.set=NATIVE_RESOURCE
-0.path=lib/mips/libsound-engine.so
-12.baseType=DIRECTORY
-6.set=DEX
-16.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-8.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/19
-15.path=classes.dex
-14.baseType=DIRECTORY
-17.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-10.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/21
-7.path=lib/x86/libsound-engine.so
-16.baseType=DIRECTORY
-14.set=DEX
-2.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-1.path=lib/armeabi-v7a/libsound-engine.so
-0.set=NATIVE_RESOURCE
-1.baseType=DIRECTORY
-3.baseType=DIRECTORY
-5.set=DEX
-9.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/17
-16.path=lib/x86_64/libsound-engine.so
-5.baseType=DIRECTORY
-11.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/mergeJniLibs/debug/0
-8.path=classes.dex
-17.path=lib/mips64/libsound-engine.so
-7.baseType=DIRECTORY
-3.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/18
-10.path=classes.dex
-13.set=DEX
-2.path=lib/arm64-v8a/libsound-engine.so
-9.baseType=DIRECTORY
-12.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/14
-4.set=DEX
-9.path=classes.dex
-4.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/15
-11.path=lib/armeabi/libsound-engine.so
-9.set=DEX
-3.path=classes.dex
-12.set=DEX
-11.baseType=DIRECTORY
-0.baseType=DIRECTORY
-17.set=NATIVE_RESOURCE
-13.baseType=DIRECTORY
-13.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/11
-15.baseType=DIRECTORY
-3.set=DEX
-5.base=/Users/quang/StudioProjects/spectrogram-android/app/build/intermediates/transforms/dexMerger/debug/16
-12.path=classes.dex
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/KfgJAEvAyg2OixcKrn7OVXz2k14= b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/KfgJAEvAyg2OixcKrn7OVXz2k14=
deleted file mode 100644
index 965d601..0000000
Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/KfgJAEvAyg2OixcKrn7OVXz2k14= and /dev/null differ
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/Ywd8SYm6DrydMTM+fnBHcYPFmYU= b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/Ywd8SYm6DrydMTM+fnBHcYPFmYU=
deleted file mode 100644
index dd1b920..0000000
Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/Ywd8SYm6DrydMTM+fnBHcYPFmYU= and /dev/null differ
diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 7a3d7e5..4b5c088 100644
--- a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -7,23 +7,26 @@
 
     <uses-sdk
         android:minSdkVersion="21"
-        android:targetSdkVersion="28" />
+        android:targetSdkVersion="33" />
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-    <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
+    <permission
+        android:name="net.galmiza.android.spectrogram.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="net.galmiza.android.spectrogram.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" /> <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
     <application
         android:allowBackup="true"
-        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+        android:appComponentFactory="androidx.core.app.CoreComponentFactory"
         android:debuggable="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:testOnly="true"
         android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="net.galmiza.android.spectrogram.SpectrogramActivity"
             android:configChanges=""
-            android:label="@string/app_name"
+            android:exported="true"
             android:launchMode="singleTop" > <!-- android:screenOrientation="landscape" -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,15 +34,27 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="net.galmiza.android.spectrogram.PreferencesActivity"
-            android:label="@string/app_name" >
+        <activity android:name="net.galmiza.android.spectrogram.PreferencesActivity" >
         </activity>
 
+        <uses-library
+            android:name="androidx.window.extensions"
+            android:required="false" />
+        <uses-library
+            android:name="androidx.window.sidecar"
+            android:required="false" />
+
         <provider
-            android:name="com.android.tools.ir.server.InstantRunContentProvider"
-            android:authorities="net.galmiza.android.spectrogram.com.android.tools.ir.server.InstantRunContentProvider"
-            android:multiprocess="true" />
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="net.galmiza.android.spectrogram.androidx-startup"
+            android:exported="false" >
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="androidx.lifecycle.ProcessLifecycleInitializer"
+                android:value="androidx.startup" />
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/build/intermediates/merged_manifests/debug/output.json b/app/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index f987e9e..0000000
--- a/app/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.galmiza.android.spectrogram","split":"","minSdkVersion":"21"}}]
\ No newline at end of file
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
index 03ce411..0ea76ef 100644
--- a/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,163 +1,293 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-MERGED from [com.android.support:appcompat-v7:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-fragment:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e63434b796d7a8f88d558b9b87f1cb5e/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-core-ui:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/d851e19ff58f9ba16622170c4574d4d3/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-core-utils:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/c5aaed92ca766d52464863f17fd27d0b/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/586109ee95c9971866ff1c3654b06856/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:loader:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/1dce8232a7d3e55b77f211a51b94de51/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:viewpager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/aa2b7f23bb691900cdbdcd102210777b/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:coordinatorlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:drawerlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:slidingpanelayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b3588490389ed2b81d7eae59f1ebbfa9/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:customview:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9d361148eb61406ab66a6235205ff861/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/114f4d34135580659871c08e858deac1/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:17:1-24:12
-MERGED from [com.android.support:versionedparcelable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/AndroidManifest.xml:17:1-25:12
-MERGED from [com.android.support:cursoradapter:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9ae2592ca0df63dfcf3a4ba217776155/AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/41b5424526fc327abf4cfe4af30e63e7/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:documentfile:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/9fbaeb11a1709f40b8c3e131e893d946/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/429ebc12fab666320c3d74e813ed4618/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:print:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2d5e166dfd68db7616c8f4c73eaef12d/AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:livedata:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/d558864ad1094d012da3a27da5ea2b6f/AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/458882adeaaf0459a24b6cc0620a52d8/AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.core:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/53209bb51b9af391e0a5166702d35022/AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:interpolator:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/49a1183b575ac6fc445fc1695ec0b0fe/AndroidManifest.xml:17:1-22:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-31:12
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+MERGED from [androidx.preference:preference-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/71b5614439bc5e5cb68da35c455e66b5/transformed/jetified-preference-ktx-1.2.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.preference:preference:1.2.0] /Users/softwave/.gradle/caches/transforms-3/c2a40fccb126d7892b99088aecd8cb07/transformed/preference-1.2.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.fragment:fragment-ktx:1.3.6] /Users/softwave/.gradle/caches/transforms-3/432c27a68fa911ff47ed7d2a43059a91/transformed/jetified-fragment-ktx-1.3.6/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.appcompat:appcompat-resources:1.6.1] /Users/softwave/.gradle/caches/transforms-3/b9834295456116db1d92093d6e5e97a8/transformed/jetified-appcompat-resources-1.6.1/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.appcompat:appcompat:1.6.1] /Users/softwave/.gradle/caches/transforms-3/3e0b6e4cd00ec1094432a441bef118ac/transformed/appcompat-1.6.1/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.fragment:fragment:1.3.6] /Users/softwave/.gradle/caches/transforms-3/b8e45eae03c068ba2da31600979e8b3e/transformed/fragment-1.3.6/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.activity:activity:1.6.0] /Users/softwave/.gradle/caches/transforms-3/64a5063021db03c2a4f8399130b385f6/transformed/jetified-activity-1.6.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.activity:activity-ktx:1.6.0] /Users/softwave/.gradle/caches/transforms-3/ddf59855a2b0e6900543b584c5e7f8ff/transformed/jetified-activity-ktx-1.6.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/5a50584bab553e0dd0ea9955d8b44ba0/transformed/jetified-lifecycle-viewmodel-ktx-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.recyclerview:recyclerview:1.0.0] /Users/softwave/.gradle/caches/transforms-3/081745af9872c5c21ff7c4cffc45fba7/transformed/recyclerview-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/softwave/.gradle/caches/transforms-3/52475b09ba76c6a4c05cfcf37d8e6eb3/transformed/legacy-support-core-ui-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/softwave/.gradle/caches/transforms-3/5d369924b46cb974b206673703e6fc35/transformed/legacy-support-core-utils-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.loader:loader:1.0.0] /Users/softwave/.gradle/caches/transforms-3/38d54e46337108b0e8962be7fd594022/transformed/loader-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.5.1] /Users/softwave/.gradle/caches/transforms-3/840375063abf4b9b27cedb29022411ca/transformed/lifecycle-viewmodel-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1] /Users/softwave/.gradle/caches/transforms-3/4c634eb5884be24ccb23be7520a8a275/transformed/jetified-lifecycle-viewmodel-savedstate-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.2.0] /Users/softwave/.gradle/caches/transforms-3/78ec12f86e6aa9035b7e03b174da6410/transformed/slidingpanelayout-1.2.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:17:1-33:12
+MERGED from [androidx.lifecycle:lifecycle-runtime-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/152a259008ed644b37d3efd63014363f/transformed/jetified-lifecycle-runtime-ktx-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.savedstate:savedstate-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/02357a92cb84700819800fbacb51650e/transformed/jetified-savedstate-ktx-1.2.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.savedstate:savedstate:1.2.0] /Users/softwave/.gradle/caches/transforms-3/4be969d56df9b7ab20e7a8554bc5970c/transformed/jetified-savedstate-1.2.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0b74afe45f74cadd2ccf566e09706589/transformed/drawerlayout-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.emoji2:emoji2-views-helper:1.2.0] /Users/softwave/.gradle/caches/transforms-3/371a8e4bf60472d165c534dc9820e6ee/transformed/jetified-emoji2-views-helper-1.2.0/AndroidManifest.xml:2:1-7:12
+MERGED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:17:1-35:12
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/softwave/.gradle/caches/transforms-3/6aa584e1a8f2d5b294f300d034aa9a84/transformed/vectordrawable-animated-1.1.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/softwave/.gradle/caches/transforms-3/bf97f3c802d736c0e34283c68888b7a2/transformed/vectordrawable-1.1.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/e789588554a9261e440bd79046caf9a8/transformed/viewpager-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/bb53665559ac4ad481644c6c4c462df1/transformed/coordinatorlayout-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.customview:customview:1.1.0] /Users/softwave/.gradle/caches/transforms-3/1387bee34b177fe812c354a71833191e/transformed/customview-1.1.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.transition:transition:1.4.1] /Users/softwave/.gradle/caches/transforms-3/4af274aa2f66714dda27e0331cbbd060/transformed/transition-1.4.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/7127e72917a333919842b20137e4fa20/transformed/swiperefreshlayout-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/softwave/.gradle/caches/transforms-3/2ca90870b090e627e436dd27eef01b33/transformed/asynclayoutinflater-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:17:1-30:12
+MERGED from [androidx.core:core-ktx:1.9.0] /Users/softwave/.gradle/caches/transforms-3/68f0ba5a15a92e5cf6c34df510093341/transformed/jetified-core-ktx-1.9.0/AndroidManifest.xml:2:1-7:12
+MERGED from [androidx.annotation:annotation-experimental:1.3.0] /Users/softwave/.gradle/caches/transforms-3/f7f3ba6cb7f4fac97febb0867b26aaba/transformed/jetified-annotation-experimental-1.3.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1] /Users/softwave/.gradle/caches/transforms-3/24bce9f276b456df5ea76c74266209f0/transformed/jetified-lifecycle-livedata-core-ktx-2.3.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/softwave/.gradle/caches/transforms-3/70c229d4855d6f4f58f8e76b5800ca68/transformed/cursoradapter-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:17:1-37:12
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.5.1] /Users/softwave/.gradle/caches/transforms-3/3430e4b961d300d1c540196420474804/transformed/lifecycle-runtime-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:17:1-33:12
+MERGED from [androidx.tracing:tracing:1.0.0] /Users/softwave/.gradle/caches/transforms-3/4bde49b600e6022c63d461fb9ba2a107/transformed/jetified-tracing-1.0.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] /Users/softwave/.gradle/caches/transforms-3/a4aa7fbb1abaa741d90f2d6d053f630c/transformed/versionedparcelable-1.1.1/AndroidManifest.xml:17:1-27:12
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/softwave/.gradle/caches/transforms-3/34a21eb817fcb42b7859242a638924f1/transformed/lifecycle-livedata-2.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.5.1] /Users/softwave/.gradle/caches/transforms-3/aadc75a2498f6dce2b809d58f5c64747/transformed/lifecycle-livedata-core-2.5.1/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.arch.core:core-runtime:2.1.0] /Users/softwave/.gradle/caches/transforms-3/ceeab03a3b8b453e9cc18fb6a8c9587e/transformed/core-runtime-2.1.0/AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/softwave/.gradle/caches/transforms-3/eea76464974f392a795321ab89438ae2/transformed/interpolator-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f5cbe5f9d6c6dc9c7c243dfa09c5f2e0/transformed/documentfile-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/3dac3c555a009f19ad2bc626d96ade9b/transformed/localbroadcastmanager-1.0.0/AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.print:print:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f4968768adee87c4c6c87280eb34bf46/transformed/print-1.0.0/AndroidManifest.xml:17:1-22:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
 	package
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:2:5-46
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:1-29:12
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
 	android:versionName
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:5:5-32
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:4:5-32
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:1:11-69
 	android:versionCode
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:4:5-28
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:3:5-28
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
 	android:installLocation
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:3:5-35
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:2:5-35
 uses-permission#android.permission.RECORD_AUDIO
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:7:5-71
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:6:5-71
 	android:name
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:7:22-68
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:6:22-68
 application
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:10:5-29:19
-MERGED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:22:5-94
-MERGED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:22:5-94
-MERGED from [com.android.support:versionedparcelable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/AndroidManifest.xml:22:5-23:19
-MERGED from [com.android.support:versionedparcelable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/AndroidManifest.xml:22:5-23:19
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:9:5-27:19
+MERGED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:24:5-31:19
+MERGED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:24:5-31:19
+MERGED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:23:5-33:19
+MERGED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:23:5-33:19
+MERGED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:28:5-89
+MERGED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:28:5-89
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:25:5-35:19
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:25:5-35:19
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:25:5-31:19
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:25:5-31:19
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] /Users/softwave/.gradle/caches/transforms-3/a4aa7fbb1abaa741d90f2d6d053f630c/transformed/versionedparcelable-1.1.1/AndroidManifest.xml:24:5-25:19
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] /Users/softwave/.gradle/caches/transforms-3/a4aa7fbb1abaa741d90f2d6d053f630c/transformed/versionedparcelable-1.1.1/AndroidManifest.xml:24:5-25:19
 	android:appComponentFactory
-		ADDED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:22:18-91
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:28:18-86
 	android:label
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:13:9-41
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:12:9-41
 	android:icon
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:12:9-45
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:11:9-45
 	android:allowBackup
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:11:9-35
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:10:9-35
 	android:theme
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:14:9-53
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:13:9-53
 activity#net.galmiza.android.spectrogram.SpectrogramActivity
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:15:9-24:20
-	android:label
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:17:13-45
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:14:9-23:20
 	android:launchMode
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:18:13-43
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:16:13-43
+	android:exported
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:18:13-36
 	android:configChanges
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:19:13-37
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:17:13-37
 	android:name
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:16:13-79
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:15:13-79
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:20:13-23:29
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:19:13-22:29
 action#android.intent.action.MAIN
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:21:17-69
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:20:17-69
 	android:name
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:21:25-66
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:20:25-66
 category#android.intent.category.LAUNCHER
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:22:17-77
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:21:17-77
 	android:name
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:22:27-74
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:21:27-74
 activity#net.galmiza.android.spectrogram.PreferencesActivity
-ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:25:9-28:20
-	android:label
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:27:13-45
+ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:24:9-26:20
 	android:name
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml:26:13-79
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml:25:13-79
 uses-sdk
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-MERGED from [com.android.support:appcompat-v7:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:appcompat-v7:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/3a26c910e7daaa8c2bee24933d0c534a/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-fragment:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-fragment:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/975c1d229589a053c2999de1e8e6651c/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e63434b796d7a8f88d558b9b87f1cb5e/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e63434b796d7a8f88d558b9b87f1cb5e/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-ui:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/d851e19ff58f9ba16622170c4574d4d3/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-ui:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/d851e19ff58f9ba16622170c4574d4d3/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-utils:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/c5aaed92ca766d52464863f17fd27d0b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-utils:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/c5aaed92ca766d52464863f17fd27d0b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/586109ee95c9971866ff1c3654b06856/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-vector-drawable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/586109ee95c9971866ff1c3654b06856/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:loader:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/1dce8232a7d3e55b77f211a51b94de51/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:loader:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/1dce8232a7d3e55b77f211a51b94de51/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:viewpager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/aa2b7f23bb691900cdbdcd102210777b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:viewpager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/aa2b7f23bb691900cdbdcd102210777b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:coordinatorlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:coordinatorlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2a7469b519923998344e04c6d5e74094/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:drawerlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:drawerlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/71445e6dc98b74e41894c2ef4c00698b/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:slidingpanelayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b3588490389ed2b81d7eae59f1ebbfa9/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:slidingpanelayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b3588490389ed2b81d7eae59f1ebbfa9/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:customview:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9d361148eb61406ab66a6235205ff861/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:customview:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9d361148eb61406ab66a6235205ff861/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/ebd40bca5e173e961dd5dfe6ac34b28e/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/114f4d34135580659871c08e858deac1/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/114f4d34135580659871c08e858deac1/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-compat:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/916fe9c3fda9d871c49088e6202c61fe/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:versionedparcelable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:versionedparcelable:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/659b25f081a180c0999047e38c825764/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:cursoradapter:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9ae2592ca0df63dfcf3a4ba217776155/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:cursoradapter:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9ae2592ca0df63dfcf3a4ba217776155/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/41b5424526fc327abf4cfe4af30e63e7/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/41b5424526fc327abf4cfe4af30e63e7/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:documentfile:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/9fbaeb11a1709f40b8c3e131e893d946/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:documentfile:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/9fbaeb11a1709f40b8c3e131e893d946/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/429ebc12fab666320c3d74e813ed4618/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/429ebc12fab666320c3d74e813ed4618/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:print:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:print:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/d662d7f13f66680cc1ef91ba31322927/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2d5e166dfd68db7616c8f4c73eaef12d/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2d5e166dfd68db7616c8f4c73eaef12d/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/d558864ad1094d012da3a27da5ea2b6f/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/d558864ad1094d012da3a27da5ea2b6f/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/458882adeaaf0459a24b6cc0620a52d8/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/458882adeaaf0459a24b6cc0620a52d8/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.core:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/53209bb51b9af391e0a5166702d35022/AndroidManifest.xml:20:5-44
-MERGED from [android.arch.core:runtime:1.1.1] /Users/quang/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/53209bb51b9af391e0a5166702d35022/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:interpolator:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/49a1183b575ac6fc445fc1695ec0b0fe/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:interpolator:28.0.0] /Users/quang/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/49a1183b575ac6fc445fc1695ec0b0fe/AndroidManifest.xml:20:5-44
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+MERGED from [androidx.preference:preference-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/71b5614439bc5e5cb68da35c455e66b5/transformed/jetified-preference-ktx-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.preference:preference-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/71b5614439bc5e5cb68da35c455e66b5/transformed/jetified-preference-ktx-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.preference:preference:1.2.0] /Users/softwave/.gradle/caches/transforms-3/c2a40fccb126d7892b99088aecd8cb07/transformed/preference-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.preference:preference:1.2.0] /Users/softwave/.gradle/caches/transforms-3/c2a40fccb126d7892b99088aecd8cb07/transformed/preference-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.fragment:fragment-ktx:1.3.6] /Users/softwave/.gradle/caches/transforms-3/432c27a68fa911ff47ed7d2a43059a91/transformed/jetified-fragment-ktx-1.3.6/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.fragment:fragment-ktx:1.3.6] /Users/softwave/.gradle/caches/transforms-3/432c27a68fa911ff47ed7d2a43059a91/transformed/jetified-fragment-ktx-1.3.6/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.appcompat:appcompat-resources:1.6.1] /Users/softwave/.gradle/caches/transforms-3/b9834295456116db1d92093d6e5e97a8/transformed/jetified-appcompat-resources-1.6.1/AndroidManifest.xml:20:5-44
+MERGED from [androidx.appcompat:appcompat-resources:1.6.1] /Users/softwave/.gradle/caches/transforms-3/b9834295456116db1d92093d6e5e97a8/transformed/jetified-appcompat-resources-1.6.1/AndroidManifest.xml:20:5-44
+MERGED from [androidx.appcompat:appcompat:1.6.1] /Users/softwave/.gradle/caches/transforms-3/3e0b6e4cd00ec1094432a441bef118ac/transformed/appcompat-1.6.1/AndroidManifest.xml:20:5-44
+MERGED from [androidx.appcompat:appcompat:1.6.1] /Users/softwave/.gradle/caches/transforms-3/3e0b6e4cd00ec1094432a441bef118ac/transformed/appcompat-1.6.1/AndroidManifest.xml:20:5-44
+MERGED from [androidx.fragment:fragment:1.3.6] /Users/softwave/.gradle/caches/transforms-3/b8e45eae03c068ba2da31600979e8b3e/transformed/fragment-1.3.6/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.fragment:fragment:1.3.6] /Users/softwave/.gradle/caches/transforms-3/b8e45eae03c068ba2da31600979e8b3e/transformed/fragment-1.3.6/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.activity:activity:1.6.0] /Users/softwave/.gradle/caches/transforms-3/64a5063021db03c2a4f8399130b385f6/transformed/jetified-activity-1.6.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.activity:activity:1.6.0] /Users/softwave/.gradle/caches/transforms-3/64a5063021db03c2a4f8399130b385f6/transformed/jetified-activity-1.6.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.activity:activity-ktx:1.6.0] /Users/softwave/.gradle/caches/transforms-3/ddf59855a2b0e6900543b584c5e7f8ff/transformed/jetified-activity-ktx-1.6.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.activity:activity-ktx:1.6.0] /Users/softwave/.gradle/caches/transforms-3/ddf59855a2b0e6900543b584c5e7f8ff/transformed/jetified-activity-ktx-1.6.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/5a50584bab553e0dd0ea9955d8b44ba0/transformed/jetified-lifecycle-viewmodel-ktx-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/5a50584bab553e0dd0ea9955d8b44ba0/transformed/jetified-lifecycle-viewmodel-ktx-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.recyclerview:recyclerview:1.0.0] /Users/softwave/.gradle/caches/transforms-3/081745af9872c5c21ff7c4cffc45fba7/transformed/recyclerview-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.recyclerview:recyclerview:1.0.0] /Users/softwave/.gradle/caches/transforms-3/081745af9872c5c21ff7c4cffc45fba7/transformed/recyclerview-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/softwave/.gradle/caches/transforms-3/52475b09ba76c6a4c05cfcf37d8e6eb3/transformed/legacy-support-core-ui-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/softwave/.gradle/caches/transforms-3/52475b09ba76c6a4c05cfcf37d8e6eb3/transformed/legacy-support-core-ui-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/softwave/.gradle/caches/transforms-3/5d369924b46cb974b206673703e6fc35/transformed/legacy-support-core-utils-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/softwave/.gradle/caches/transforms-3/5d369924b46cb974b206673703e6fc35/transformed/legacy-support-core-utils-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] /Users/softwave/.gradle/caches/transforms-3/38d54e46337108b0e8962be7fd594022/transformed/loader-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] /Users/softwave/.gradle/caches/transforms-3/38d54e46337108b0e8962be7fd594022/transformed/loader-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.5.1] /Users/softwave/.gradle/caches/transforms-3/840375063abf4b9b27cedb29022411ca/transformed/lifecycle-viewmodel-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.5.1] /Users/softwave/.gradle/caches/transforms-3/840375063abf4b9b27cedb29022411ca/transformed/lifecycle-viewmodel-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1] /Users/softwave/.gradle/caches/transforms-3/4c634eb5884be24ccb23be7520a8a275/transformed/jetified-lifecycle-viewmodel-savedstate-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1] /Users/softwave/.gradle/caches/transforms-3/4c634eb5884be24ccb23be7520a8a275/transformed/jetified-lifecycle-viewmodel-savedstate-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.2.0] /Users/softwave/.gradle/caches/transforms-3/78ec12f86e6aa9035b7e03b174da6410/transformed/slidingpanelayout-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.2.0] /Users/softwave/.gradle/caches/transforms-3/78ec12f86e6aa9035b7e03b174da6410/transformed/slidingpanelayout-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-runtime-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/152a259008ed644b37d3efd63014363f/transformed/jetified-lifecycle-runtime-ktx-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-runtime-ktx:2.5.1] /Users/softwave/.gradle/caches/transforms-3/152a259008ed644b37d3efd63014363f/transformed/jetified-lifecycle-runtime-ktx-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.savedstate:savedstate-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/02357a92cb84700819800fbacb51650e/transformed/jetified-savedstate-ktx-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.savedstate:savedstate-ktx:1.2.0] /Users/softwave/.gradle/caches/transforms-3/02357a92cb84700819800fbacb51650e/transformed/jetified-savedstate-ktx-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.savedstate:savedstate:1.2.0] /Users/softwave/.gradle/caches/transforms-3/4be969d56df9b7ab20e7a8554bc5970c/transformed/jetified-savedstate-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.savedstate:savedstate:1.2.0] /Users/softwave/.gradle/caches/transforms-3/4be969d56df9b7ab20e7a8554bc5970c/transformed/jetified-savedstate-1.2.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0b74afe45f74cadd2ccf566e09706589/transformed/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0b74afe45f74cadd2ccf566e09706589/transformed/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.emoji2:emoji2-views-helper:1.2.0] /Users/softwave/.gradle/caches/transforms-3/371a8e4bf60472d165c534dc9820e6ee/transformed/jetified-emoji2-views-helper-1.2.0/AndroidManifest.xml:5:5-44
+MERGED from [androidx.emoji2:emoji2-views-helper:1.2.0] /Users/softwave/.gradle/caches/transforms-3/371a8e4bf60472d165c534dc9820e6ee/transformed/jetified-emoji2-views-helper-1.2.0/AndroidManifest.xml:5:5-44
+MERGED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:21:5-44
+MERGED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:21:5-44
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/softwave/.gradle/caches/transforms-3/6aa584e1a8f2d5b294f300d034aa9a84/transformed/vectordrawable-animated-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.1.0] /Users/softwave/.gradle/caches/transforms-3/6aa584e1a8f2d5b294f300d034aa9a84/transformed/vectordrawable-animated-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/softwave/.gradle/caches/transforms-3/bf97f3c802d736c0e34283c68888b7a2/transformed/vectordrawable-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.vectordrawable:vectordrawable:1.1.0] /Users/softwave/.gradle/caches/transforms-3/bf97f3c802d736c0e34283c68888b7a2/transformed/vectordrawable-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/e789588554a9261e440bd79046caf9a8/transformed/viewpager-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/e789588554a9261e440bd79046caf9a8/transformed/viewpager-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/bb53665559ac4ad481644c6c4c462df1/transformed/coordinatorlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/bb53665559ac4ad481644c6c4c462df1/transformed/coordinatorlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.customview:customview:1.1.0] /Users/softwave/.gradle/caches/transforms-3/1387bee34b177fe812c354a71833191e/transformed/customview-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.customview:customview:1.1.0] /Users/softwave/.gradle/caches/transforms-3/1387bee34b177fe812c354a71833191e/transformed/customview-1.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.transition:transition:1.4.1] /Users/softwave/.gradle/caches/transforms-3/4af274aa2f66714dda27e0331cbbd060/transformed/transition-1.4.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.transition:transition:1.4.1] /Users/softwave/.gradle/caches/transforms-3/4af274aa2f66714dda27e0331cbbd060/transformed/transition-1.4.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/7127e72917a333919842b20137e4fa20/transformed/swiperefreshlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/softwave/.gradle/caches/transforms-3/7127e72917a333919842b20137e4fa20/transformed/swiperefreshlayout-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/softwave/.gradle/caches/transforms-3/2ca90870b090e627e436dd27eef01b33/transformed/asynclayoutinflater-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/softwave/.gradle/caches/transforms-3/2ca90870b090e627e436dd27eef01b33/transformed/asynclayoutinflater-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core-ktx:1.9.0] /Users/softwave/.gradle/caches/transforms-3/68f0ba5a15a92e5cf6c34df510093341/transformed/jetified-core-ktx-1.9.0/AndroidManifest.xml:5:5-44
+MERGED from [androidx.core:core-ktx:1.9.0] /Users/softwave/.gradle/caches/transforms-3/68f0ba5a15a92e5cf6c34df510093341/transformed/jetified-core-ktx-1.9.0/AndroidManifest.xml:5:5-44
+MERGED from [androidx.annotation:annotation-experimental:1.3.0] /Users/softwave/.gradle/caches/transforms-3/f7f3ba6cb7f4fac97febb0867b26aaba/transformed/jetified-annotation-experimental-1.3.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.annotation:annotation-experimental:1.3.0] /Users/softwave/.gradle/caches/transforms-3/f7f3ba6cb7f4fac97febb0867b26aaba/transformed/jetified-annotation-experimental-1.3.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1] /Users/softwave/.gradle/caches/transforms-3/24bce9f276b456df5ea76c74266209f0/transformed/jetified-lifecycle-livedata-core-ktx-2.3.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1] /Users/softwave/.gradle/caches/transforms-3/24bce9f276b456df5ea76c74266209f0/transformed/jetified-lifecycle-livedata-core-ktx-2.3.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/softwave/.gradle/caches/transforms-3/70c229d4855d6f4f58f8e76b5800ca68/transformed/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/softwave/.gradle/caches/transforms-3/70c229d4855d6f4f58f8e76b5800ca68/transformed/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:21:5-23:41
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:21:5-23:41
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.5.1] /Users/softwave/.gradle/caches/transforms-3/3430e4b961d300d1c540196420474804/transformed/lifecycle-runtime-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.5.1] /Users/softwave/.gradle/caches/transforms-3/3430e4b961d300d1c540196420474804/transformed/lifecycle-runtime-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:21:5-23:41
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:21:5-23:41
+MERGED from [androidx.tracing:tracing:1.0.0] /Users/softwave/.gradle/caches/transforms-3/4bde49b600e6022c63d461fb9ba2a107/transformed/jetified-tracing-1.0.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.tracing:tracing:1.0.0] /Users/softwave/.gradle/caches/transforms-3/4bde49b600e6022c63d461fb9ba2a107/transformed/jetified-tracing-1.0.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] /Users/softwave/.gradle/caches/transforms-3/a4aa7fbb1abaa741d90f2d6d053f630c/transformed/versionedparcelable-1.1.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] /Users/softwave/.gradle/caches/transforms-3/a4aa7fbb1abaa741d90f2d6d053f630c/transformed/versionedparcelable-1.1.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/softwave/.gradle/caches/transforms-3/34a21eb817fcb42b7859242a638924f1/transformed/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/softwave/.gradle/caches/transforms-3/34a21eb817fcb42b7859242a638924f1/transformed/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.5.1] /Users/softwave/.gradle/caches/transforms-3/aadc75a2498f6dce2b809d58f5c64747/transformed/lifecycle-livedata-core-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.5.1] /Users/softwave/.gradle/caches/transforms-3/aadc75a2498f6dce2b809d58f5c64747/transformed/lifecycle-livedata-core-2.5.1/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.arch.core:core-runtime:2.1.0] /Users/softwave/.gradle/caches/transforms-3/ceeab03a3b8b453e9cc18fb6a8c9587e/transformed/core-runtime-2.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.arch.core:core-runtime:2.1.0] /Users/softwave/.gradle/caches/transforms-3/ceeab03a3b8b453e9cc18fb6a8c9587e/transformed/core-runtime-2.1.0/AndroidManifest.xml:20:5-22:41
+MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/softwave/.gradle/caches/transforms-3/eea76464974f392a795321ab89438ae2/transformed/interpolator-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/softwave/.gradle/caches/transforms-3/eea76464974f392a795321ab89438ae2/transformed/interpolator-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f5cbe5f9d6c6dc9c7c243dfa09c5f2e0/transformed/documentfile-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f5cbe5f9d6c6dc9c7c243dfa09c5f2e0/transformed/documentfile-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/3dac3c555a009f19ad2bc626d96ade9b/transformed/localbroadcastmanager-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/softwave/.gradle/caches/transforms-3/3dac3c555a009f19ad2bc626d96ade9b/transformed/localbroadcastmanager-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f4968768adee87c4c6c87280eb34bf46/transformed/print-1.0.0/AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] /Users/softwave/.gradle/caches/transforms-3/f4968768adee87c4c6c87280eb34bf46/transformed/print-1.0.0/AndroidManifest.xml:20:5-44
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		ADDED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
-		INJECTED from /Users/quang/StudioProjects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		ADDED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+		INJECTED from /Users/softwave/Projects/spectrogram-android/app/src/main/AndroidManifest.xml
+uses-library#androidx.window.extensions
+ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:25:9-27:40
+	android:required
+		ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:27:13-37
+	android:name
+		ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:26:13-54
+uses-library#androidx.window.sidecar
+ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:28:9-30:40
+	android:required
+		ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:30:13-37
+	android:name
+		ADDED from [androidx.window:window:1.0.0] /Users/softwave/.gradle/caches/transforms-3/0beea03c470aec056c78fa30e38c95e9/transformed/jetified-window-1.0.0/AndroidManifest.xml:29:13-51
+provider#androidx.startup.InitializationProvider
+ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:24:9-32:20
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:26:9-34:20
+MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:26:9-34:20
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:26:9-30:34
+MERGED from [androidx.startup:startup-runtime:1.1.1] /Users/softwave/.gradle/caches/transforms-3/4c4d2fe53ac218cae8b7f45f197da1e5/transformed/jetified-startup-runtime-1.1.1/AndroidManifest.xml:26:9-30:34
+	tools:node
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:28:13-31
+	android:authorities
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:26:13-68
+	android:exported
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:27:13-37
+	android:name
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:25:13-67
+meta-data#androidx.emoji2.text.EmojiCompatInitializer
+ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:29:13-31:52
+	android:value
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:31:17-49
+	android:name
+		ADDED from [androidx.emoji2:emoji2:1.2.0] /Users/softwave/.gradle/caches/transforms-3/5ed5289a97226a05bb54480f723f8520/transformed/jetified-emoji2-1.2.0/AndroidManifest.xml:30:17-75
+permission#${applicationId}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
+ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:22:5-24:47
+	android:protectionLevel
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:24:9-44
+	android:name
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:23:9-81
+permission#net.galmiza.android.spectrogram.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
+ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:22:5-24:47
+	android:protectionLevel
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:24:9-44
+	android:name
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:23:9-81
+uses-permission#${applicationId}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
+ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:26:5-97
+	android:name
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:26:22-94
+uses-permission#net.galmiza.android.spectrogram.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
+ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:26:5-97
+	android:name
+		ADDED from [androidx.core:core:1.9.0] /Users/softwave/.gradle/caches/transforms-3/24c8031572ced1a9ec505ef2513af626/transformed/core-1.9.0/AndroidManifest.xml:26:22-94
+meta-data#androidx.lifecycle.ProcessLifecycleInitializer
+ADDED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:31:13-33:52
+	android:value
+		ADDED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:33:17-49
+	android:name
+		ADDED from [androidx.lifecycle:lifecycle-process:2.4.1] /Users/softwave/.gradle/caches/transforms-3/2dd5f28f55c39426bf359a9349c5ef82/transformed/jetified-lifecycle-process-2.4.1/AndroidManifest.xml:32:17-78
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 93b4f13..01ba769 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.galmiza.android.spectrogram"
     android:installLocation="auto"
     android:versionCode="4"
     android:versionName="1.1.1" >
@@ -14,17 +13,16 @@
         android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name="net.galmiza.android.spectrogram.SpectrogramActivity"
-            android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:configChanges="" > <!-- android:screenOrientation="landscape" -->
+            android:configChanges=""
+            android:exported="true"> <!-- android:screenOrientation="landscape" -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="net.galmiza.android.spectrogram.PreferencesActivity"
-            android:label="@string/app_name" >
+            android:name="net.galmiza.android.spectrogram.PreferencesActivity">
         </activity>
     </application>
 
diff --git a/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.java b/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.java
deleted file mode 100644
index ebb6191..0000000
--- a/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.galmiza.android.engine.sound;
-
-public class SoundEngine {
-    static {
-        System.loadLibrary("sound-engine");
-    }
-
-    public native void fft(float[] var1, float[] var2, int var3, int var4);
-
-    public native void initFSin();
-
-    public native void toPolar(float[] var1, float[] var2, int var3);
-
-    public native void toCartesian(float[] var1, float[] var2, int var3);
-
-    public native void shortToFloat(short[] var1, float[] var2, int var3);
-
-    public native void floatToShort(float[] var1, short[] var2, int var3);
-
-    public native void clearShort(short[] var1, int var2);
-
-    public native void clearFloat(float[] var1, int var2);
-
-    public native void getMeanFrequency(float[] var1, float[] var2, int var3);
-
-    public native void window(float[] var1, int var2);
-
-    public native void windowRectangular(float[] var1, int var2);
-
-    public native void windowTriangular(float[] var1, int var2);
-
-    public native void windowWelch(float[] var1, int var2);
-
-    public native void windowHanning(float[] var1, int var2);
-
-    public native void windowHamming(float[] var1, int var2);
-
-    public native void windowBlackman(float[] var1, int var2);
-
-    public native void windowNuttall(float[] var1, int var2);
-
-    public native void windowBlackmanNuttall(float[] var1, int var2);
-
-    public native void windowBlackmanHarris(float[] var1, int var2);
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.kt b/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.kt
new file mode 100644
index 0000000..b78eae5
--- /dev/null
+++ b/app/src/main/java/net/galmiza/android/engine/sound/SoundEngine.kt
@@ -0,0 +1,24 @@
+package net.galmiza.android.engine.sound
+
+class SoundEngine {
+    external fun fft(var1: FloatArray?, var2: FloatArray?, var3: Int, var4: Int)
+    external fun initFSin()
+    external fun toPolar(var1: FloatArray?, var2: FloatArray?, var3: Int)
+    external fun shortToFloat(var1: ShortArray?, var2: FloatArray?, var3: Int)
+    external fun clearFloat(var1: FloatArray?, var2: Int)
+    external fun windowRectangular(var1: FloatArray?, var2: Int)
+    external fun windowTriangular(var1: FloatArray?, var2: Int)
+    external fun windowWelch(var1: FloatArray?, var2: Int)
+    external fun windowHanning(var1: FloatArray?, var2: Int)
+    external fun windowHamming(var1: FloatArray?, var2: Int)
+    external fun windowBlackman(var1: FloatArray?, var2: Int)
+    external fun windowNuttall(var1: FloatArray?, var2: Int)
+    external fun windowBlackmanNuttall(var1: FloatArray?, var2: Int)
+    external fun windowBlackmanHarris(var1: FloatArray?, var2: Int)
+
+    companion object {
+        init {
+            System.loadLibrary("sound-engine")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.java b/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.java
deleted file mode 100755
index 9f79067..0000000
--- a/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Spectrogram Android application
- * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
-
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from the use of this software.
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it freely,
- * subject to the following restrictions:
-
- * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-package net.galmiza.android.spectrogram;
-
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder.AudioSource;
-
-/**
- * Recording service
- * Methods prepare/release initiates/releases the service and must be the very first/last calls
- * Methods start/stop starts/stop the recording service in an independent thread
- * Recorded samples are sent to the listener passed as parameter of @method start
- */
-public class ContinuousRecord {
-	
-	// Attributes
-	private AudioRecord audioRecord;
-	private int samplingRate;
-	private int recordLength;
-	private Thread thread;
-	private boolean run;
-	
-	/**
-	 * Constructor
-	 */
-	ContinuousRecord(int samplingRate) {
-		this.samplingRate = samplingRate;
-		run = false;
-	}
-	
-	int getBufferLength() {
-		return recordLength;
-	}
-	
-	/**
-	 * Initiate the recording service
-	 * The service is then ready to start recording
-	 * The buffer size can be forced to be multiple of @param multiple (size in sample count)
-	 * @param multiple is ineffective if set to 1
-	 */
-	public void prepare(int multiple) {
-		
-		// Setup buffer size
-		int BYTES_PER_SHORT = 2;
-	    recordLength = AudioRecord.getMinBufferSize(samplingRate, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT)/BYTES_PER_SHORT;
-	    
-	    // Increase buffer size so that it is a multiple of the param
-	    int r = recordLength % multiple;
-	    if (r>0) recordLength += (multiple-r);
-	    
-	    // Log value
-		//Log.d("ContinuousRecord","Buffer size = "+recordLength+" samples");
-	    
-	    // Init audio recording from MIC
-	    audioRecord = new AudioRecord(AudioSource.MIC, samplingRate, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, recordLength*BYTES_PER_SHORT);
-	}
-	
-	/**
-	 *  Listener prototype used in the @method start
-	 */
-	public static interface OnBufferReadyListener {
-        void onBufferReady(short[] buffer);
-    }
-	
-	/**
-	 * Start recording in a independent thread
-	 * @param listener is call every time a sample is ready
-	 */
-	public void start(final OnBufferReadyListener listener) {
-		if (!run && audioRecord!=null) {
-			run = true;
-			//Log.d("ContinuousRecord","Starting service...");
-			audioRecord.startRecording(); 
-	       	final short[] recordBuffer = new short[recordLength];
-	
-	       	thread = new Thread(() -> {
-				   while (run) {
-						  audioRecord.read(recordBuffer, 0, recordLength);
-						  listener.onBufferReady(recordBuffer);
-				   }
-			   });
-	       	thread.start();
-			//Log.d("ContinuousRecord","Service started");
-		}
-	}
-	
-	/**
-	 * Stop recording
-	 * Notifies the thread to stop and wait until it stops
-	 * Also stops the recording service
-	 */
-	public void stop() {
-		if (run && audioRecord!=null) {
-			//Log.d("ContinuousRecord","Stopping service...");
-			run = false;
-			while (thread.isAlive())
-				try { Thread.sleep(10); } catch (InterruptedException e) { e.printStackTrace(); }
-			audioRecord.stop();
-			//Log.d("ContinuousRecord","Service stopped");
-		}
-	}
-	
-	/**
-	 * Destroys the recording service
-	 * @method start and @method stop should then not be called
-	 */
-	public void release() {
-		if (!run && audioRecord!=null)
-			audioRecord.release();
-   	}
-}
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.kt b/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.kt
new file mode 100755
index 0000000..136a564
--- /dev/null
+++ b/app/src/main/java/net/galmiza/android/spectrogram/ContinuousRecord.kt
@@ -0,0 +1,155 @@
+/**
+ * Spectrogram Android application
+ * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it freely,
+ * subject to the following restrictions:
+ * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+package net.galmiza.android.spectrogram
+
+import android.Manifest
+import android.content.Context
+import android.media.AudioRecord
+import androidx.core.app.ActivityCompat
+import android.content.pm.PackageManager
+import android.media.AudioFormat
+import android.media.MediaRecorder.AudioSource
+
+/**
+ * Recording service
+ * Methods prepare/release initiates/releases the service and must be the very first/last calls
+ * Methods start/stop starts/stop the recording service in an independent thread
+ * Recorded samples are sent to the listener passed as parameter of @method start
+ */
+class ContinuousRecord
+/**
+ * Constructor
+ */ internal constructor(private val samplingRate: Int, private val context: Context) {
+    // Attributes
+    private var audioRecord: AudioRecord? = null
+    var bufferLength = 0
+        private set
+    private var thread: Thread? = null
+    var isRun = false
+        private set
+
+    /**
+     * Initiate the recording service
+     * The service is then ready to start recording
+     * The buffer size can be forced to be multiple of @param multiple (size in sample count)
+     * @param multiple is ineffective if set to 1
+     */
+    fun prepare(multiple: Int) {
+
+        // Setup buffer size
+        val bytesPerShort = 2
+        bufferLength = AudioRecord.getMinBufferSize(
+            samplingRate,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT
+        ) / bytesPerShort
+
+        // Increase buffer size so that it is a multiple of the param
+        val r = bufferLength % multiple
+        if (r > 0) bufferLength += multiple - r
+
+        // Log value
+        //Log.d("ContinuousRecord","Buffer size = "+recordLength+" samples");
+
+        // Init audio recording from MIC
+        if (ActivityCompat.checkSelfPermission(
+                context,
+                Manifest.permission.RECORD_AUDIO
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return
+        }
+        audioRecord = AudioRecord(
+            AudioSource.MIC,
+            samplingRate,
+            AudioFormat.CHANNEL_IN_MONO,
+            AudioFormat.ENCODING_PCM_16BIT,
+            bufferLength * bytesPerShort
+        )
+    }
+
+    /**
+     * Listener prototype used in the @method start
+     */
+    interface OnBufferReadyListener {
+        fun onBufferReady(buffer: ShortArray?)
+    }
+
+    /**
+     * Start recording in a independent thread
+     * @param listener is call every time a sample is ready
+     */
+    fun start(listener: OnBufferReadyListener) {
+        if (isRun) {
+            return
+        }
+        audioRecord?.let {
+            isRun = true
+            //Log.d("ContinuousRecord","Starting service...");
+            it.startRecording()
+            val recordBuffer = ShortArray(bufferLength)
+            val thread = Thread {
+                while (isRun) {
+                    it.read(recordBuffer, 0, bufferLength)
+                    listener.onBufferReady(recordBuffer)
+                }
+            }
+            this.thread = thread
+            thread.start()
+            //Log.d("ContinuousRecord","Service started");
+        }
+    }
+
+    /**
+     * Stop recording
+     * Notifies the thread to stop and wait until it stops
+     * Also stops the recording service
+     */
+    fun stop() {
+        if (!isRun) {
+            return
+        }
+
+        audioRecord?.let { record ->
+            //Log.d("ContinuousRecord","Stopping service...");
+            isRun = false
+            thread?.let {
+                while (it.isAlive) try {
+                    Thread.sleep(10)
+                } catch (e: InterruptedException) {
+                    e.printStackTrace()
+                }
+            }
+            record.stop()
+            //Log.d("ContinuousRecord","Service stopped");
+        }
+    }
+
+    /**
+     * Destroys the recording service
+     * @method start and @method stop should then not be called
+     */
+    fun release() {
+        if (isRun) {
+            return
+        }
+        audioRecord?.release()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.java b/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.java
deleted file mode 100755
index 3ef0a35..0000000
--- a/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * Spectrogram Android application
- * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
-
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from the use of this software.
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it freely,
- * subject to the following restrictions:
-
- * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-package net.galmiza.android.spectrogram;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- * Class associated with the spectrogram view
- * Handles events:
- *  onSizeChanged, onTouchEvent, onDraw
- */
-public class FrequencyView extends View {
-    
-    // Attributes
-    private Activity activity;
-    private Paint paint = new Paint();
-    private Bitmap bitmap;
-    private Canvas canvas;
-    private int pos;
-    private int samplingRate;
-    private int width, height;
-    private float[] magnitudes;
-    private int[] colorRainbow = new int[] {    0xFFFFFFFF, 0xFFFF00FF, 0xFFFF0000, 0xFFFFFF00, 0xFF00FF00, 0xFF00FFFF, 0xFF0000FF, 0xFF000000 };
-    private int[] colorFire = new int[] {    0xFFFFFFFF, 0xFFFFFF00, 0xFFFF0000, 0xFF000000 };
-    private int[] colorIce = new int[] {    0xFFFFFFFF, 0xFF00FFFF, 0xFF0000FF, 0xFF000000 };
-    private int[] colorGrey = new int[] {    0xFFFFFFFF, 0xFF000000 };
-    
-    // Window
-    float minX, minY, maxX, maxY;
-    public FrequencyView(Context context) {
-        super(context);
-        activity = (Activity) Misc.getAttribute("activity");
-    }
-    public FrequencyView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        activity = (Activity) Misc.getAttribute("activity");
-    }
-    
-    
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        width = w;
-        height = h;
-        if (bitmap!=null)    bitmap.recycle();
-        bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        canvas = new Canvas(bitmap);
-    }
-    @SuppressLint("ClickableViewAccessibility")
-	@Override
-    public boolean onTouchEvent(MotionEvent event) {
-        invalidate();
-        return true;
-    }
-    
-    /**
-     * Simple sets
-     */
-    public void setFFTResolution(int res) {
-        magnitudes = new float[res];
-    }
-    public void setSamplingRate(int sampling) {
-        samplingRate = sampling;
-    }
-    public void setMagnitudes(float[] m) {
-        System.arraycopy(m, 0, magnitudes, 0, m.length);
-    }
-    
-    /**
-     * Called whenever a redraw is needed
-     * Renders spectrogram and scale on the right
-     * Frequency scale can be linear or logarithmic
-     */
-    @Override
-    public void onDraw(Canvas canvas) {
-        int[] colors = null;
-        String colorScale = Misc.getPreference(activity, "color_scale", activity.getString(R.string.preferences_color_scale_default_value));
-             if (colorScale.equals("Grey"))     colors = colorGrey;
-        else if (colorScale.equals("Fire"))     colors = colorFire;
-        else if (colorScale.equals("Ice"))      colors = colorIce;
-        else if (colorScale.equals("Rainbow"))  colors = colorRainbow;
-
-        int wColor = 10;
-        int wFrequency = 30;
-        int rWidth = width-wColor-wFrequency;
-        paint.setStrokeWidth(1);
-        
-        // Get scale preferences
-		String defFrequency = activity.getString(R.string.preferences_frequency_scale_default_value);
-    	boolean logFrequency = !Misc.getPreference("frequency_scale", defFrequency).equals(defFrequency);
-        
-        // Update buffer bitmap
-        paint.setColor(Color.BLACK);
-        this.canvas.drawLine(pos%rWidth, 0, pos%rWidth, height, paint);
-        for (int i=0; i<height; i++) {
-        	float j = getValueFromRelativePosition((float)(height-i)/height, 1, samplingRate/2, logFrequency);
-        	j /= samplingRate/2;
-        	float mag = magnitudes[(int) (j*magnitudes.length/2)];
-            float db = (float) Math.max(0,-20*Math.log10(mag));
-            int c = getInterpolatedColor(colors, db*0.009f);
-            paint.setColor(c);
-            int x = pos%rWidth;
-            int y = i;
-            this.canvas.drawPoint(x, y, paint);
-            this.canvas.drawPoint(x, y, paint); // make color brighter
-            //this.canvas.drawPoint(pos%rWidth, height-i, paint); // make color even brighter
-        }
-        
-        // Draw bitmap
-        if (pos<rWidth) {
-            canvas.drawBitmap(bitmap, wColor, 0, paint);
-        } else {
-            canvas.drawBitmap(bitmap, (float) wColor - pos%rWidth, 0, paint);
-            canvas.drawBitmap(bitmap, (float) wColor + (rWidth - pos%rWidth), 0, paint);
-        }
-
-        // Draw color scale
-        paint.setColor(Color.BLACK);
-        canvas.drawRect(0, 0, wColor, height, paint);
-        for (int i=0; i<height; i++) {
-            int c = getInterpolatedColor(colors, ((float) i)/height);
-            paint.setColor(c);
-            canvas.drawLine(0, i, wColor-5, i, paint);
-        }
-        
-        // Draw frequency scale
-        float ratio = 0.7f*getResources().getDisplayMetrics().density;
-        paint.setTextSize(12f*ratio);
-        paint.setColor(Color.BLACK);
-        canvas.drawRect(rWidth + wColor, 0, width, height, paint);
-        paint.setColor(Color.WHITE);
-        canvas.drawText("kHz", rWidth + wColor, 12*ratio, paint);
-        if (logFrequency) {
-        	for (int i=1; i<5; i++) {
-	    		float y = getRelativePosition((float) Math.pow(10,i), 1, samplingRate/2, logFrequency);
-	    		canvas.drawText("1e"+i, rWidth + wColor, (1f-y)*height, paint);
-    		}
-        } else {
-	        for (int i=0; i<(samplingRate-500)/2; i+=1000)
-	            canvas.drawText(" "+i/1000, rWidth + wColor, height*(1f-(float) i/(samplingRate/2)), paint);
-        }
-        
-        pos++;
-    }
-
-    
-    /**
-     * Converts relative position of a value within given boundaries
-     * Log=true for logarithmic scale
-     */
-    private float getRelativePosition(float value, float minValue, float maxValue, boolean log) {
-    	if (log)	return ((float) Math.log10(1+value-minValue) / (float) Math.log10(1+maxValue-minValue));
-    	else		return (value-minValue)/(maxValue-minValue);
-    }
-    
-    /**
-     * Returns a value from its relative position within given boundaries
-     * Log=true for logarithmic scale
-     */
-    private float getValueFromRelativePosition(float position, float minValue, float maxValue, boolean log) {
-    	if (log)	return (float) (Math.pow(10, position*Math.log10(1+maxValue-minValue))+minValue-1);
-    	else		return minValue + position*(maxValue-minValue);
-    }
-    
-    /**
-     * Calculate rainbow colors
-     */
-    private int ave(int s, int d, float p) {
-        return s + Math.round(p * (d - s));
-    }
-    public int getInterpolatedColor(int[] colors, float unit) {
-        if (unit <= 0) return colors[0];
-        if (unit >= 1) return colors[colors.length - 1];
-        
-        float p = unit * (colors.length - 1);
-        int i = (int) p;
-        p -= i;
-
-        // now p is just the fractional part [0...1) and i is the index
-        int c0 = colors[i];
-        int c1 = colors[i + 1];
-        int a = ave(Color.alpha(c0), Color.alpha(c1), p);
-        int r = ave(Color.red(c0), Color.red(c1), p);
-        int g = ave(Color.green(c0), Color.green(c1), p);
-        int b = ave(Color.blue(c0), Color.blue(c1), p);
-
-        return Color.argb(a, r, g, b);
-    }
-    
-}
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.kt b/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.kt
new file mode 100755
index 0000000..e23ed52
--- /dev/null
+++ b/app/src/main/java/net/galmiza/android/spectrogram/FrequencyView.kt
@@ -0,0 +1,255 @@
+/**
+ * Spectrogram Android application
+ * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
+ *
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it freely,
+ * subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+package net.galmiza.android.spectrogram
+
+import net.galmiza.android.spectrogram.Misc.getPreference
+import android.graphics.Bitmap
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import kotlin.math.log10
+import kotlin.math.pow
+import kotlin.math.roundToInt
+
+/**
+ * Class associated with the spectrogram view
+ * Handles events:
+ * onSizeChanged, onTouchEvent, onDraw
+ */
+class FrequencyView : View {
+    // Attributes
+    private val paint = Paint()
+    private var bitmap: Bitmap? = null
+    private var canvas: Canvas? = null
+    private var pos = 0
+    private var samplingRate = 0
+    private var _width = 0
+    private var _height = 0
+    private lateinit var _magnitudes: FloatArray
+    private val colorRainbow =
+        intArrayOf(-0x1, -0xff01, -0x10000, -0x100, -0xff0100, -0xff0001, -0xffff01, -0x1000000)
+    private val colorFire = intArrayOf(-0x1, -0x100, -0x10000, -0x1000000)
+    private val colorIce = intArrayOf(-0x1, -0xff0001, -0xffff01, -0x1000000)
+    private val colorGrey = intArrayOf(-0x1, -0x1000000)
+
+    constructor(context: Context?) : super(context)
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        _width = w
+        _height = h
+        bitmap?.recycle()
+        if (width > 0 && height > 0) {
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            this.bitmap = bitmap
+            canvas = Canvas(bitmap)
+        } else {
+            bitmap = null
+            canvas = null
+        }
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        val touch = super.onTouchEvent(event)
+        performClick()
+        return touch
+    }
+
+    override fun performClick(): Boolean {
+        val perform =  super.performClick()
+        invalidate()
+        return perform
+    }
+
+    /**
+     * Simple sets
+     */
+    fun setFFTResolution(res: Int) {
+        _magnitudes = FloatArray(res)
+    }
+
+    fun setSamplingRate(sampling: Int) {
+        samplingRate = sampling
+    }
+
+    fun setMagnitudes(m: FloatArray) {
+        System.arraycopy(m, 0, _magnitudes, 0, m.size)
+    }
+
+    /**
+     * Called whenever a redraw is needed
+     * Renders spectrogram and scale on the right
+     * Frequency scale can be linear or logarithmic
+     */
+    public override fun onDraw(canvas: Canvas) {
+        var colors: IntArray? = null
+        val colorScale = getPreference(
+            context,
+            "color_scale",
+            context.getString(R.string.preferences_color_scale_default_value)
+        )
+
+        colorScale?.let {
+            when (it) {
+                "Grey" -> colors = colorGrey
+                "Fire" -> colors = colorFire
+                "Ice" -> colors = colorIce
+                "Rainbow" -> colors = colorRainbow
+            }
+        }
+
+        val wColor = 10
+        val wFrequency = 30
+        val rWidth = width - wColor - wFrequency
+        paint.strokeWidth = 1f
+
+        // Get scale preferences
+        val defFrequency = context.getString(R.string.preferences_frequency_scale_default_value)
+        val frequency = getPreference(context, "frequency_scale", defFrequency)
+
+        val logFrequency = frequency?.let { frequency != defFrequency } ?: false
+
+        // Update buffer bitmap
+        paint.color = Color.BLACK
+        this.canvas?.drawLine(
+            (pos % rWidth).toFloat(),
+            0f,
+            (pos % rWidth).toFloat(),
+            height.toFloat(),
+            paint
+        )
+
+        for (i in 0 until height) {
+            var j = getValueFromRelativePosition(
+                (height - i).toFloat() / height,
+                samplingRate.toFloat() / 2,
+                logFrequency
+            )
+            j /= (samplingRate.toDouble() / 2).toFloat()
+            val mag = _magnitudes[(j * _magnitudes.size / 2).toInt()]
+            val db = 0.0.coerceAtLeast(-20 * log10(mag.toDouble())).toFloat()
+            val c = getInterpolatedColor(colors, db * 0.009f)
+            paint.color = c
+            val x = pos % rWidth
+
+            this.canvas?.let {
+                it.drawPoint(x.toFloat(), i.toFloat(), paint)
+                it.drawPoint(x.toFloat(), i.toFloat(), paint) // make color brighter
+                //this.canvas.drawPoint(pos%rWidth, height-i, paint); // make color even brighter
+            }
+        }
+
+        // Draw bitmap
+        bitmap?.let {
+            if (pos < rWidth) {
+                canvas.drawBitmap(it, wColor.toFloat(), 0f, paint)
+            } else {
+                canvas.drawBitmap(it, wColor.toFloat() - pos % rWidth, 0f, paint)
+                canvas.drawBitmap(it, wColor.toFloat() + (rWidth - pos % rWidth), 0f, paint)
+            }
+        }
+
+        // Draw color scale
+        paint.color = Color.BLACK
+        canvas.drawRect(0f, 0f, wColor.toFloat(), height.toFloat(), paint)
+        for (i in 0 until height) {
+            val c = getInterpolatedColor(colors, i.toFloat() / height)
+            paint.color = c
+            canvas.drawLine(0f, i.toFloat(), (wColor - 5).toFloat(), i.toFloat(), paint)
+        }
+
+        // Draw frequency scale
+        val ratio = 0.7f * resources.displayMetrics.density
+        paint.textSize = 12f * ratio
+        paint.color = Color.BLACK
+        canvas.drawRect((rWidth + wColor).toFloat(), 0f, width.toFloat(), height.toFloat(), paint)
+        paint.color = Color.WHITE
+        canvas.drawText("kHz", (rWidth + wColor).toFloat(), 12 * ratio, paint)
+        if (logFrequency) {
+            for (i in 1..4) {
+                val y = getRelativePosition(
+                    10.0.pow(i.toDouble()).toFloat(),
+                    samplingRate.toFloat() / 2
+                )
+                canvas.drawText("1e$i", (rWidth + wColor).toFloat(), (1f - y) * height, paint)
+            }
+        } else {
+            var i = 0
+            while (i < (samplingRate - 500) / 2) {
+                canvas.drawText(
+                    " " + i / 1000,
+                    (rWidth + wColor).toFloat(),
+                    height * (1f - i.toFloat() / (samplingRate.toFloat() / 2)),
+                    paint
+                )
+                i += 1000
+            }
+        }
+        pos++
+    }
+
+    /**
+     * Converts relative position of a value within given boundaries
+     * Log=true for logarithmic scale
+     */
+    private fun getRelativePosition(value: Float, maxValue: Float): Float {
+        return log10((1 + value - 1f).toDouble())
+            .toFloat() / log10((1 + maxValue - 1f).toDouble()).toFloat()
+    }
+
+    /**
+     * Returns a value from its relative position within given boundaries
+     * Log=true for logarithmic scale
+     */
+    private fun getValueFromRelativePosition(
+        position: Float,
+        maxValue: Float,
+        log: Boolean
+    ): Float {
+        return if (log) (10.0.pow(position * log10((1 + maxValue - 1f).toDouble())) + 1f - 1).toFloat() else 1f + position * (maxValue - 1f)
+    }
+
+    /**
+     * Calculate rainbow colors
+     */
+    private fun ave(s: Int, d: Int, p: Float): Int {
+        return s + (p * (d - s)).roundToInt()
+    }
+
+    private fun getInterpolatedColor(colors: IntArray?, unit: Float): Int {
+        colors?.let {
+            if (unit <= 0) return it[0]
+            if (unit >= 1) return it[it.size - 1 ]
+            var p = unit * (it.size - 1)
+            val i = p.toInt()
+            p -= i.toFloat()
+
+            // now p is just the fractional part [0...1) and i is the index
+            val c0 = it[i]
+            val c1 = it[i + 1]
+            val a = ave(Color.alpha(c0), Color.alpha(c1), p)
+            val r = ave(Color.red(c0), Color.red(c1), p)
+            val g = ave(Color.green(c0), Color.green(c1), p)
+            val b = ave(Color.blue(c0), Color.blue(c1), p)
+            return Color.argb(a, r, g, b)
+        }
+
+        return  0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/Misc.java b/app/src/main/java/net/galmiza/android/spectrogram/Misc.java
deleted file mode 100755
index e7c0504..0000000
--- a/app/src/main/java/net/galmiza/android/spectrogram/Misc.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Spectrogram Android application
- * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
-
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from the use of this software.
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it freely,
- * subject to the following restrictions:
-
- * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-package net.galmiza.android.spectrogram;
-
-import java.util.HashMap;
-import android.app.Activity;
-import android.preference.PreferenceManager;
-
-/**
- * Various useful methods for the application
- */
-public class Misc {
-	
-	// SIMPLE HASHMAP (to easily share data across objects)
-	private static HashMap<String,Object> map = new HashMap<String,Object>();
-	public static Object getAttribute(String s)	{ return map.get(s); }
-	public static void setAttribute(String s, Object o)	{ map.put(s, o); }
-	public static void resetAttributes() { map = new HashMap<String,Object>(); }
-	
-	// PREFERENCES
-	public static void setPreference(Activity a, String key, boolean value) {	PreferenceManager.getDefaultSharedPreferences(a).edit().putBoolean(key, value).commit();	}
-	public static void setPreference(Activity a, String key, float value) {		PreferenceManager.getDefaultSharedPreferences(a).edit().putFloat(key, value).commit();	}
-	public static void setPreference(Activity a, String key, int value) {		PreferenceManager.getDefaultSharedPreferences(a).edit().putInt(key, value).commit();	}
-	public static void setPreference(Activity a, String key, long value) {		PreferenceManager.getDefaultSharedPreferences(a).edit().putLong(key, value).commit();	}
-	public static void setPreference(Activity a, String key, String value) {	PreferenceManager.getDefaultSharedPreferences(a).edit().putString(key, value).commit();	}
-	
-	public static boolean getPreference(Activity a, String key, boolean def) {	return PreferenceManager.getDefaultSharedPreferences(a).getBoolean(key, def);	}
-	public static float getPreference(Activity a, String key, float def) {		return PreferenceManager.getDefaultSharedPreferences(a).getFloat(key, def);	}
-	public static int getPreference(Activity a, String key, int def) {			return PreferenceManager.getDefaultSharedPreferences(a).getInt(key, def);	}
-	public static long getPreference(Activity a, String key, long def) {		return PreferenceManager.getDefaultSharedPreferences(a).getLong(key, def);	}
-	public static String getPreference(Activity a, String key, String def) {	return PreferenceManager.getDefaultSharedPreferences(a).getString(key, def);	}
-
-	public static void setPreference(String key, boolean value) {	setPreference(getActivity(), key, value);	}
-	public static void setPreference(String key, float value) {		setPreference(getActivity(), key, value);	}
-	public static void setPreference(String key, int value) {		setPreference(getActivity(), key, value);	}
-	public static void setPreference(String key, long value) {		setPreference(getActivity(), key, value);	}
-	public static void setPreference(String key, String value) {	setPreference(getActivity(), key, value);	}
-	
-	public static boolean getPreference(String key, boolean def) {	return getPreference(getActivity(), key, def);	}
-	public static float getPreference(String key, float def) {		return getPreference(getActivity(), key, def);	}
-	public static int getPreference(String key, int def) {			return getPreference(getActivity(), key, def);	}
-	public static long getPreference(String key, long def) {		return getPreference(getActivity(), key, def);	}
-	public static String getPreference(String key, String def) {	return getPreference(getActivity(), key, def);	}
-	
-	public static Activity getActivity() {
-		return (Activity) getAttribute("activity");
-	}
-}
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/Misc.kt b/app/src/main/java/net/galmiza/android/spectrogram/Misc.kt
new file mode 100755
index 0000000..d047283
--- /dev/null
+++ b/app/src/main/java/net/galmiza/android/spectrogram/Misc.kt
@@ -0,0 +1,46 @@
+/**
+ * Spectrogram Android application
+ * Copyright (c) 2013 Guillaume Adam  http://www.galmiza.net/
+ *
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it freely,
+ * subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+package net.galmiza.android.spectrogram
+
+import android.app.Activity
+import android.content.Context
+import androidx.preference.PreferenceManager
+import java.util.HashMap
+
+/**
+ * Various useful methods for the application
+ */
+object Misc {
+    // SIMPLE HASHMAP (to easily share data across objects)
+    private val map = HashMap<String, Any>()
+    @JvmStatic
+	fun getAttribute(s: String): Any? {
+        return map[s]
+    }
+
+
+
+    // PREFERENCES
+
+    @JvmStatic
+    fun getPreference(context: Context, key: String?, def: Boolean): Boolean {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(key, def)
+    }
+
+    @JvmStatic
+    fun getPreference(context: Context, key: String?, def: String?): String? {
+        return PreferenceManager.getDefaultSharedPreferences(context).getString(key, def)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/PreferencesActivity.java b/app/src/main/java/net/galmiza/android/spectrogram/PreferencesFragment.java
similarity index 62%
rename from app/src/main/java/net/galmiza/android/spectrogram/PreferencesActivity.java
rename to app/src/main/java/net/galmiza/android/spectrogram/PreferencesFragment.java
index ae20b1c..83488a7 100755
--- a/app/src/main/java/net/galmiza/android/spectrogram/PreferencesActivity.java
+++ b/app/src/main/java/net/galmiza/android/spectrogram/PreferencesFragment.java
@@ -15,50 +15,60 @@
 
 package net.galmiza.android.spectrogram;
 
-
+import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceFragmentCompat;
+
+import java.util.Objects;
 
 /**
  * Renders preferences as defined in xml/preferences.xml
  * Formats text using string patterns defined in values-xx/string.xml
  * Note that activity is registered as activity in the manifest file AndroidManifest.xml
  */
-public class PreferencesActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
-	@SuppressWarnings("deprecation")
+public class PreferencesFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+	private @Nullable Context context;
+
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(R.xml.preferences);
-		
-		// Init values
-	    
-	    // Run update
-	    getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
-		UpdateConfiguration(R.array.preferences_configuration);
+	public void onAttach(@NonNull Context context) {
+		super.onAttach(context);
+
+		this.context = context;
+
+		UpdateConfiguration(R.array.preferences_configuration, context);
 	}
-	
+
+	@Override
+	public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+		setPreferencesFromResource(R.xml.preferences, rootKey);
+
+		Objects.requireNonNull(getPreferenceScreen().getSharedPreferences()).registerOnSharedPreferenceChangeListener(this);
+	}
+
 	/**
 	 * UpdateConfiguration
 	 * Map items of ressourceId to several arrays string[3] = type, key, pattern defined in string.xml
 	 * Replaces summary of preference 'key' by 'pattern' taking current value as input 
 	 */
-	@SuppressWarnings("deprecation")
-	private void UpdateConfiguration(int ressourceId) {
-		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-		String[] cf = getResources().getStringArray(ressourceId);
+
+	private void UpdateConfiguration(int resourceId, @NonNull Context context) {
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		String[] cf = getResources().getStringArray(resourceId);
 		
 		for (int i=0; i<cf.length/4; i++) {
-			String type = cf[4*i+0];
+			String type = cf[4 * i];
 			String object = cf[4*i+1];
 			String key = cf[4*i+2];
 			String pattern = cf[4*i+3];
 			
-			Preference preference = (Preference) findPreference(key);
+			Preference preference = findPreference(key);
 			if (preference == null) continue;
 			
 			String text = "";
@@ -71,6 +81,8 @@ private void UpdateConfiguration(int ressourceId) {
 	}
 	public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
 		// Whatever the change is, update all!
-		UpdateConfiguration(R.array.preferences_configuration);
+		if (this.context != null) {
+			UpdateConfiguration(R.array.preferences_configuration, this.context);
+		}
 	}
 }
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/SpectrogramActivity.java b/app/src/main/java/net/galmiza/android/spectrogram/SpectrogramActivity.java
index 0248449..5139a87 100755
--- a/app/src/main/java/net/galmiza/android/spectrogram/SpectrogramActivity.java
+++ b/app/src/main/java/net/galmiza/android/spectrogram/SpectrogramActivity.java
@@ -15,19 +15,22 @@
 
 package net.galmiza.android.spectrogram;
 
+import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import net.galmiza.android.engine.sound.SoundEngine;
 
 import java.text.DecimalFormat;
@@ -46,20 +49,16 @@
  *   onActivityResult (response from external activities)
  */
 public class SpectrogramActivity extends AppCompatActivity {
-	
-	// Constant
-	static final float PI = (float) Math.PI;
+
 	static final int INTENT_SETTINGS = 0;
     static final int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 0;
-	
-	// Attributes
-	private ActionBar actionBar;
+
 	private FrequencyView frequencyView;
 	private TimeView timeView;
 	private ContinuousRecord recorder;
 	private SoundEngine nativeLib;
 	private Menu menu;
-	private int samplingRate = 44100;
+	private final int samplingRate = 44100;
 	private int fftResolution;
 	
 	// Buffers
@@ -71,10 +70,7 @@ public class SpectrogramActivity extends AppCompatActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
-		// Share core
-		Misc.setAttribute("activity", this);
-		
+
 		// Load preferences
 		loadPreferences();
 		
@@ -83,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		nativeLib.initFSin();
 		
 		// Recorder & player
-		recorder = new ContinuousRecord(samplingRate);
+		recorder = new ContinuousRecord(samplingRate, this);
 		
 		// Create view for frequency display
 		setContentView(R.layout.main);
@@ -92,7 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (Misc.getPreference(this, "keep_screen_on", false))
 			frequencyView.setKeepScreenOn(true);
 		frequencyView.setFFTResolution(fftResolution);
-        timeView.setFFTResolution(fftResolution);
+		timeView.setFFTResolution(fftResolution);
 		frequencyView.setSamplingRate(samplingRate);
 		
 		// Color mode
@@ -109,11 +105,14 @@ protected void onCreate(Bundle savedInstanceState) {
         getSupportActionBar().hide();
         if (util.Misc.getPreference(this, "hide_status_bar", false))
         	getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);*/
-        
+
 		// Action bar
-		actionBar = getSupportActionBar();
-		actionBar.setTitle(getString(R.string.app_name));
-		actionBar.setSubtitle(getString(R.string.app_subtitle));
+		// Attributes
+		ActionBar actionBar = getSupportActionBar();
+		if (actionBar != null) {
+			actionBar.setTitle(getString(R.string.app_name));
+			actionBar.setSubtitle(getString(R.string.app_subtitle));
+		}
 
 		// Request record audio permission
 		if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
@@ -122,6 +121,9 @@ protected void onCreate(Bundle savedInstanceState) {
         } else {
 			ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.RECORD_AUDIO}, MY_PERMISSIONS_REQUEST_RECORD_AUDIO);
 		}
+
+		findViewById(R.id.textview_frequency_header).setOnClickListener(this::onFrequencyViewHeaderClick);
+		findViewById(R.id.textview_time_header).setOnClickListener(this::onTimeViewHeaderClick);
 	}
 	
 	
@@ -136,7 +138,7 @@ private void updateHeaders() {
 		TextView time = findViewById(R.id.textview_time_header);
 		time.setText(String.format(getString(R.string.view_header_time), df.format(1000.0f*fftBuffer.length/samplingRate)));
 			
-		// Freqnecy view
+		// Frequency view
 		TextView frequency = findViewById(R.id.textview_frequency_header);
 		String window = Misc.getPreference(
 				this,
@@ -164,7 +166,7 @@ private void updateHeaders() {
 	 * Control recording service
 	 */
 	private void startRecording() {
-		recorder.start(recordBuffer -> getTrunks(recordBuffer));
+		recorder.start(this::getTrunks);
 	}
 	private void stopRecording() {
 		recorder.stop();
@@ -174,17 +176,15 @@ private void stopRecording() {
      * Handles response to permission request
      */
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        switch (requestCode) {
-            case MY_PERMISSIONS_REQUEST_RECORD_AUDIO: {
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    loadEngine();
-                    updateHeaders();
-                }
-                return;
-            }
-        }
-    }
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		if (requestCode == MY_PERMISSIONS_REQUEST_RECORD_AUDIO) {
+			if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+				loadEngine();
+				updateHeaders();
+			}
+		}
+	}
 
 	/**
 	 * Handles interactions with the menu
@@ -194,29 +194,64 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.main_menu, menu);
 		this.menu = menu;
 		menu.findItem(R.id.action_bar_menu_play).setVisible(false);
+		menu.findItem(R.id.action_bar_menu_close).setVisible(false);
 		return true;
 	}
 	
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		
-		switch (item.getItemId()) {
-		case R.id.action_bar_menu_settings:
-			Intent intent = new Intent(this,PreferencesActivity.class);
-			startActivityForResult(intent, INTENT_SETTINGS);
-			return true;
-		case R.id.action_bar_menu_play:
+
+		int id = item.getItemId();
+
+		if (id == R.id.action_bar_menu_settings) {
+
+			findViewById(R.id.fragment_container_view).setVisibility(View.VISIBLE);
+			findViewById(R.id.textview_time_header).setVisibility(View.GONE);
+			findViewById(R.id.textview_frequency_header).setVisibility(View.GONE);
+
+			menu.findItem(R.id.action_bar_menu_play).setVisible(false);
+			menu.findItem(R.id.action_bar_menu_pause).setVisible(false);
+			menu.findItem(R.id.action_bar_menu_settings).setVisible(false);
+			menu.findItem(R.id.action_bar_menu_close).setVisible(true);
+
+			getSupportFragmentManager().beginTransaction()
+					.setReorderingAllowed(true)
+					.add(R.id.fragment_container_view, PreferencesFragment.class, null)
+					.commit();
+			return  true;
+		}
+		if (id == R.id.action_bar_menu_play) {
 			menu.findItem(R.id.action_bar_menu_play).setVisible(false);
 			menu.findItem(R.id.action_bar_menu_pause).setVisible(true);
 			startRecording();
-			return true;
-		case R.id.action_bar_menu_pause:
+			return  true;
+		}
+		if (id == R.id.action_bar_menu_pause) {
 			menu.findItem(R.id.action_bar_menu_pause).setVisible(false);
 			menu.findItem(R.id.action_bar_menu_play).setVisible(true);
 			stopRecording();
-			return true;
+			return  true;
 		}
-		return false;
+		if (id == R.id.action_bar_menu_close) {
+
+			if (this.recorder.isRun()) {
+				menu.findItem(R.id.action_bar_menu_pause).setVisible(true);
+				menu.findItem(R.id.action_bar_menu_play).setVisible(false);
+			} else {
+				menu.findItem(R.id.action_bar_menu_pause).setVisible(false);
+				menu.findItem(R.id.action_bar_menu_play).setVisible(true);
+			}
+
+			menu.findItem(R.id.action_bar_menu_settings).setVisible(true);
+			menu.findItem(R.id.action_bar_menu_close).setVisible(false);
+
+			findViewById(R.id.fragment_container_view).setVisibility(View.GONE);
+			findViewById(R.id.textview_time_header).setVisibility(View.VISIBLE);
+			findViewById(R.id.textview_frequency_header).setVisibility(View.VISIBLE);
+
+			return  true;
+		}
+		return  false;
 	}
 	
 	/**
@@ -224,36 +259,37 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	 */
 	@Override
 	protected void onActivityResult (int requestCode, int resultCode, Intent intent) {
-	    //if (resultCode == Activity.RESULT_OK) {
-	    	if (requestCode == INTENT_SETTINGS) {
-	    		
-	    		// Stop and release recorder if running
-	    		recorder.stop();
-	    		recorder.release();
-	    		
-	    		// Update preferences
-	    		loadPreferences();
-	    		
-	    		// Notify view
-	    		frequencyView.setFFTResolution(fftResolution);
-	    		timeView.setFFTResolution(fftResolution);
-
-                if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
-                    loadEngine();
-                    updateHeaders();
-                }
-	    		
-	    		// Update color mode
-	    		boolean nightMode = Misc.getPreference(this, "night_mode", false);
-	            if (!nightMode)	{
-	            	frequencyView.setBackgroundColor(Color.WHITE);
-	            	timeView.setBackgroundColor(Color.WHITE);
-	            } else {
-	            	frequencyView.setBackgroundColor(Color.BLACK);
-	            	timeView.setBackgroundColor(Color.BLACK);
-	            }
-	    	}
-	    //}
+		//if (resultCode == Activity.RESULT_OK) {
+		super.onActivityResult(requestCode, resultCode, intent);
+		if (requestCode == INTENT_SETTINGS) {
+
+			// Stop and release recorder if running
+			recorder.stop();
+			recorder.release();
+
+			// Update preferences
+			loadPreferences();
+
+			// Notify view
+			frequencyView.setFFTResolution(fftResolution);
+			timeView.setFFTResolution(fftResolution);
+
+			if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
+				loadEngine();
+				updateHeaders();
+			}
+
+			// Update color mode
+			boolean nightMode = Misc.getPreference(this, "night_mode", false);
+			if (!nightMode) {
+				frequencyView.setBackgroundColor(Color.WHITE);
+				timeView.setBackgroundColor(Color.WHITE);
+			} else {
+				frequencyView.setBackgroundColor(Color.BLACK);
+				timeView.setBackgroundColor(Color.BLACK);
+			}
+		}
+		//}
 	}
 	
 	@Override
@@ -283,7 +319,10 @@ public void onBackPressed() {
 	 * Load preferences
 	 */
 	private void loadPreferences() {
-		fftResolution = Integer.parseInt(Misc.getPreference(this, "fft_resolution", getString(R.string.preferences_fft_resolution_default_value)));
+		String resolution = Misc.getPreference(this, "fft_resolution", getString(R.string.preferences_fft_resolution_default_value));
+		if (resolution != null) {
+			fftResolution = Integer.parseInt(resolution);
+		}
 	}
 
 	
@@ -307,8 +346,9 @@ private void loadEngine() {
 		im = new float[n];
  		bufferStack = new ArrayList<>();
 		int l = recorder.getBufferLength()/(n/2);
-		for (int i=0; i<l+1; i++) //+1 because the last one has to be used again and sent to first position
+		for (int i=0; i<l+1; i++) { //+1 because the last one has to be used again and sent to first position
 			bufferStack.add(new short[n/2]); // preallocate to avoid new within processing loop
+		}
 
         // Start recording
         startRecording();
@@ -364,18 +404,40 @@ private void process() {
 				this,
 				"window_type",
 				getString(R.string.preferences_window_type_default_value));
-		
-		if (window.equals("Rectangular"))			nativeLib.windowRectangular(re, n);
-		else if (window.equals("Triangular"))		nativeLib.windowTriangular(re, n);
-		else if (window.equals("Welch"))			nativeLib.windowWelch(re, n);
-		else if (window.equals("Hanning"))			nativeLib.windowHanning(re, n);
-		else if (window.equals("Hamming"))			nativeLib.windowHamming(re, n);
-		else if (window.equals("Blackman"))			nativeLib.windowBlackman(re, n);
-		else if (window.equals("Nuttall"))			nativeLib.windowNuttall(re, n);
-		else if (window.equals("Blackman-Nuttall"))	nativeLib.windowBlackmanNuttall(re, n);
-		else if (window.equals("Blackman-Harris"))	nativeLib.windowBlackmanHarris(re, n);
-		
-		nativeLib.fft(re, im, log2_n, 0);	// Move into frquency domain 
+
+		if (window != null) {
+			switch (window) {
+				case "Rectangular":
+					nativeLib.windowRectangular(re, n);
+					break;
+				case "Triangular":
+					nativeLib.windowTriangular(re, n);
+					break;
+				case "Welch":
+					nativeLib.windowWelch(re, n);
+					break;
+				case "Hanning":
+					nativeLib.windowHanning(re, n);
+					break;
+				case "Hamming":
+					nativeLib.windowHamming(re, n);
+					break;
+				case "Blackman":
+					nativeLib.windowBlackman(re, n);
+					break;
+				case "Nuttall":
+					nativeLib.windowNuttall(re, n);
+					break;
+				case "Blackman-Nuttall":
+					nativeLib.windowBlackmanNuttall(re, n);
+					break;
+				case "Blackman-Harris":
+					nativeLib.windowBlackmanHarris(re, n);
+					break;
+			}
+		}
+
+		nativeLib.fft(re, im, log2_n, 0);	// Move into frequency domain
 		nativeLib.toPolar(re, im, n);	// Move to polar base
 
 		frequencyView.setMagnitudes(re);
diff --git a/app/src/main/java/net/galmiza/android/spectrogram/TimeView.java b/app/src/main/java/net/galmiza/android/spectrogram/TimeView.java
index 716c026..e5504f9 100755
--- a/app/src/main/java/net/galmiza/android/spectrogram/TimeView.java
+++ b/app/src/main/java/net/galmiza/android/spectrogram/TimeView.java
@@ -16,7 +16,6 @@
 package net.galmiza.android.spectrogram;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -34,8 +33,8 @@
 public class TimeView extends View {
 	
 	// Attributes
-    private Paint paint = new Paint();
-    private GestureDetector detector;
+    private final Paint paint = new Paint();
+    private final GestureDetector detector;
     private float gain = 1.0f;
     private int fftResolution;
     private float[] wave;
@@ -85,25 +84,29 @@ public void setWave(float[] w) {
      */
     @Override
     public void onDraw(Canvas canvas) {
-    	int width = canvas.getWidth();
-    	int height = canvas.getHeight();
-    	Activity a = (Activity) Misc.getAttribute("activity");
-	   	boolean nightMode = Misc.getPreference(a, "night_mode", true);
+    	int width = getWidth();
+    	int height = getHeight();
+
+	   	boolean nightMode = Misc.getPreference(getContext(), "night_mode", true);
     	
     	// Draw axis
 		paint.setStrokeWidth(1);
 		if (!nightMode) paint.setColor(Color.LTGRAY);
 		else			paint.setColor(Color.DKGRAY);
-    	canvas.drawLine(0, height/2, width, height/2, paint);
+    	canvas.drawLine(0, (float)height/2, width, (float)height/2, paint);
     	
     	// Draw wave
-    	paint.setStrokeWidth(Integer.valueOf(Misc.getPreference(a, "line_width", "1")));
+		String lineWidth = Misc.getPreference(getContext(), "line_width", "1");
+		if (lineWidth != null) {
+			paint.setStrokeWidth(Integer.parseInt(lineWidth));
+		}
+
     	if (!nightMode) paint.setColor(Color.BLACK);
 		else		 	paint.setColor(Color.WHITE);
     	float x1 = 0;
     	float y1 = height*(0.5f+0.5f*gain*wave[0]);
     	for (int i=1; i<fftResolution; i++) {
-    		float x2 = width*i/(fftResolution);
+    		float x2 = (float)width*i/(fftResolution);
     		float y2 = height*(0.5f+0.5f*gain*wave[i]);
     		if ((x1>0 && x1<width) && (x2>0 && x2<width))
     			canvas.drawLine(x1, height-y1, x2, height-y2, paint);
diff --git a/app/src/main/res/drawable/ic_action_close.xml b/app/src/main/res/drawable/ic_action_close.xml
new file mode 100644
index 0000000..844b6b6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index fbba2cb..a0445f2 100755
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,36 +1,41 @@
+
+
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
     xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/linearlayout_main"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity" >
+    tools:context=".SpectrogramActivity" >
 
 	<TextView
-	    android:id="@+id/textview_time_header"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:textSize="14sp"
-	    android:padding="3sp"
+		android:id="@+id/textview_time_header"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
 		android:clickable="true"
-		android:onClick="onTimeViewHeaderClick" />
+		android:focusable="true"
+		android:minHeight="32dp"
+		android:padding="3sp"
+		android:textSize="14sp"
+		tools:ignore="SpeakableTextPresentCheck" />
 		
     <net.galmiza.android.spectrogram.TimeView
         android:id="@+id/time_view"
 	    android:layout_weight="1"
 	    android:layout_width="fill_parent"
 	    android:layout_height="0dip" />
-    
+
 	<TextView
-	    android:id="@+id/textview_frequency_header"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:textSize="14sp"
-	    android:padding="3sp"
+		android:id="@+id/textview_frequency_header"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
 		android:clickable="true"
-		android:onClick="onFrequencyViewHeaderClick" />
+		android:focusable="true"
+		android:minHeight="48dp"
+		android:padding="3sp"
+		android:textSize="14sp"
+		tools:ignore="SpeakableTextPresentCheck" />
 	
     <net.galmiza.android.spectrogram.FrequencyView
         android:id="@+id/frequency_view"
@@ -38,4 +43,12 @@
 	    android:layout_width="fill_parent"
 	    android:layout_height="0dip" />
 
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@+id/fragment_container_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:visibility="gone"
+		android:name="net.galmiza.android.spectrogram.PreferencesFragment"
+		tools:layout="@android:layout/preference_category" />
+
 </LinearLayout>
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 5da4938..cfcc3b3 100755
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -2,17 +2,21 @@
 	  xmlns:app="http://schemas.android.com/apk/res-auto" >
 
 <item android:id="@+id/action_bar_menu_settings" 
-      android:title="Settings"
+      android:title="@string/menu_main_item_settings"
 	  android:icon="@drawable/ic_action_settings"
       app:showAsAction="ifRoom" />
 <item android:id="@+id/action_bar_menu_pause" 
-      android:title="Pause"
+      android:title="@string/menu_pause"
 	  android:icon="@drawable/ic_action_pause"
       app:showAsAction="ifRoom" />	  
 <item android:id="@+id/action_bar_menu_play" 
-      android:title="Play"
+      android:title="@string/menu_play"
 	  android:icon="@drawable/ic_action_play"
 	  android:visibility="gone"
       app:showAsAction="ifRoom" />
-
+	<item android:id="@+id/action_bar_menu_close"
+		android:title="@string/menu_play"
+		android:icon="@drawable/ic_action_close"
+		android:visibility="gone"
+		app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 23bacec..7e29e39 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -5,6 +5,8 @@
 	
     <!-- Menu -->
     <string name="menu_main_item_settings">Configuration</string>
+    <string name="menu_play">Play</string>
+    <string name="menu_pause">Pause</string>
     
     <!-- View headers -->
     <string name="view_header_time">Echantillon: %1$s ms</string>
@@ -74,6 +76,7 @@
     <string-array name="preferences_configuration">
 		<item>string</item><item>summary</item><item>fft_resolution</item><item>%s</item>
 		<item>string</item><item>summary</item><item>window_type</item><item>Fenêtrage %s</item>
+        <item>string</item><item>summary</item><item>frequency_scale</item><item>%s</item>
 		<item>string</item><item>summary</item><item>color_scale</item><item>%s</item>
 	</string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b09a819..0b71d0d 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,8 @@
 	
     <!-- Menu -->
     <string name="menu_main_item_settings">Settings</string>
+    <string name="menu_play">Play</string>
+    <string name="menu_pause">Pause</string>
     
     <!-- View headers -->
     <string name="view_header_time">Frame length: %1$s ms</string>
diff --git a/build.gradle b/build.gradle
index 2fc827a..9542d28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
-
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ee52d4..3bd4049 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/local.properties b/local.properties
index 4df9e8e..2f9d64f 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Apr 12 14:51:11 ICT 2019
-sdk.dir=/Users/quang/Library/Android/sdk
+#Thu Dec 08 12:20:48 CET 2022
+sdk.dir=/Users/softwave/Library/Android/sdk
diff --git a/spectrogram-android.iml b/spectrogram-android.iml
deleted file mode 100644
index 725489e..0000000
--- a/spectrogram-android.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="spectrogram-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file