Built with latest tools, api 26, welcome Oreo 😁

xtonousou · Oct 25, 2017 · 39483b0 · 39483b0
1 parent 1eff7f1
commit 39483b0
Show file tree

Hide file tree

Showing 58 changed files with 237 additions and 422 deletions.
diff --git a/.idea/libraries/colorpicker_library_1_1_7.xml b/.idea/libraries/colorpicker_library_1_1_7.xml
diff --git a/.idea/libraries/easypermissions_1_0_1.xml b/.idea/libraries/easypermissions_1_0_1.xml
diff --git a/.idea/libraries/eventbus_3_0_0.xml b/.idea/libraries/eventbus_3_0_0.xml
diff --git a/.idea/libraries/fastadapter_2_6_3.xml b/.idea/libraries/fastadapter_2_6_3.xml
diff --git a/.idea/libraries/fontawesome_typeface_4_7_0_1.xml b/.idea/libraries/fontawesome_typeface_4_7_0_1.xml
diff --git a/.idea/libraries/google_material_typeface_3_0_1_1_original.xml b/.idea/libraries/google_material_typeface_3_0_1_1_original.xml
diff --git a/.idea/libraries/iconics_core_2_9_3.xml b/.idea/libraries/iconics_core_2_9_3.xml
diff --git a/.idea/libraries/library_2_1.xml b/.idea/libraries/library_2_1.xml
diff --git a/.idea/libraries/library_2_3.xml b/.idea/libraries/library_2_3.xml
diff --git a/.idea/libraries/materialdrawer_5_9_5.xml b/.idea/libraries/materialdrawer_5_9_5.xml
diff --git a/.idea/libraries/materialize_1_0_3.xml b/.idea/libraries/materialize_1_0_3.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/SoundBoardX.iml b/SoundBoardX.iml
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/app/app.iml b/app/app.iml
@@ -62,22 +62,23 @@
       <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/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" />
       <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/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -101,39 +102,39 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="iconics-core-2.8.3" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-26.1.0" level="project" />
-    <orderEntry type="library" exported="" name="fontawesome-typeface-4.7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="iconics-core-2.9.3" level="project" />
+    <orderEntry type="library" exported="" name="fontawesome-typeface-4.7.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-media-compat-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-core-utils-26.1.0" level="project" />
-    <orderEntry type="library" exported="" name="materialize-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="easypermissions-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="library-1.4.0" level="project" />
+    <orderEntry type="library" exported="" name="google-material-typeface-3.0.1.1.original" level="project" />
     <orderEntry type="library" exported="" name="transition-26.1.0" level="project" />
-    <orderEntry type="library" exported="" name="easypermissions-0.1.9" level="project" />
+    <orderEntry type="library" exported="" name="materialize-1.0.3" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="google-material-typeface-3.0.1.0.original" level="project" />
     <orderEntry type="library" exported="" name="support-compat-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-26.1.0" level="project" />
-    <orderEntry type="library" exported="" name="materialdrawer-5.9.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-fragment-26.1.0" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-26.1.0" level="project" />
+    <orderEntry type="library" exported="" name="eventbus-3.0.0" level="project" />
     <orderEntry type="library" exported="" name="runtime-1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="library-2.2" level="project" />
+    <orderEntry type="library" exported="" name="materialdrawer-5.9.5" level="project" />
+    <orderEntry type="library" exported="" name="fastadapter-2.6.3" level="project" />
+    <orderEntry type="library" exported="" name="library-2.3" level="project" />
     <orderEntry type="library" exported="" name="common-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="1_common-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-26.1.0" level="project" />
-    <orderEntry type="library" exported="" name="library-2.0" level="project" />
     <orderEntry type="library" exported="" name="LeonidsLib-1.3.2" level="project" />
     <orderEntry type="library" exported="" name="1_LeonidsLib-1.3.2" level="project" />
-    <orderEntry type="library" exported="" name="fastadapter-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="colorpicker-library-1.1.4" level="project" />
+    <orderEntry type="library" exported="" name="library-2.1" level="project" />
+    <orderEntry type="library" exported="" name="colorpicker-library-1.1.7" level="project" />
     <orderEntry type="library" exported="" name="design-26.1.0" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,23 +25,23 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile('com.mikepenz:materialdrawer:5.9.0@aar') {
+    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
         transitive = true
     }
-    compile 'de.greenrobot:eventbus:2.4.0'
+    compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.android.support:recyclerview-v7:26.1.0'
     compile 'com.android.support:design:26.1.0'
     compile 'com.plattysoft.leonids:LeonidsLib:1.3.2'
     compile 'com.romainpiel.shimmer:library:1.4.0@aar'
     compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.daimajia.easing:library:2.0@aar'
-    compile 'com.daimajia.androidanimations:library:2.2@aar'
-    compile 'pub.devrel:easypermissions:0.1.9'
-    compile 'petrov.kristiyan:colorpicker-library:1.1.4'
-    compile 'com.mikepenz:iconics-core:2.8.3@aar'
-    compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
-    compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
+    compile 'com.daimajia.easing:library:2.1@aar'
+    compile 'com.daimajia.androidanimations:library:2.3@aar'
+    compile 'pub.devrel:easypermissions:1.0.1'
+    compile 'petrov.kristiyan:colorpicker-library:1.1.7'
+    compile 'com.mikepenz:iconics-core:2.9.3@aar'
+    compile 'com.mikepenz:google-material-typeface:3.0.1.1.original@aar'
+    compile 'com.mikepenz:fontawesome-typeface:4.7.0.1@aar'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
diff --git a/app/src/assets/fonts/CaviarDreams.ttf → app/src/main/assets/fonts/CaviarDreams.ttf b/app/src/assets/fonts/CaviarDreams.ttf → app/src/main/assets/fonts/CaviarDreams.ttf
diff --git a/app/src/assets/fonts/Roboto-Regular.ttf → app/src/main/assets/fonts/Roboto-Regular.ttf b/app/src/assets/fonts/Roboto-Regular.ttf → app/src/main/assets/fonts/Roboto-Regular.ttf
diff --git a/app/src/main/java/io/github/xtonousou/soundboardx/FileNameCleaner.java b/app/src/main/java/io/github/xtonousou/soundboardx/FileNameCleaner.java
@@ -12,7 +12,8 @@ class FileNameCleaner {
 
     static String cleanFileName(String badFileName) {
         StringBuilder cleanName = new StringBuilder();
-        for (int i = 0; i < badFileName.length(); i++) {
+        final int badFileName_length = badFileName.length();
+        for (int i = 0; i < badFileName_length; i++) {
             int c = (int) badFileName.charAt(i);
             if (Arrays.binarySearch(illegalChars, c) < 0) {
                 cleanName.append((char)c);