tweak audio bars layout and colors

Zoxcore · Oct 31, 2023 · d331037 · d331037
1 parent 23ee71c
commit d331037
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/com/zoffcc/applications/trifa/AudioBar.java b/src/main/java/com/zoffcc/applications/trifa/AudioBar.java
@@ -32,16 +32,19 @@ public class AudioBar extends JPanel
     public static AudioBar audio_in_bar = new AudioBar();
     public static AudioBar audio_out_bar = new AudioBar();
 
+    private Color bg_color = Color.BLACK;
     private int cur_value = 0;
     private final int yellow_value = 75;
     private final int red_value = 85;
+    private final int default_width = 400;
+    private final int default_height = 10;
 
     AudioBar()
     {
         super();
         setDoubleBuffered(true);
-        setPreferredSize(new Dimension(300, 4));
-        setSize(300, 4);
+        setPreferredSize(new Dimension(default_width, default_height));
+        setSize(default_width, default_height);
         revalidate();
         repaint();
         set_cur_value(0, this);
@@ -51,7 +54,7 @@ public class AudioBar extends JPanel
     public void paint(Graphics g)
     {
         super.paint(g);
-        setBackground(Color.black);
+        setBackground(bg_color);
         int w = this.getWidth();
         int h = this.getHeight();
         if (cur_value > red_value)
@@ -81,12 +84,17 @@ else if (cur_value == 0)
         }
     }
 
+    public static void set_bar_bgcolor(int bgcolor, AudioBar c)
+    {
+        c.bg_color = new Color(bgcolor);
+        c.repaint();
+    }
+
     public static void set_cur_value(int value, AudioBar c)
     {
         if (c != null)
         {
             c.cur_value = value;
-            Log.i(TAG, "set_cur_value:*********AApaint*********");
             c.repaint();
         }
         else

diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -66,6 +66,8 @@ import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.zoffcc.applications.ffmpegav.AVActivity
 import com.zoffcc.applications.trifa.AudioBar
+import com.zoffcc.applications.trifa.AudioBar.audio_in_bar
+import com.zoffcc.applications.trifa.AudioBar.audio_out_bar
 import com.zoffcc.applications.trifa.HelperGeneric.PubkeyShort
 import com.zoffcc.applications.trifa.JPictureBox
 import com.zoffcc.applications.trifa.JPictureBoxOut
@@ -577,21 +579,24 @@ fun App()
                             }
                         }
                     }
+                    val audio_bar_bgcolor = MaterialTheme.colors.background
                     SwingPanel(
-                        modifier = Modifier.size(250.dp,5.dp),
+                        modifier = Modifier.size(200.dp,5.dp),
                         factory = {
                             JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
                                 add(AudioBar.audio_out_bar)
+                                AudioBar.set_bar_bgcolor(audio_bar_bgcolor.toArgb(), audio_out_bar)
                             }
                         },
                         update = { }
                     )
                     Spacer(modifier = Modifier.height(5.dp))
                     SwingPanel(
-                        modifier = Modifier.size(250.dp,5.dp),
+                        modifier = Modifier.size(200.dp,5.dp),
                         factory = {
                             JPanel(SingleComponentAspectRatioKeeperLayout(), true).apply {
                                 add(AudioBar.audio_in_bar)
+                                AudioBar.set_bar_bgcolor(audio_bar_bgcolor.toArgb(), audio_in_bar)
                             }
                         },
                         update = { }

diff --git a/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt b/src/main/kotlin/com/zoffcc/applications/trifa/MainActivity.kt
@@ -13,6 +13,7 @@ import com.zoffcc.applications.sorm.FileDB
 import com.zoffcc.applications.sorm.Filetransfer
 import com.zoffcc.applications.sorm.GroupMessage
 import com.zoffcc.applications.sorm.Message
+import com.zoffcc.applications.trifa.AudioBar.audio_in_bar
 import com.zoffcc.applications.trifa.AudioBar.audio_out_bar
 import com.zoffcc.applications.trifa.AudioSelectOutBox.semaphore_audio_out_convert
 import com.zoffcc.applications.trifa.AudioSelectOutBox.semaphore_audio_out_convert_active_threads
@@ -1006,6 +1007,8 @@ class MainActivity
             Thread.sleep(100)
             VideoOutFrame.clear_video_out_frame()
             VideoInFrame.clear_video_in_frame()
+            AudioBar.set_cur_value(0, audio_in_bar)
+            AudioBar.set_cur_value(0, audio_out_bar)
         }
 
         @JvmStatic