feat: merge custom changes (boost, hidden-button, vibration, ci-fix)

Cherry-picked from 6b7e4bc onto upstream v12.9.8 base.
Rollback upstream v12.10 (framegen) due to audio regression.

Author: todouu

.github/workflows/upstream-sync.yml

@@ -0,0 +1,88 @@
+name: Upstream Sync
+
+on:
+  schedule:
+    - cron: '0 2 * * *'   # every day 02:00 UTC
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout master
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          fetch-depth: 0
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: Get latest upstream release
+        id: upstream
+        run: |
+          RESPONSE=$(curl -sfL "https://api.github.com/repos/qiin2333/moonlight-android/releases/latest")
+          if [ -z "$RESPONSE" ]; then
+            echo "::error::curl failed or returned empty response"
+            exit 1
+          fi
+          VERSION=$(echo "$RESPONSE" | jq -r '.tag_name')
+          if [ "$VERSION" = "null" ] || [ -z "$VERSION" ]; then
+            echo "::error::tag_name not found in API response"
+            echo "$RESPONSE" | jq . >&2
+            exit 1
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Upstream latest release: $VERSION"
+
+      - name: Check if already synced
+        id: check
+        run: |
+          VERSION="${{ steps.upstream.outputs.version }}"
+          if git ls-remote --tags origin "refs/tags/${VERSION}" | grep -q "${VERSION}"; then
+            echo "already_synced=true" >> $GITHUB_OUTPUT
+            echo "Tag ${VERSION} already exists in this repo, skipping."
+          else
+            echo "already_synced=false" >> $GITHUB_OUTPUT
+            echo "New upstream version ${VERSION} detected."
+          fi
+
+      - name: Add upstream remote and fetch
+        if: steps.check.outputs.already_synced == 'false'
+        run: |
+          git remote add upstream https://github.com/qiin2333/moonlight-android.git
+          git fetch upstream --tags
+
+      - name: Attempt merge
+        if: steps.check.outputs.already_synced == 'false'
+        id: merge
+        run: |
+          VERSION="${{ steps.upstream.outputs.version }}"
+          git config user.name "todou"
+          git config user.email "pslzj@outlook.com"
+
+          if git merge "${VERSION}" --no-edit --allow-unrelated-histories; then
+            echo "success=true" >> $GITHUB_OUTPUT
+            echo "Merge succeeded."
+          else
+            echo "success=false" >> $GITHUB_OUTPUT
+            git merge --abort || true
+            echo "Merge failed due to conflicts."
+          fi
+
+      - name: Push merged master and create release tag
+        if: steps.check.outputs.already_synced == 'false' && steps.merge.outputs.success == 'true'
+        run: |
+          VERSION="${{ steps.upstream.outputs.version }}"
+          git push origin master
+          git tag -f "$VERSION"
+          git push origin "$VERSION"
+          echo "Pushed tag $VERSION — android-ci.yml build triggered."
+
+      - name: Fail on merge conflict (GitHub will send email notification)
+        if: steps.check.outputs.already_synced == 'false' && steps.merge.outputs.success == 'false'
+        run: |
+          echo "::error::Merge conflict detected with upstream ${{ steps.upstream.outputs.version }}."
+          echo "::error::Please resolve manually: git merge ${{ steps.upstream.outputs.version }}"
+          exit 1

app/build.gradle

