From 82d22525b943b07119ca39d307b6d45efa3f7cfb Mon Sep 17 00:00:00 2001 From: Ahmet Inan Date: Wed, 8 May 2024 08:10:44 +0200 Subject: [PATCH] made tint less bright and added fg and bg colors --- app/src/main/java/xdsopl/robot36/MainActivity.java | 12 ++++++------ app/src/main/res/values-night/colors.xml | 4 +++- app/src/main/res/values/colors.xml | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/xdsopl/robot36/MainActivity.java b/app/src/main/java/xdsopl/robot36/MainActivity.java index 519967e..30cebd9 100644 --- a/app/src/main/java/xdsopl/robot36/MainActivity.java +++ b/app/src/main/java/xdsopl/robot36/MainActivity.java @@ -76,8 +76,8 @@ public class MainActivity extends AppCompatActivity { private int recordRate; private int recordChannel; private int audioSource; - private int tint; - private int thin; + private int fgColor; + private int thinColor; private void setStatus(int id) { setTitle(id); @@ -135,8 +135,8 @@ public class MainActivity extends AppCompatActivity { int peak = pixels; if (max > 0) peak = (int) Math.round(Math.min(Math.max(-Math.PI * Math.log(max), 0), pixels)); - Arrays.fill(peakMeterBuffer.pixels, 0, peak, thin); - Arrays.fill(peakMeterBuffer.pixels, peak, pixels, tint); + Arrays.fill(peakMeterBuffer.pixels, 0, peak, thinColor); + Arrays.fill(peakMeterBuffer.pixels, peak, pixels, fgColor); peakMeterBitmap.setPixels(peakMeterBuffer.pixels, 0, peakMeterBuffer.width, 0, 0, peakMeterBuffer.width, peakMeterBuffer.height); peakMeterView.invalidate(); } @@ -381,8 +381,8 @@ public class MainActivity extends AppCompatActivity { EdgeToEdge.enable(this); setContentView(config.orientation == Configuration.ORIENTATION_LANDSCAPE ? R.layout.activity_main_land : R.layout.activity_main); handleInsets(); - tint = getColor(R.color.tint); - thin = getColor(R.color.thin); + fgColor = getColor(R.color.fg); + thinColor = getColor(R.color.thin); scopeBuffer = new PixelBuffer(640, 2 * 1280); createScope(config); freqPlotBuffer = new PixelBuffer(256, 2 * 256); diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 5396b94..37fab8d 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -5,5 +5,7 @@ #FFB4B4B4 #FF2F2F2F #FFFFFFFF - #FFFFFFFF + #FFE6E0E9 + #FFFFFFFF + #FF000000 \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e9d42dc..0d3834b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,5 +5,7 @@ #FF696969 #FFE0E0E0 #FFFFFFFF - #FF000000 + #FF1D1B20 + #FF000000 + #FFFFFFFF \ No newline at end of file