From 445cf8c1bd43b5ec0e439eaee94db0384c65d94d Mon Sep 17 00:00:00 2001 From: rahul31124 Date: Sun, 16 Mar 2025 19:51:20 +0530 Subject: [PATCH 1/2] Fix crash in RoboticArmActivity --- .../io/pslab/activity/RoboticArmActivity.java | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/pslab/activity/RoboticArmActivity.java b/app/src/main/java/io/pslab/activity/RoboticArmActivity.java index 4a6b8a5de..5054023dd 100644 --- a/app/src/main/java/io/pslab/activity/RoboticArmActivity.java +++ b/app/src/main/java/io/pslab/activity/RoboticArmActivity.java @@ -354,8 +354,20 @@ public boolean onLongClick(View v) { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { removeStatusBar(); + int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { - degree = Integer.valueOf(degreeText1.getText().toString()); + String degreeText = degreeText1.getText().toString().trim(); + if( degreeText.isEmpty()) { + if (degree==0) { + degree = (int) (seekArc1.getProgress() * 3.6); + } + else { + degree = previousDegree; + } + } + else{ + degree = Integer.parseInt(degreeText1.getText().toString()); + } if (degree > 360 || degree < 0) { degreeText1.setText(getResources().getString(R.string.zero)); seekArc1.setProgress(0); @@ -380,8 +392,20 @@ public void onClick(View v) { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { removeStatusBar(); + int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { - degree = Integer.valueOf(degreeText2.getText().toString()); + String degreeText = degreeText2.getText().toString().trim(); + if( degreeText.isEmpty()) { + if (degree == 0) { + degree = (int) (seekArc2.getProgress() * 3.6); + } + else { + degree = previousDegree; + } + } + else{ + degree = Integer.parseInt(degreeText2.getText().toString()); + } if (degree > 360 || degree < 0) { degreeText2.setText(getResources().getString(R.string.zero)); seekArc2.setProgress(0); @@ -406,8 +430,20 @@ public void onClick(View v) { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { removeStatusBar(); + int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { - degree = Integer.parseInt(degreeText3.getText().toString()); + String degreeText = degreeText3.getText().toString().trim(); + if( degreeText.isEmpty()) { + if (degree == 0) { + degree = (int) (seekArc3.getProgress() * 3.6); + } + else { + degree = previousDegree; + } + } + else{ + degree = Integer.parseInt(degreeText3.getText().toString()); + } if (degree > 360 || degree < 0) { degreeText3.setText(getResources().getString(R.string.zero)); seekArc3.setProgress(0); @@ -432,8 +468,20 @@ public void onClick(View v) { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { removeStatusBar(); + int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { - degree = Integer.valueOf(degreeText4.getText().toString()); + String degreeText = degreeText4.getText().toString().trim(); + if( degreeText.isEmpty()) { + if (degree == 0) { + degree = (int) (seekArc4.getProgress() * 3.6); + } + else { + degree = previousDegree; + } + } + else{ + degree = Integer.parseInt(degreeText4.getText().toString()); + } if (degree > 360 || degree < 0) { degreeText4.setText(getResources().getString(R.string.zero)); seekArc4.setProgress(0); From 4e3b096943db51d88efae4c62533ee94ad5288dc Mon Sep 17 00:00:00 2001 From: Marc Nause Date: Wed, 2 Apr 2025 22:18:25 +0200 Subject: [PATCH 2/2] refactor: formatting --- .../io/pslab/activity/RoboticArmActivity.java | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/io/pslab/activity/RoboticArmActivity.java b/app/src/main/java/io/pslab/activity/RoboticArmActivity.java index 5054023dd..3df26f67b 100644 --- a/app/src/main/java/io/pslab/activity/RoboticArmActivity.java +++ b/app/src/main/java/io/pslab/activity/RoboticArmActivity.java @@ -357,15 +357,13 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { String degreeText = degreeText1.getText().toString().trim(); - if( degreeText.isEmpty()) { - if (degree==0) { + if (degreeText.isEmpty()) { + if (degree == 0) { degree = (int) (seekArc1.getProgress() * 3.6); + } else { + degree = previousDegree; } - else { - degree = previousDegree; - } - } - else{ + } else { degree = Integer.parseInt(degreeText1.getText().toString()); } if (degree > 360 || degree < 0) { @@ -395,15 +393,13 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { String degreeText = degreeText2.getText().toString().trim(); - if( degreeText.isEmpty()) { + if (degreeText.isEmpty()) { if (degree == 0) { degree = (int) (seekArc2.getProgress() * 3.6); - } - else { + } else { degree = previousDegree; } - } - else{ + } else { degree = Integer.parseInt(degreeText2.getText().toString()); } if (degree > 360 || degree < 0) { @@ -433,15 +429,13 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { String degreeText = degreeText3.getText().toString().trim(); - if( degreeText.isEmpty()) { + if (degreeText.isEmpty()) { if (degree == 0) { degree = (int) (seekArc3.getProgress() * 3.6); - } - else { + } else { degree = previousDegree; } - } - else{ + } else { degree = Integer.parseInt(degreeText3.getText().toString()); } if (degree > 360 || degree < 0) { @@ -471,15 +465,13 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { int previousDegree = degree; if (actionId == EditorInfo.IME_ACTION_DONE) { String degreeText = degreeText4.getText().toString().trim(); - if( degreeText.isEmpty()) { + if (degreeText.isEmpty()) { if (degree == 0) { degree = (int) (seekArc4.getProgress() * 3.6); - } - else { + } else { degree = previousDegree; } - } - else{ + } else { degree = Integer.parseInt(degreeText4.getText().toString()); } if (degree > 360 || degree < 0) {