@@ -123,8 +123,8 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix ".vplus_debug"
-            resValue "string", "app_label", "Moonlight V+"
-            resValue "string", "app_label_root", "Moonlight V+"
+            resValue "string", "app_label", "Moonlight T+"
+            resValue "string", "app_label_root", "Moonlight T+"
 
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -161,8 +161,8 @@ android {
             //
             // TL;DR: Leave the following line alone!
             applicationIdSuffix ".qiin"
-            resValue "string", "app_label", "Moonlight V+"
-            resValue "string", "app_label_root", "Moonlight (Root)"
+            resValue "string", "app_label", "Moonlight T+"
+            resValue "string", "app_label_root", "Moonlight T+ (Root)"
 
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

app/src/main/java/com/limelight/binding/input/advance_setting/element/AnalogStick.java

@@ -152,6 +152,7 @@ private enum CLICK_STATE {
 
     private ElementController.SendEventHandler middleValueSendHandler;
     private ElementController.SendEventHandler valueSendHandler;
+    private StickSwipTrigger swipTriggerButton;
     private String middleValue;
     private String value;
     private int radius;
@@ -261,6 +262,7 @@ public AnalogStick(Map<String, Object> attributesMap,
             System.out.println("加载按摇杆时发生错误，已应用默认值: " + e.getMessage());
         }
         middleValueSendHandler = controller.getSendEventHandler(middleValue);
+        swipTriggerButton = new StickSwipTrigger(attributesMap, controller);
         radius_complete = getPercent(radius, 100) - 2 * thick;
         radius_dead_zone = getPercent(radius, deadZoneRadius);
         radius_analog_stick = getPercent(radius, 20);
@@ -275,7 +277,7 @@ public void onMovement(float x, float y) {
 
             @Override
             public void onClick() {
-                elementController.buttonVibrator();
+                swipTriggerButton.onStickPressed();
             }
 
             @Override
@@ -358,6 +360,8 @@ protected void onElementDraw(Canvas canvas) {
             canvas.drawRect(rect, paintEdit);
 
         }
+
+        swipTriggerButton.drawTriggerPreview(canvas, radius, radius, radius_complete);
     }
 
     private void updatePosition(long eventTime) {
@@ -409,6 +413,7 @@ public boolean onElementTouchEvent(MotionEvent event) {
 
         // get radius and angel of movement from center
         movement_radius = getMovementRadius(relative_x, relative_y);
+        double rawMovementRadius = movement_radius;
         movement_angle = getAngle(relative_x, relative_y);
 
         // pass touch event to parent if out of outer circle
@@ -455,8 +460,10 @@ public boolean onElementTouchEvent(MotionEvent event) {
         if (isPressed()) {
             // when is pressed calculate new positions (will trigger movement if necessary)
             updatePosition(event.getEventTime());
+            swipTriggerButton.update(rawMovementRadius, radius_complete);
         } else {
             stick_state = AnalogStick.STICK_STATE.NO_MOVEMENT;
+            swipTriggerButton.release();
             notifyOnRevoke();
 
             // not longer pressed reset analog stick
@@ -479,9 +486,13 @@ protected SuperPageLayout getInfoPage() {
 
         NumberSeekbar radiusNumberSeekbar = analogStickPage.findViewById(R.id.page_analog_stick_radius);
         TextView middleValueTextView = analogStickPage.findViewById(R.id.page_analog_stick_middle_value);
+        TextView swipTriggerValueTextView = analogStickPage.findViewById(R.id.page_analog_stick_special_value);
+        Switch stickPressVibrationSwitch = analogStickPage.findViewById(R.id.page_analog_stick_press_vibration);
+        RadioGroup triggerModeGroup = analogStickPage.findViewById(R.id.page_analog_stick_trigger_mode);
         RadioGroup modeRadioGroup = analogStickPage.findViewById(R.id.page_analog_stick_value);
         Switch moveModeSwitch = analogStickPage.findViewById(R.id.page_analog_stick_move_mode);
         NumberSeekbar deadZoneRadiusNumberSeekbar = analogStickPage.findViewById(R.id.page_analog_stick_sense);
+        NumberSeekbar swipTriggerRadiusSeekbar = analogStickPage.findViewById(R.id.page_analog_stick_special_trigger_radius);
         NumberSeekbar thickNumberSeekbar = analogStickPage.findViewById(R.id.page_analog_stick_thick);
         NumberSeekbar layerNumberSeekbar = analogStickPage.findViewById(R.id.page_analog_stick_layer);
         ElementEditText normalColorEditText = analogStickPage.findViewById(R.id.page_analog_stick_normal_color);
@@ -524,6 +535,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 save();
             }
         });
+        swipTriggerButton.bind(swipTriggerValueTextView, stickPressVibrationSwitch, triggerModeGroup, R.id.page_analog_stick_trigger_mode_hold, swipTriggerRadiusSeekbar, pageDeviceController, this::save, this::invalidate);
 
         centralXNumberSeekbar.setProgressMin(centralXMin);
         centralXNumberSeekbar.setProgressMax(centralXMax);
@@ -660,6 +672,7 @@ public void onClick(View v) {
                 contentValues.put(COLUMN_INT_ELEMENT_PRESSED_COLOR, pressedColor);
                 contentValues.put(COLUMN_INT_ELEMENT_BACKGROUND_COLOR, backgroundColor);
                 contentValues.put(COLUMN_INT_ELEMENT_MODE, moveMode);
+                swipTriggerButton.putExtraAttributes(contentValues);
                 elementController.addElement(contentValues);
             }
         });
@@ -693,6 +706,7 @@ public void save() {
         contentValues.put(COLUMN_INT_ELEMENT_PRESSED_COLOR, pressedColor);
         contentValues.put(COLUMN_INT_ELEMENT_BACKGROUND_COLOR, backgroundColor);
         contentValues.put(COLUMN_INT_ELEMENT_MODE, moveMode);
+        swipTriggerButton.putExtraAttributes(contentValues);
         elementController.updateElement(elementId, contentValues);
 
     }
@@ -774,4 +788,4 @@ public static ContentValues getInitialInfo() {
 
     }
 
-}
+}

app/src/main/java/com/limelight/binding/input/advance_setting/element/DigitalMovableButton.java

