Merge branch 'audiorecorder-3.1.8'

2018-01-29 22:55:52 +03:00 · 2018-01-29 22:55:52 +03:00 · a6fd224020
commit a6fd224020
parent 8059f772ea 5af0e078bb
14 changed files with 47 additions and 4 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,8 +10,8 @@ android {
        applicationId "com.github.axet.audiorecorder"
        minSdkVersion 9
        targetSdkVersion 23 // 24+ file:// unable to open
-        versionCode 238
-        versionName "3.1.7"
+        versionCode 239
+        versionName "3.1.8"
    }
    signingConfigs {
        release {
@ -55,5 +55,5 @@ android {
 dependencies {
    compile fileTree(dir: 'libs', include: ['*.jar'])
    testCompile 'junit:junit:4.12'
-    compile 'com.github.axet:android-audio-library:1.0.78' // compile project(':android-audio-library')
+    compile 'com.github.axet:android-audio-library:1.0.80' // compile project(':android-audio-library')
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -22,6 +22,8 @@
 -keep class com.github.axet.lamejni.Lame {*;}
 -keep class com.github.axet.opusjni.Opus {*;}

+-keep class com.github.axet.androidlibrary.widgets.SearchView {*;}
+
 -dontwarn net.sourceforge.javaflacencoder.**
 -dontwarn com.jssrc.resample.**
 -dontwarn org.apache.commons.**
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -32,6 +32,9 @@
            android:label="@string/app_name"
            android:launchMode="singleInstance"
            android:theme="@style/RecThemeLight.NoActionBar">
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

--- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
@ -27,6 +27,7 @@ import android.widget.Toast;

 import com.github.axet.androidlibrary.services.StorageProvider;
 import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat;
+import com.github.axet.androidlibrary.widgets.SearchView;
 import com.github.axet.audiolibrary.app.Recordings;
 import com.github.axet.audiolibrary.app.Storage;
 import com.github.axet.audiorecorder.R;
@ -136,6 +137,29 @@ public class MainActivity extends AppCompatActivity {
            item.setVisible(false);
        }

+        MenuItem search = menu.findItem(R.id.action_search);
+        final SearchView searchView = (SearchView) search.getActionView();
+        searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                recordings.search(query);
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                return false;
+            }
+        });
+        searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+            @Override
+            public boolean onClose() {
+                recordings.searchClose();
+                return true;
+            }
+        });
+
        return true;
    }

--- a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java
@ -14,7 +14,7 @@ import com.github.axet.audiorecorder.R;
 import com.github.axet.audiorecorder.activities.RecordingActivity;
 import com.github.axet.audiorecorder.app.MainApplication;

-// default bluetooth stack for API25, bugged and has to be cleared.
+// default bluetooth stack for API25 bugged and has to be cleared using this Receiver.
 public class BluetoothReceiver extends BroadcastReceiver {

    public static int CONNECT_DELAY = 3000; // give os time ot initialize device, or startBluetoothSco will be ignored
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@ -2,6 +2,12 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    tools:context=".activities.MainActivity">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:title="@string/menu_search"
+        app:actionViewClass="com.github.axet.androidlibrary.widgets.SearchView"
+        app:showAsAction="collapseActionView|ifRoom" />
    <item
        android:id="@+id/action_settings"
        android:orderInCategory="100"
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_recordings">Записи</string>
    <string name="pref_fly_title">Кодирование на лету</string>
    <string name="pref_fly_summary">Кодирование на лету отключает редактирование и восстановление в случае ошибок</string>
+    <string name="menu_search">Поиск</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -64,4 +64,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -101,4 +101,5 @@
    <string name="pref_fly_title">Encoding on Fly</string>
    <string name="pref_fly_summary">Enabling encoding on fly disables editing, and crash recovery</string>
    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>