Merge pull request #210 from AugmentOS-Community/dev_edge

Dev edge

Author: nic-olo

SmartGlassesManager/SGM_android/SmartGlassesManager/src/main/java/com/augmentos/smartglassesmanager/speechrecognition/augmentos/WebSocketStreamManager.java

@@ -145,6 +145,12 @@ public void connect() {
                 .url(serverUrl)
                 .build();
 
+        if (webSocket != null) {
+            audioQueue.clear();
+            webSocket.close(1000, "Normal closure");
+            webSocket = null;
+        }
+
         webSocket = client.newWebSocket(request, new WebSocketListener() {
             @Override
             public void onOpen(WebSocket webSocket, Response response) {

augmentos_core/app/src/main/java/com/augmentos/augmentos_core/AugmentosService.java

@@ -304,9 +304,8 @@ private void removeAsrStream(String packageName, AsrStreamKey key) {
 
         if (subscribers.isEmpty()) {
             // Stop the underlying ASR
-            updateAsrLanguages();
-
             activeStreams.remove(key);
+            updateAsrLanguages();
         }
     }
 

augmentos_core/app/src/main/res/raw/config.json

@@ -1,5 +1,5 @@
 {
   "name": "AugmentOS Core",
   "description": "Android app that runs in the background",
-  "version": "1.1.2"
+  "version": "1.1.3"
 }

augmentos_manager/android/app/src/main/java/com/teamopensmartglasses/augmentos_manager/InstallApkModule.java

@@ -54,7 +54,7 @@ public void installApk(String packageName, Promise promise) {
     @ReactMethod
     public void downloadCoreApk(Promise promise) {
         DownloadManager downloadManager = (DownloadManager) getReactApplicationContext().getSystemService(Context.DOWNLOAD_SERVICE);
-        String downloadLink = "https://api.augmentos.org/download_apk?apkName=AugmentOSCore.apk";
+        String downloadLink = "https://api.augmentos.org/apks/AugmentOSCore.apk";
         String packageName = "com.augmentos.augmentos_core";
         String appName = "AugmentOS Core";
         String version = "latest";

augmentos_manager/android/app/src/main/res/raw/config.json

@@ -1,5 +1,5 @@
 {
   "name": "AugmentOS Manager",
   "description": "Frontend app",
-  "version": "1.1.2"
+  "version": "1.1.3"
 }

augmentos_manager/package-lock.json

@@ -70,6 +70,8 @@
 
     "react-native-screens": "^3.34.0",
 
+    "react-native-slider": "^0.11.0",
+
     "react-native-svg": "^15.11.1",
 
     "react-native-svg-transformer": "^1.5.0",

augmentos_manager/package.json

@@ -0,0 +1,93 @@
+import React, { useRef, useState, useEffect } from 'react';
+import { View, StyleSheet, PanResponder, LayoutChangeEvent } from 'react-native';
+
+interface BrightnessSliderComponentProps {
+  value: number;
+  onValueChange: (value: number) => void;
+  minimumValue?: number;
+  maximumValue?: number;
+}
+
+const BrightnessSliderComponent: React.FC<BrightnessSliderComponentProps> = ({
+  value,
+  onValueChange,
+  minimumValue = 0,
+  maximumValue = 100,
+}) => {
+  const [sliderWidth, setSliderWidth] = useState(0);
+
+  // Use a ref to always hold the latest onValueChange callback.
+  const onValueChangeRef = useRef(onValueChange);
+  useEffect(() => {
+    onValueChangeRef.current = onValueChange;
+  }, [onValueChange]);
+
+  const computeValueFromTouch = (touchX: number) => {
+    // If the slider width is not set yet, do nothing.
+    if (sliderWidth === 0) {
+      return value;
+    }
+    // Clamp ratio between 0 and 1.
+    const ratio = Math.max(0, Math.min(1, touchX / sliderWidth));
+    return Math.round(minimumValue + ratio * (maximumValue - minimumValue));
+  };
+
+  const panResponder = PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
+    onPanResponderGrant: (evt) => {
+      const newValue = computeValueFromTouch(evt.nativeEvent.locationX);
+      onValueChange(newValue);
+    },
+    onPanResponderMove: (evt) => {
+      const newValue = computeValueFromTouch(evt.nativeEvent.locationX);
+      onValueChange(newValue);
+    },
+  });
+
+  const handleLayout = (e: LayoutChangeEvent) => {
+    setSliderWidth(e.nativeEvent.layout.width);
+  };
+
+  // Calculate thumb's horizontal position based on the current value.
+  const thumbPosition =
+    sliderWidth * ((value - minimumValue) / (maximumValue - minimumValue));
+
+  return (
+    <View style={styles.container} onLayout={handleLayout} {...panResponder.panHandlers}>
+      {/* Full track */}
+      <View style={styles.track} />
+      {/* Filled portion of the track */}
+      <View style={[styles.filledTrack, { width: thumbPosition }]} />
+      {/* Draggable thumb */}
+      <View style={[styles.thumb, { left: thumbPosition - styles.thumb.width / 2 }]} />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    height: 40,
+    justifyContent: 'center',
+  },
+  track: {
+    height: 4,
+    backgroundColor: '#D1D1D6',
+    borderRadius: 2,
+  },
+  filledTrack: {
+    position: 'absolute',
+    height: 4,
+    backgroundColor: '#2196F3',
+    borderRadius: 2,
+  },
+  thumb: {
+    position: 'absolute',
+    width: 20,
+    height: 20,
+    backgroundColor: '#2196F3',
+    borderRadius: 10,
+    top: 10, // centers the thumb vertically (40 - 20)/2
+  },
+});
+
+export default BrightnessSliderComponent;