Merge branch 'audiorecorder-1.4.7'

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 108
-        versionName "1.4.6"
+        versionCode 109
+        versionName "1.4.7"
     }
     signingConfigs {
         release {
@@ -45,5 +45,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support:support-v4:25.2.0'
-    compile 'com.github.axet:android-audio-library:0.0.7' // compile project(':android-audio-library')
+    compile 'com.github.axet:android-audio-library:0.0.9' // compile project(':android-audio-library')
 }

app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java

@@ -24,6 +24,7 @@ import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.github.axet.audiolibrary.app.Storage;
 import com.github.axet.audiorecorder.R;
 import com.github.axet.audiorecorder.app.MainApplication;
 import com.github.axet.audiolibrary.encoders.Factory;
@@ -61,6 +62,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
         @Override
         public boolean onPreferenceChange(Preference preference, Object value) {
             String stringValue = value.toString();
+            String key = preference.getKey();
 
             if (preference instanceof ListPreference) {
                 // For list preferences, look up the correct display value in
@@ -92,7 +94,12 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
             } else {
                 // For all other preferences, set the summary to the value's
                 // simple string representation.
-                preference.setSummary(stringValue);
+                if (key.equals(MainApplication.PREFERENCE_STORAGE)) { // if storage is disabled, show local path
+                    Storage storage = new Storage(preference.getContext());
+                    preference.setSummary(storage.getStoragePath().toString());
+                } else {
+                    preference.setSummary(stringValue);
+                }
             }
             return true;
         }

app/src/main/res/layout/activity_main.xml

@@ -29,6 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_margin="@dimen/fab_margin"
+        android:background="?attr/colorAccent"
         android:src="@drawable/ic_mic_24dp" />
 
 </android.support.design.widget.CoordinatorLayout>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files