From f69d8cc579c4b07bbf7dbfd7303c6684d432fcfd Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 24 Feb 2017 15:19:56 +0300 Subject: [PATCH] cleanups --- .../audiolibrary/app/MainApplication.java | 1 - .../axet/audiolibrary/app/RawSamples.java | 20 +++--------------- .../github/axet/audiolibrary/app/Sound.java | 9 +++++--- .../axet/audiolibrary/encoders/Factory.java | 3 ++- .../audiolibrary/widgets/FFTChartView.java | 3 ++- .../axet/audiolibrary/widgets/PitchView.java | 11 +++++----- .../ic_create_black_24dp.xml | 0 .../ic_mic_24dp.xml | 0 .../round_button_dark.xml | 0 .../round_button_light.xml | 0 .../activities/RecordingActivity.java | 9 ++++---- app/src/main/res/drawable-hdpi/ic_done.png | Bin 376 -> 0 bytes .../res/drawable-hdpi/ic_info_black_24dp.png | Bin 321 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 233 -> 0 bytes .../res/drawable-hdpi/ic_sync_black_24dp.png | Bin 368 -> 0 bytes app/src/main/res/drawable-mdpi/ic_done.png | Bin 296 -> 0 bytes .../res/drawable-mdpi/ic_info_black_24dp.png | Bin 222 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 182 -> 0 bytes .../res/drawable-mdpi/ic_sync_black_24dp.png | Bin 250 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_done.png | Bin 415 -> 0 bytes .../res/drawable-xhdpi/ic_info_black_24dp.png | Bin 412 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 278 -> 0 bytes .../res/drawable-xhdpi/ic_sync_black_24dp.png | Bin 467 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_done.png | Bin 686 -> 0 bytes .../drawable-xxhdpi/ic_info_black_24dp.png | Bin 579 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 383 -> 0 bytes .../drawable-xxhdpi/ic_sync_black_24dp.png | Bin 669 -> 0 bytes .../drawable-xxxhdpi/ic_info_black_24dp.png | Bin 766 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 497 -> 0 bytes .../drawable-xxxhdpi/ic_sync_black_24dp.png | Bin 875 -> 0 bytes .../main/res/drawable/ic_done_black_24dp.xml | 9 ++++++++ .../ic_info_black_24dp.xml | 0 .../ic_notifications_black_24dp.xml | 0 .../ic_sync_black_24dp.xml | 0 .../main/res/layout/activity_recording.xml | 3 ++- 35 files changed, 34 insertions(+), 34 deletions(-) rename android-audio-library/src/main/res/{drawable-xxxhdpi => drawable}/ic_create_black_24dp.xml (100%) rename android-audio-library/src/main/res/{drawable-xxxhdpi => drawable}/ic_mic_24dp.xml (100%) rename android-audio-library/src/main/res/{drawable-xxxhdpi => drawable}/round_button_dark.xml (100%) rename android-audio-library/src/main/res/{drawable-xxxhdpi => drawable}/round_button_light.xml (100%) delete mode 100644 app/src/main/res/drawable-hdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_done.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png create mode 100644 app/src/main/res/drawable/ic_done_black_24dp.xml rename app/src/main/res/{drawable-v21 => drawable}/ic_info_black_24dp.xml (100%) rename app/src/main/res/{drawable-v21 => drawable}/ic_notifications_black_24dp.xml (100%) rename app/src/main/res/{drawable-v21 => drawable}/ic_sync_black_24dp.xml (100%) diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/MainApplication.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/MainApplication.java index b5494f8..9884783 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/MainApplication.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/MainApplication.java @@ -19,7 +19,6 @@ public class MainApplication extends Application { public static final String PREFERENCE_THEME = "theme"; public static final String PREFERENCE_CHANNELS = "channels"; - @Override public void onCreate() { super.onCreate(); diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/RawSamples.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/RawSamples.java index bd565da..e5ae92d 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/RawSamples.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/RawSamples.java @@ -1,13 +1,6 @@ package com.github.axet.audiolibrary.app; import android.media.AudioFormat; -import android.util.Log; - -import org.apache.commons.math3.complex.Complex; -import org.apache.commons.math3.transform.DftNormalization; -import org.apache.commons.math3.transform.FastFourierTransformer; -import org.apache.commons.math3.transform.TransformType; -import org.apache.commons.math3.util.MathArrays; import java.io.BufferedOutputStream; import java.io.File; @@ -21,13 +14,6 @@ import java.nio.ByteOrder; import java.nio.channels.FileChannel; public class RawSamples { - public static int AUDIO_FORMAT = AudioFormat.ENCODING_PCM_16BIT; - - // quite root gives me 20db - public static int NOISE_DB = 20; - // max 90 dB detection for android mic - public static int MAXIMUM_DB = 90; - File in; InputStream is; @@ -69,7 +55,7 @@ public class RawSamples { try { readBuffer = new byte[(int) getBufferLen(bufReadSize)]; is = new FileInputStream(in); - is.skip(offset * (AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1)); + is.skip(offset * (Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1)); } catch (IOException e) { throw new RuntimeException(e); } @@ -109,11 +95,11 @@ public class RawSamples { } public static long getSamples(long len) { - return len / (AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1); + return len / (Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1); } public static long getBufferLen(long samples) { - return samples * (AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1); + return samples * (Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1); } public void trunk(long pos) { diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Sound.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Sound.java index c8934c9..543b3e5 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Sound.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/app/Sound.java @@ -8,6 +8,11 @@ import android.media.AudioTrack; import android.preference.PreferenceManager; public class Sound extends com.github.axet.androidlibrary.sound.Sound { + public static int AUDIO_FORMAT = AudioFormat.ENCODING_PCM_16BIT; + // quite root gives me 20db + public static int NOISE_DB = 20; + // max 90 dB detection for android mic + public static int MAXIMUM_DB = 90; public Sound(Context context) { super(context); @@ -47,9 +52,7 @@ public class Sound extends com.github.axet.androidlibrary.sound.Sound { // http://stackoverflow.com/questions/27602492 // // with MODE_STATIC setNotificationMarkerPosition not called - AudioTrack track = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, - c, RawSamples.AUDIO_FORMAT, - len * (Short.SIZE / 8), AudioTrack.MODE_STREAM); + AudioTrack track = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, c, AUDIO_FORMAT, len * (Short.SIZE / 8), AudioTrack.MODE_STREAM); track.write(buf, 0, len); if (track.setNotificationMarkerPosition(end) != AudioTrack.SUCCESS) throw new RuntimeException("unable to set marker"); diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/encoders/Factory.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/encoders/Factory.java index bcaa45f..7f281b7 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/encoders/Factory.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/encoders/Factory.java @@ -6,6 +6,7 @@ import android.os.Build; import com.github.axet.audiolibrary.R; import com.github.axet.audiolibrary.app.RawSamples; +import com.github.axet.audiolibrary.app.Sound; import java.io.File; import java.util.ArrayList; @@ -89,7 +90,7 @@ public class Factory { } // default raw - int c = RawSamples.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1; + int c = Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1; return c * rate; } } diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/FFTChartView.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/FFTChartView.java index 86d60e7..fa98488 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/FFTChartView.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/FFTChartView.java @@ -6,6 +6,7 @@ import android.graphics.Color; import android.util.AttributeSet; import com.github.axet.audiolibrary.app.RawSamples; +import com.github.axet.audiolibrary.app.Sound; public class FFTChartView extends FFTView { public static final String TAG = FFTChartView.class.getSimpleName(); @@ -66,7 +67,7 @@ public class FFTChartView extends FFTView { min = Math.min(v, min); max = Math.max(v, max); - v = (RawSamples.MAXIMUM_DB + v) / RawSamples.MAXIMUM_DB; + v = (Sound.MAXIMUM_DB + v) / Sound.MAXIMUM_DB; float endX = startX; float endY = (float) (h - h * v); diff --git a/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/PitchView.java b/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/PitchView.java index f0e04d7..680f4f5 100644 --- a/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/PitchView.java +++ b/android-audio-library/src/main/java/com/github/axet/audiolibrary/widgets/PitchView.java @@ -13,6 +13,7 @@ import android.view.ViewGroup; import com.github.axet.androidlibrary.widgets.ThemeUtils; import com.github.axet.audiolibrary.R; import com.github.axet.audiolibrary.app.RawSamples; +import com.github.axet.audiolibrary.app.Sound; import java.util.LinkedList; import java.util.List; @@ -338,7 +339,7 @@ public class PitchView extends ViewGroup { } void update(int end) { - dB = getDB(end) / RawSamples.MAXIMUM_DB; + dB = getDB(end) / Sound.MAXIMUM_DB; String str = ""; @@ -420,7 +421,7 @@ public class PitchView extends ViewGroup { if (isInEditMode()) { for (int i = 0; i < 3000; i++) { - data.add(-Math.sin(i) * RawSamples.MAXIMUM_DB); + data.add(-Math.sin(i) * Sound.MAXIMUM_DB); } } @@ -495,7 +496,7 @@ public class PitchView extends ViewGroup { public double getDB(int i) { double db = data.get(i); - db = RawSamples.MAXIMUM_DB + db; + db = Sound.MAXIMUM_DB + db; return db; } @@ -504,12 +505,12 @@ public class PitchView extends ViewGroup { double db = getDB(i); // do not show below NOISE_DB - db = db - RawSamples.NOISE_DB; + db = db - Sound.NOISE_DB; if (db < 0) db = 0; - int rest = RawSamples.MAXIMUM_DB - RawSamples.NOISE_DB; + int rest = Sound.MAXIMUM_DB - Sound.NOISE_DB; db = db / rest; diff --git a/android-audio-library/src/main/res/drawable-xxxhdpi/ic_create_black_24dp.xml b/android-audio-library/src/main/res/drawable/ic_create_black_24dp.xml similarity index 100% rename from android-audio-library/src/main/res/drawable-xxxhdpi/ic_create_black_24dp.xml rename to android-audio-library/src/main/res/drawable/ic_create_black_24dp.xml diff --git a/android-audio-library/src/main/res/drawable-xxxhdpi/ic_mic_24dp.xml b/android-audio-library/src/main/res/drawable/ic_mic_24dp.xml similarity index 100% rename from android-audio-library/src/main/res/drawable-xxxhdpi/ic_mic_24dp.xml rename to android-audio-library/src/main/res/drawable/ic_mic_24dp.xml diff --git a/android-audio-library/src/main/res/drawable-xxxhdpi/round_button_dark.xml b/android-audio-library/src/main/res/drawable/round_button_dark.xml similarity index 100% rename from android-audio-library/src/main/res/drawable-xxxhdpi/round_button_dark.xml rename to android-audio-library/src/main/res/drawable/round_button_dark.xml diff --git a/android-audio-library/src/main/res/drawable-xxxhdpi/round_button_light.xml b/android-audio-library/src/main/res/drawable/round_button_light.xml similarity index 100% rename from android-audio-library/src/main/res/drawable-xxxhdpi/round_button_light.xml rename to android-audio-library/src/main/res/drawable/round_button_light.xml 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 a18b3e1..830d779 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 @@ -426,7 +426,7 @@ public class RecordingActivity extends AppCompatActivity { int rate = Integer.parseInt(shared.getString(MainApplication.PREFERENCE_RATE, "")); int m = MainApplication.getChannels(this); - int c = RawSamples.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1; + int c = Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 2 : 1; long perSec = (c * m * rate); long sec = free / perSec * 1000; @@ -588,12 +588,12 @@ public class RecordingActivity extends AppCompatActivity { rs.open(samplesTime); - int min = AudioRecord.getMinBufferSize(sampleRate, MainApplication.getMode(RecordingActivity.this), RawSamples.AUDIO_FORMAT); + int min = AudioRecord.getMinBufferSize(sampleRate, MainApplication.getMode(RecordingActivity.this), Sound.AUDIO_FORMAT); if (min <= 0) { throw new RuntimeException("Unable to initialize AudioRecord: Bad audio values"); } - recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, MainApplication.getMode(RecordingActivity.this), RawSamples.AUDIO_FORMAT, min * 2); + recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, MainApplication.getMode(RecordingActivity.this), Sound.AUDIO_FORMAT, min * 2); if (recorder.getState() != AudioRecord.STATE_INITIALIZED) { throw new RuntimeException("Unable to initialize AudioRecord"); } @@ -723,7 +723,6 @@ public class RecordingActivity extends AppCompatActivity { @Override public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); - switch (requestCode) { case 1: if (permitted(permissions)) { @@ -764,7 +763,7 @@ public class RecordingActivity extends AppCompatActivity { EncoderInfo getInfo() { final int channels = MainApplication.getChannels(this); - final int bps = RawSamples.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 16 : 8; + final int bps = Sound.AUDIO_FORMAT == AudioFormat.ENCODING_PCM_16BIT ? 16 : 8; return new EncoderInfo(channels, sampleRate, bps); } diff --git a/app/src/main/res/drawable-hdpi/ic_done.png b/app/src/main/res/drawable-hdpi/ic_done.png deleted file mode 100644 index 2254355ffbb5312278aec984b6fb881ca0c8ad72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)zzXu*k{zB5q+mpxOJ0Y+91Ib@* zQvL{x!9fUP?SgxfZ){S&2tNFY-qtB$UEZIx0)CAN-$5>*{D9<}who+E;wNZ{NaYQQ zlOQGVO%n7;{wk`g?{qLt^A)$T6DHkQ%Nr$1U`p~m5%N^x)0e*%B~K+Bk@6aiMx)Va{&VIt WP2CU{uahH-qjnO!mZF74z`KYHotZQj~G9OBG_t^ED_kIXRP z8;w~~Qsa5P=BYWdU__EBJMKte9gdtxYdq4khJueW&Pc>cvi{6361huX>Wn1p1Yv6= zaRmWW!dHC7;kXjM_MA66Bsd3vLxS6)G3IUxb&OD!2oiZTy*WyW7pRP32C|k0wldT1B8Lp22U5qkP61PXEvTZ6d>a8@UZ?1 zA+c-66fgaBRuc>lIKkqWwEBhLN~4B^=^YF1?lx0w{jkHlvNhq4U%kY(4%UYj${gxU zt{#`?C=^ypw+}YdKA#S3~g6)IW)n6udaq z+)GOiED3ODRoiN{EBVotiHBXj>?{2uy>wZi)V_=1zmDyj)K|Gw_IHc)r4T`te0NDl hwI^3XQhFp;iAM+Z&9%(1ZU(xY!PC{xWt~$(698`;Th;&o diff --git a/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png deleted file mode 100644 index a5ebdbd072989517b8c6230f65f7064d7c2ac017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmV-$0gwKPP)Bnh6NK+0$5`HOv#KS=tYj%F$hmx(`HEa6MGCz zVd+xXR3C*q>XmoYu)EvRqLNoKN9vrWebtl-5=snnb1q-WxnL6Px!}^N1m!(NUU2JwCcw_A z1jhWJ%Wtlr==PyfORPZjMcz^5rC*)wIM`COwn|Xm=GYCCe|^1TFD2}4zk`a@9k)ts uD7NKQ>6gu52}@q{>TNf~wp~X@M=DR-%z#nHR7;Zp0000hoS^g9uF~&xlN*)H`W{wZ;U+{TXN|u|AX!W%Mvu1 zCO7Tl*uo`~E>@u<#XBj|^}>ul|6C>19PJEUR$ER;nAhbpt#9Vs*Ef&3bU%Gs$9S4s WW8+=f3r;`>GkCiCxvXjCCUMHOLgs0@uOIM+hc=c_OeCtYY$lmfH>|_qY(a5Lp zBC`?BMt+0`nYqvz>4i$B5_%&SVO?^iM%c@|3GYT~gU&Mf*o80860LBx0>q!>QEKKS zbPhJ=;$MP1X$|6brX|#l&bsLVpmeTu&enbW0-8ozYX{n?_5c6?07*qoM6N<$f=D}Y AIRF3v diff --git a/app/src/main/res/drawable-xhdpi/ic_done.png b/app/src/main/res/drawable-xhdpi/ic_done.png deleted file mode 100644 index a068d7a1f57518ad5ced1b069e17216788931306..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)2zg^j)BB|?fz6Vmt?_BJ945!6D&6wwfT10m`2PUkGFaD-XU zViWgf{tx~}#GUU)&K;u&0000000000C_P!0RW!>dlno`-D*sOTu}L+{AJWk*-=|zk zmyaoLjQjxdke4gppsX1Ap%(cCBR>*<0fM|@`5I-;$WJI&n&qpI7c5_;%ozFU+2rZq z3(D<3$xj%0^KGb|Q@%&pQSP+LABOpp5`vVsgWWSjnG#wa&!|ww%sJ+_zaGLvsml!a z<)Z{EKXS-7LV7a4_%5L|^0|SZeU)G~H;4Q(NO_+nSos0-IcCR?%WzR~mCzP1Ur@sL zu@c0{=Y*b4Ey2q7nfIH2bg#>NZ%>O#D3DJiEHBOy#LJ&h!YlLoT9kZ23BU6}X-eMZ zAJxj|N_b%8w<_cvB^ddeNE^0k7>D5($61se024W16Y9PdLry5vdn5qWG7(8}rf#0;i^i3`Bz)3@LmB1SV3Ir;F zXA1R55y$7>4m@$40i?z@(7tAuhqf9h{9DK(kS9VPYq@pj?P({$*j*$70e+edaK1ul_2NP&A~Pg39!*_#v? zkeRk$7|4Mf$N?t@T-x(e!eI;N(w!F)7P$0*|EtF)>xk}V7O04Biy9mEOaUnp*K{AN cD9HYhcl4RW{G`P`$^ZZW07*qoM6N<$f+&V{8UO$Q diff --git a/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png deleted file mode 100644 index 860a5db38b393009a7407ced8d9fec8da0b460e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP)Y8m235b4thfjq5s2xGL-&my=8Y}rO#iqNL_sAt7# zbGQi8aPN&dD}Q(UKmQ-YoO`)AM%MLWT`$)4VqGuR^3-I(3JalY4Vwc%W0i@p9B?ix{5h)DbUhjrRWQ zC$I66YjjKu6StQJ zPo5IU6w&jpC@59DAecvdaf&5rK~PjglW}m0Jwp-{q$)-COd;&Jrcaw1Qk^1WgA`Ad ziaHZcwhG9|xiJ$cDFbG#IB*wVAB%B4*7aD|V_lDRJ&d?8{sN$?X^Ds6w;2Ec002ov JPDHLkV1g1j%<2FD diff --git a/app/src/main/res/drawable-xxhdpi/ic_done.png b/app/src/main/res/drawable-xxhdpi/ic_done.png deleted file mode 100644 index a375a37685f32ef6d96fe9aef6431fc367148599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 686 zcmV;f0#W^mP)meOP)nne^hx)R-pNGQR*anUSni_t(VY7h$z z?nJcJ{}j)_j10kJ;@SA?8?6)8AyKn`Na_I%HIvi58~~Fn;0@*JA;475AscN7E^X= zXEfg>3z#w^|58Nl1oWlXt|@15_jV9JdA)5xFh z+Ce_GlRx<3# z`KUZ>&DO*ED_@ge&xQPvA$-t=U`hUFq2!O8t-NUAf+aLddsWNAej*C2i$84+|xK!a7P^3;xP)v-1CcC)_t!J2R!CllBm(o#elm zJK7L5Y4ZAE$t&e^9w9&aRI-zFC;0MTD(`Qco8JjhdFK5q6pQH$;Y|YhW$dLl1n)F+V@&zaS@~v$;2kf# zR^&I3Z+-|-JE18#ge5n1^n%WJS4U0cyBoqiY6k!S00000000000000003hr90S(CY UZE8>v#sB~S07*qoM6N<$f}q?&KmY&$ diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png deleted file mode 100644 index a81eeb9ee7ef8ab1662b5b6bc88cf74912e4cb5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)YDX|Txx7F9T)MSz5C z%me$p#<(@Ec}8Mx!WA`)S?3W+u@6bG_Q+CN{iWZ6iFpgn8im7?Un+GeL)QF6AA4ghWDNXmU%KBG@?RmKM)K1 zMojBSqWw=2twt=5)`ISdVGXesBvgrXZ8hkU2o;{K22Jn?b%0n667~qyLM-o&5Jdv( zL4TP?X$x_%4U`&Af{svXIte;OspBN5jZz=6{@DvXl!i`%1}Ftig2q!9G`&wY{XgoC zlb|+AO(#JoC^eh}9ip`9BT! zt3hvwp=B+|Cze%9K`*Qj(>Y>cXT-L|$au~Wj|A$*gSJWNv(cQ7Bv#Y(JK#w*j9P*Yqa=F};`Uf%+Z6V(b RSUCUy002ovPDHLkV1jt6`k4R# diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index ab8a9c464c6c30f54a49d18e1d48b3b8637a9295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7FAP)z9Eb5|s``^)CE_}yje)z64pu{@M5;_j>;{9|U?dVTN(BQGf?Y^x(n#9o)!|G% zjU4BEPu~u|&vOG0CJAFqk!rUBLt&b8T-X^?co*)3o#I&$*V6)CRU<=Ncojs30vigA zQsRV0WT?S0E94odF?RXD{n0zygPU6B6&Ist78!sYI=Gm%sgSV)+&|kVLp5B2*2%~c zokT+|3ZOU68!lmw`W^j}en-C~ z-w`ZncLYl=0<4vB2$j%)(JeuRaXJ-b_M%dt*X16+J datt|R%rC40J4*F-*<%0z002ovPDHLkV1n31phf@y diff --git a/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png deleted file mode 100644 index f7990080d1d7d7e30b1844c18be8928128af147c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)Ri)#A+rN#ZV}M#KrnQ=uoUdx&}e)B(84V)X*Zhb`j|=Sg}(VanQLY z)jde5NeBw@b}N@>BJX?O$-+X_Zyy1Q~JX9W8v!)}~bi|sDSkn<}I$}*ntm%j~ z9kHe(+;B;meM-zT*nOQ~j#(ySLPw>+CRr0gDs@&#*-{ct8MUTVV>WrE=cE~@z!sG@ zN-c^>D`}?Kp%s)$S}DjF2Y0^GOt&A`B27f)iji)gA9<>X$_XjF_`tB|ftCv>t>D2c zYFva=>dYif^r{>pGMfkzQt3Vx5tVf!(nkXct#m(!=r=AyBtEK=GClZ^L+_;}B5|xL zzT(TSYC9qVSwtm|FVm{+mI0huPzAs6=LzSkaSmrbtML+Xu&o+5aOQ^^e@7hXZ@z~! zzt#9_;$T8Gp5aVQjlU!g`c-2UXKvN_Q{tdkHD2S)4f-04gC6v4WI#|=enhvb-FnQ!32goiP%3qR|00000NkvXXu0mjf DBY7@j diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png deleted file mode 100644 index c8f86b925366485cef1f43c089f785ab8415068d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmVDuaOF?qdkw!ZaV?`>xjy6gVLBv5If;S){v5mCXA=Y@H1rfw?2k|s36`TsO zNHkbQ$!A*+5eLd!$4>T2_S$>D#r=D(;16rBEP_R$P$(1%^^m2=ItNs!^UUj8&(x`~ z&l*LtbfZ#|309~g2Axu3oCHcl$g<57(qs*`7$HKSIw(*>Ty)MH?F1shPyB;e=#~ZI z_$<#QVzCQy_@bx0J~enA3k6_=)wfSbaFejbp3yC+S{ z_7DY?X;B_gQjQiRTt1lJbNASe)3hHEH3Nk2X;KG&s~Yf`BuyzGss;$NVD1ZQ>IR$< z!B`eiH$cc>Y+L1kO$;S@QaRv}I7TKArHx@^1yR}(MyiO?PB74eD6Y%=3f0*#j*5ul z=5e%+D6WK~14MDVII194dQYr$jH9~h0XH~$Rz0ABqgT}fUjFw3KEM%D{t z0UH<_Q90l{j72zCH=xQV%rU2Kzzj`k=T_B#ItiMzplU#Yrp38XGoVI{7UU2mP12$= zqM+YsSs!;u!2L@vF65Db%i+>05@0{$T9iX1pnj(f3sO{(06L`;O9r??eD0Do77h74 z;V-_%vH{L~JUnSU(9NMwpKd1}iL!=x+!AegYKnUge|2;CAWhk$H%~9V$#H>L?3_t_ z7Uu^(BNnPtAVwgP%(}c>tIUufP!Te0^4P-PR2zKDCzOaY#u9%b231&Olo%?d7-pUl wyBu>vgO|4&+;Gee%M{4ag*Bm2C=?3)2UQ-CT`xs~ZvX%Q07*qoM6N<$g2UHD;{X5v diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index 86f89d75000ada881e4c14891ceec47c27c7fb0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmVtWS;T; zaYBz`tPu^nL@|bq0naE#)fn)NVnp*CkjTQsfCVzQ#5%jgl8xP!>8N(0U!w=NC1j@$!jz5g diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png deleted file mode 100644 index b9f56f327d6346a39fa6f69d8827ff0be7a4337d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 875 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z-;8{;uuoF_;%J_Z=H0J_W3g( z>AlH{ab;?9Jg@dus zS3Fj^r{zaz$Fn8&d}%W(?;Egx`}y_xAGvkbzxP>-ufMV)F!@|n?Z&wHHP^*oe?5wo z*(xr#vgi7N3?sowUJv(kS~`R% zow7(}bPUo|SvZet(WVAxsUOmwD<|~i{SA0Jjcv|H-KHfW9;dh#88sV!vHwuMW4TLc z?n;3NEp{$XwQCG|SA2Qc5^DNw7L%QZ&`RIc7LN4~*FWgi-TG35eT$OT-5-m@12Ywk z4`)4*|DpUKDpy*`xI61f|BsaL+}Y~JzxMp#wVN4q``d{#ol-yL=JTw|J)YuLzqh8z z|JK!Q+(w^QxJ~=ux%t*NhqQlz%FH!E0k`L!Jj4B~TyB2LueVLV?H8)me44mVe)oTY z?GGoLeV0%ADLma@Wb+3-&*@0 zm+`E+S*O?kbK^c8_wV_OIqO#k&$L$k;39r3-p+pV|bchu(99KY6clnh~I|v&r15vZHo?-24CqcCN)9K3XN}A}1OT zxve=QtUaZ}y=d`*_!BEbW-dFCt&-2h$|v|pc%!R+qu7c0hwMJNt-G1p<#;P|S;Lb+ z#T4F?6J#_FaD2ZeYGtu$oq&;BN;IQX6N%zUvB3!n~xic v+kD7bYbW*k>&7^F?8L|D{cgQd|C!2ftO$D&n7s#>i5NUx{an^LB{Ts5h>e~y diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml new file mode 100644 index 0000000..7affe9b --- /dev/null +++ b/app/src/main/res/drawable/ic_done_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v21/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_info_black_24dp.xml rename to app/src/main/res/drawable/ic_info_black_24dp.xml diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml rename to app/src/main/res/drawable/ic_notifications_black_24dp.xml diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable-v21/ic_sync_black_24dp.xml rename to app/src/main/res/drawable/ic_sync_black_24dp.xml diff --git a/app/src/main/res/layout/activity_recording.xml b/app/src/main/res/layout/activity_recording.xml index 5ea4b9a..46a0ffb 100644 --- a/app/src/main/res/layout/activity_recording.xml +++ b/app/src/main/res/layout/activity_recording.xml @@ -117,7 +117,8 @@ android:layout_width="40dp" android:layout_height="40dp" android:background="?attr/roundButton" - android:src="@drawable/ic_done" /> + android:tint="@android:color/white" + android:src="@drawable/ic_done_black_24dp" />