From 0cb3283e54ff10cb54002c314864a60404ae8fca Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 24 Feb 2017 14:28:22 +0300 Subject: [PATCH] fix sort --- .../com/github/axet/audiolibrary/app/Recordings.java | 8 ++++++-- .../java/com/github/axet/audiolibrary/app/Storage.java | 4 ++-- .../src/main/res/drawable-xxxhdpi/ic_pause_24dp.xml | 9 --------- .../src/main/res/layout/notifictaion_recording.xml | 4 ++-- .../axet/audiorecorder/activities/RecordingActivity.java | 4 ++-- .../axet/audiorecorder/services/RecordingService.java | 2 +- app/src/main/res/layout/activity_recording.xml | 2 +- 7 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 android-audio-library/src/main/res/drawable-xxxhdpi/ic_pause_24dp.xml diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Recordings.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Recordings.java index c2dd900..5300cf7 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Recordings.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Recordings.java @@ -112,10 +112,14 @@ public class Recordings extends ArrayAdapter implements AbsListView.OnScro } } - sort(new SortFiles()); + sort(); notifyDataSetChanged(); } + public void sort() { + sort(new SortFiles()); + } + public void close() { if (player != null) { player.release(); @@ -387,7 +391,7 @@ public class Recordings extends ArrayAdapter implements AbsListView.OnScro final boolean playing = player != null && player.isPlaying(); - i.setImageResource(playing ? R.drawable.ic_pause_24dp : R.drawable.ic_play_arrow_black_24dp); + i.setImageResource(playing ? R.drawable.ic_pause_black_24dp : R.drawable.ic_play_arrow_black_24dp); TextView start = (TextView) v.findViewById(R.id.recording_player_start); SeekBar bar = (SeekBar) v.findViewById(R.id.recording_player_seek); diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Storage.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Storage.java index 0319f30..37c0379 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Storage.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Storage.java @@ -26,7 +26,7 @@ public class Storage { public static final String TMP_REC = "recorind.data"; public static final String RECORDINGS = "recordings"; - Context context; + protected Context context; public Storage(Context context) { this.context = context; @@ -144,7 +144,7 @@ public class Storage { return getNextFile(parent, fileName, extension); } - File getNextFile(File parent, String name, String ext) { + protected File getNextFile(File parent, String name, String ext) { String fileName; if (ext.isEmpty()) fileName = name; diff --git a/android-audio-library/src/main/res/drawable-xxxhdpi/ic_pause_24dp.xml b/android-audio-library/src/main/res/drawable-xxxhdpi/ic_pause_24dp.xml deleted file mode 100644 index 09beb87..0000000 --- a/android-audio-library/src/main/res/drawable-xxxhdpi/ic_pause_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android-audio-library/src/main/res/layout/notifictaion_recording.xml b/android-audio-library/src/main/res/layout/notifictaion_recording.xml index 02e7083..3faf37f 100644 --- a/android-audio-library/src/main/res/layout/notifictaion_recording.xml +++ b/android-audio-library/src/main/res/layout/notifictaion_recording.xml @@ -32,14 +32,14 @@ android:id="@+id/notification_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Audio Recorder" + android:text="@string/app_name" android:textColor="?android:attr/colorForeground" /> diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index ae40150..a18b3e1 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -439,7 +439,7 @@ public class RecordingActivity extends AppCompatActivity { final ImageView playButton = (ImageView) box.findViewById(R.id.recording_play); if (show) { - playButton.setImageResource(R.drawable.ic_pause_24dp); + playButton.setImageResource(R.drawable.ic_pause_black_24dp); playIndex = editSample; @@ -563,7 +563,7 @@ public class RecordingActivity extends AppCompatActivity { sound.silent(); - pause.setImageResource(R.drawable.ic_pause_24dp); + pause.setImageResource(R.drawable.ic_pause_black_24dp); pitch.record(); diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index 9e6b351..eccdf03 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -141,7 +141,7 @@ public class RecordingService extends Service { view.setOnClickPendingIntent(R.id.status_bar_latest_event_content, main); view.setTextViewText(R.id.notification_text, ".../" + targetFile); view.setOnClickPendingIntent(R.id.notification_pause, pe); - view.setImageViewResource(R.id.notification_pause, !recording ? R.drawable.ic_play_arrow_black_24dp : R.drawable.ic_pause_24dp); + view.setImageViewResource(R.id.notification_pause, !recording ? R.drawable.ic_play_arrow_black_24dp : R.drawable.ic_pause_black_24dp); NotificationCompat.Builder builder = new NotificationCompat.Builder(this) .setOngoing(true) diff --git a/app/src/main/res/layout/activity_recording.xml b/app/src/main/res/layout/activity_recording.xml index b2812c4..5ea4b9a 100644 --- a/app/src/main/res/layout/activity_recording.xml +++ b/app/src/main/res/layout/activity_recording.xml @@ -110,7 +110,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:background="?attr/roundButton" - android:src="@drawable/ic_pause_24dp" /> + android:src="@drawable/ic_pause_black_24dp" />