@@ -86,6 +86,7 @@ public interface DigitalMovableButtonListener {
 
     private int enableTouch = 0; // 0 = 按钮, 1 = 摇杆。
     private boolean isTrackpadMode = false;
+    private boolean enableVibration = true; // 按下震动，默认启用
 
     private int radius;
     private int sense;
@@ -193,6 +194,12 @@ public DigitalMovableButton(Map<String, Object> attributesMap,
                         this.isTrackpadMode = (Boolean) trackpadValue;
                     }
                 }
+                if (extraAttrs != null && extraAttrs.containsKey("enableVibration")) {
+                    Object vibrationValue = extraAttrs.get("enableVibration");
+                    if (vibrationValue instanceof Boolean) {
+                        this.enableVibration = (Boolean) vibrationValue;
+                    }
+                }
             } catch (Exception e) {
                 // 如果 JSON 格式错误，打印错误日志并使用默认值继续运行
                 e.printStackTrace();
@@ -243,7 +250,7 @@ public void onRelease() {
             if (confirmedMove) return;
             confirmedDrag = true;
             listener.onClick();
-            elementController.buttonVibrator();
+            if (enableVibration) elementController.buttonVibrator();
             setPressed(true);
             invalidate();
         };
@@ -367,7 +374,7 @@ private boolean handleTrackpadTouchEvent(MotionEvent event) {
                 if (confirmedDrag) {
                     listener.onRelease();
                 } else if (!confirmedMove) {
-                    elementController.buttonVibrator();
+                    if (enableVibration) elementController.buttonVibrator();
                     listener.onClick();
                     handler.postDelayed(listener::onRelease, 50);
                 }
@@ -383,7 +390,7 @@ private boolean handleButtonTouchEvent(MotionEvent event) {
         int action = event.getActionMasked();
         switch (action) {
             case MotionEvent.ACTION_DOWN: {
-                elementController.buttonVibrator();
+                if (enableVibration) elementController.buttonVibrator();
                 lastX = event.getX();
                 lastY = event.getY();
                 setPressed(true);
@@ -414,7 +421,7 @@ private boolean handleJoystickTouchEvent(MotionEvent event) {
         int action = event.getActionMasked();
         switch (action) {
             case MotionEvent.ACTION_DOWN:
-                elementController.buttonVibrator();
+                if (enableVibration) elementController.buttonVibrator();
                 setPressed(true);
                 onClickCallback();
                 invalidate();
@@ -478,6 +485,7 @@ public void save() {
         // --- 创建并保存 extra_attributes 的 JSON 字符串 ---
         Map<String, Object> extraAttrs = new HashMap<>();
         extraAttrs.put("isTrackpadMode", isTrackpadMode);
+        extraAttrs.put("enableVibration", enableVibration);
 
         Gson gson = new Gson();
         String json = gson.toJson(extraAttrs);
@@ -508,6 +516,7 @@ protected SuperPageLayout getInfoPage() {
         View joystickModeContainer = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_joystick_mode_container);
         Switch trackpadModeSwitch = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_trackpad_mode);
         View trackpadModeContainer = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_trackpad_mode_container);
+        Switch vibrationSwitch = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_vibration);
         TextView valueTextView = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_value);
 
         Runnable updateValueViewState = () -> {
@@ -581,6 +590,13 @@ protected SuperPageLayout getInfoPage() {
             save();
         });
 
+        // --- 震动开关 ---
+        vibrationSwitch.setChecked(enableVibration);
+        vibrationSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            enableVibration = isChecked;
+            save();
+        });
+
         NumberSeekbar widthNumberSeekbar = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_width);
         NumberSeekbar heightNumberSeekbar = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_height);
         NumberSeekbar radiusNumberSeekbar = digitalMovableButtonPage.findViewById(R.id.page_digital_movable_button_radius);
@@ -797,7 +813,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             contentValues.put(COLUMN_STRING_ELEMENT_TEXT, text);
             contentValues.put(COLUMN_STRING_ELEMENT_VALUE, value);
             contentValues.put(COLUMN_INT_ELEMENT_MODE, enableTouch);
-            contentValues.put(COLUMN_STRING_EXTRA_ATTRIBUTES, new Gson().toJson(new HashMap<String, Object>() {{ put("isTrackpadMode", isTrackpadMode); }}));
+            contentValues.put(COLUMN_STRING_EXTRA_ATTRIBUTES, new Gson().toJson(new HashMap<String, Object>() {{ put("isTrackpadMode", isTrackpadMode); put("enableVibration", enableVibration); }}));
             contentValues.put(COLUMN_INT_ELEMENT_SENSE, sense);
             contentValues.put(COLUMN_INT_ELEMENT_WIDTH, getElementWidth());
             contentValues.put(COLUMN_INT_ELEMENT_HEIGHT, getElementHeight());