From 019b7c25d39d96e0d2c08785e6e8ef4f6fc3630e Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 11 Feb 2017 18:32:39 +0300 Subject: [PATCH] fix silence --- app/build.gradle | 2 +- .../activities/MainActivity.java | 9 +++-- .../activities/RecordingActivity.java | 4 +- .../audiorecorder/app/MainApplication.java | 39 +------------------ .../github/axet/audiorecorder/app/Sound.java | 31 ++------------- app/src/main/res/values-ru/strings.xml | 32 --------------- app/src/main/res/values/strings.xml | 27 +------------ 7 files changed, 15 insertions(+), 129 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bdcbf2d..c6ce860 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,5 +43,5 @@ dependencies { compile 'com.android.support:design:25.1.1' compile 'com.google.android.gms:play-services-appindexing:9.8.0' compile 'org.apache.commons:commons-math3:3.6.1' - compile 'com.github.axet:android-library:1.7.4' // compile project(':android-library') + compile 'com.github.axet:android-library:1.8.2' // compile project(':android-library') } diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java index 7e9648e..2b798a6 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java @@ -39,6 +39,7 @@ import android.widget.TextView; import android.widget.Toast; import com.github.axet.androidlibrary.animations.RemoveItemAnimation; +import com.github.axet.androidlibrary.app.LibraryApplication; import com.github.axet.androidlibrary.widgets.OpenFileDialog; import com.github.axet.androidlibrary.widgets.PopupShareActionProvider; import com.github.axet.audiorecorder.R; @@ -177,10 +178,10 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr time.setText(s.format(new Date(f.lastModified()))); TextView dur = (TextView) convertView.findViewById(R.id.recording_duration); - dur.setText(MainApplication.formatDuration(getContext(), durations.get(f))); + dur.setText(LibraryApplication.formatDuration(getContext(), durations.get(f))); TextView size = (TextView) convertView.findViewById(R.id.recording_size); - size.setText(MainApplication.formatSize(getContext(), f.length())); + size.setText(LibraryApplication.formatSize(getContext(), f.length())); final View playerBase = convertView.findViewById(R.id.recording_player); playerBase.setOnClickListener(new View.OnClickListener() { @@ -443,11 +444,11 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr } }); - start.setText(MainApplication.formatDuration(getContext(), c)); + start.setText(LibraryApplication.formatDuration(getContext(), c)); bar.setMax(d); bar.setKeyProgressIncrement(1); bar.setProgress(c); - end.setText("-" + MainApplication.formatDuration(getContext(), d - c)); + end.setText("-" + LibraryApplication.formatDuration(getContext(), d - c)); return playing; } 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 b68eeef..d5b98b0 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 @@ -36,6 +36,7 @@ import android.widget.TextView; import android.widget.Toast; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; +import com.github.axet.androidlibrary.app.LibraryApplication; import com.github.axet.audiorecorder.R; import com.github.axet.audiorecorder.app.MainApplication; import com.github.axet.audiorecorder.app.RawSamples; @@ -713,8 +714,7 @@ public class RecordingActivity extends AppCompatActivity { void updateSamples(long samplesTime) { long ms = samplesTime / sampleRate * 1000; - - time.setText(MainApplication.formatDuration(this, ms)); + time.setText(LibraryApplication.formatDuration(this, ms)); } @Override diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java index 97fce23..0a04cad 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java @@ -6,6 +6,7 @@ import android.content.SharedPreferences; import android.media.AudioFormat; import android.preference.PreferenceManager; +import com.github.axet.androidlibrary.app.LibraryApplication; import com.github.axet.androidlibrary.widgets.ThemeUtils; import com.github.axet.audiorecorder.R; @@ -49,10 +50,6 @@ public class MainApplication extends Application { return getTheme(this, R.style.AppThemeLight, R.style.AppThemeDark); } - static public String formatTime(int tt) { - return String.format("%02d", tt); - } - public String formatFree(long free, long left) { String str = ""; @@ -73,39 +70,7 @@ public class MainApplication extends Application { str = getResources().getQuantityString(R.plurals.seconds, diffSeconds, diffSeconds); } - return getString(R.string.title_header, MainApplication.formatSize(this, free), str); - } - - public static String formatSize(Context context, long s) { - if (s > 0.1 * 1024 * 1024 * 1024) { - float f = s / 1024f / 1024f / 1024f; - return context.getString(R.string.size_gb, f); - } else if (s > 0.1 * 1024 * 1024) { - float f = s / 1024f / 1024f; - return context.getString(R.string.size_mb, f); - } else { - float f = s / 1024f; - return context.getString(R.string.size_kb, f); - } - } - - static public String formatDuration(Context context, long diff) { - int diffMilliseconds = (int) (diff % 1000); - int diffSeconds = (int) (diff / 1000 % 60); - int diffMinutes = (int) (diff / (60 * 1000) % 60); - int diffHours = (int) (diff / (60 * 60 * 1000) % 24); - int diffDays = (int) (diff / (24 * 60 * 60 * 1000)); - - String str = ""; - - if (diffDays > 0) - str = diffDays + context.getString(R.string.days_symbol) + " " + formatTime(diffHours) + ":" + formatTime(diffMinutes) + ":" + formatTime(diffSeconds); - else if (diffHours > 0) - str = formatTime(diffHours) + ":" + formatTime(diffMinutes) + ":" + formatTime(diffSeconds); - else - str = formatTime(diffMinutes) + ":" + formatTime(diffSeconds); - - return str; + return getString(R.string.title_header, LibraryApplication.formatSize(this, free), str); } public static int getChannels(Context context) { diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java b/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java index a709a95..e1f62d6 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/Sound.java @@ -7,47 +7,24 @@ import android.media.AudioManager; import android.media.AudioTrack; import android.preference.PreferenceManager; -public class Sound { - Context context; - - int soundMode; +public class Sound extends com.github.axet.androidlibrary.app.Sound { public Sound(Context context) { - this.context = context; + super(context); } public void silent() { SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); if (shared.getBoolean(MainApplication.PREFERENCE_SILENT, false)) { - AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); - soundMode = am.getRingerMode(); - - if (soundMode == AudioManager.RINGER_MODE_SILENT) { - // we already in SILENT mode. keep all unchanged. - soundMode = -1; - return; - } - - am.setStreamVolume(AudioManager.STREAM_RING, am.getStreamVolume(AudioManager.STREAM_RING), AudioManager.FLAG_SHOW_UI); - am.setRingerMode(AudioManager.RINGER_MODE_SILENT); + super.silent(); } } public void unsilent() { - // keep unchanged - if (soundMode == -1) - return; - SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); if (shared.getBoolean(MainApplication.PREFERENCE_SILENT, false)) { - AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); - int soundMode = am.getRingerMode(); - if (soundMode == AudioManager.RINGER_MODE_SILENT) { - am.setRingerMode(this.soundMode); - am.setStreamVolume(AudioManager.STREAM_RING, am.getStreamVolume(AudioManager.STREAM_RING), AudioManager.FLAG_SHOW_UI); - } + super.unsilent(); } - soundMode = -1; } public AudioTrack generateTrack(int sampleRate, short[] buf, int len) { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7b85bf3..7887f7d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -47,41 +47,9 @@ Кодирование... Запись дБ - д %1$s свободно ~ %2$s - %1$.1f ГБ - %1$.1f МБ - %1$.1f кб Переименовать Удалить Открыть папку с записями Список записей пуст.\n\nНажмите на \'Микрофон\' чтобы начать запись. - - - %d день - %d дня - %d дней - %d дней - - - - %d час - %d часа - %d часов - %d часов - - - - %d минута - %d минуты - %d минут - %d минут - - - - %d секунда - %d секунды - %d секунд - %d секунд - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 16ca354..258dbd4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,35 +71,10 @@ recording Encoding... Recording - dB - "d" %1$s free ~ %2$s left - %1$.1f GB - %1$.1f MB - %1$.1f kb + dB Rename Delete Open Recording Folder Recording List is Empty\n\nClick Record to Start Recording - - - %d day - %d days - - - - %d hour - %d hours - - - - %d minute - %d minutes - - - - %d second - %d seconds - -