Skip to content

Commit eceb13c

Browse files
neel1998CloudyPadmal
authored andcommitted
indiactor added to the top of timeline (fossasia#1755)
1 parent be99b10 commit eceb13c

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

app/src/main/java/io/pslab/activity/RoboticArmActivity.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
import android.os.Bundle;
77
import android.view.Display;
88
import android.view.DragEvent;
9+
import android.view.Gravity;
910
import android.view.KeyEvent;
1011
import android.view.LayoutInflater;
1112
import android.view.View;
13+
import android.view.ViewGroup;
1214
import android.view.WindowManager;
1315
import android.view.inputmethod.EditorInfo;
16+
import android.widget.Button;
1417
import android.widget.EditText;
1518
import android.widget.LinearLayout;
1619
import android.widget.RelativeLayout;
@@ -27,6 +30,7 @@ public class RoboticArmActivity extends AppCompatActivity {
2730
private LinearLayout servo1TimeLine, servo2TimeLine, servo3TimeLine, servo4TimeLine;
2831
private int degree;
2932
private boolean editEnter = false;
33+
private Button playButton, pauseButton, stopButton;
3034

3135
@Override
3236
protected void onCreate(Bundle savedInstanceState) {
@@ -55,6 +59,9 @@ protected void onCreate(Bundle savedInstanceState) {
5559
servo2TimeLine = findViewById(R.id.servo2_timeline);
5660
servo3TimeLine = findViewById(R.id.servo3_timeline);
5761
servo4TimeLine = findViewById(R.id.servo4_timeline);
62+
playButton = findViewById(R.id.timeline_play_button);
63+
pauseButton = findViewById(R.id.timeline_pause_button);
64+
stopButton = findViewById(R.id.timeline_stop_button);
5865
LinearLayout timeLineControlsLayout = findViewById(R.id.servo_timeline_controls);
5966

6067
LinearLayout.LayoutParams servoControllerParams = new LinearLayout.LayoutParams(screen_width / 4 - 4, screen_height / 2 - 4);
@@ -64,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
6471
servo3Layout.setLayoutParams(servoControllerParams);
6572
servo4Layout.setLayoutParams(servoControllerParams);
6673

67-
LinearLayout.LayoutParams servoTimeLineParams = new LinearLayout.LayoutParams(screen_width * 10, screen_height / 8);
74+
LinearLayout.LayoutParams servoTimeLineParams = new LinearLayout.LayoutParams(screen_width * 10, screen_height / 8 - 3);
6875
servoTimeLineParams.setMargins(2, 0, 2, 4);
6976

7077
servo1TimeLine.setLayoutParams(servoTimeLineParams);
@@ -229,7 +236,6 @@ public boolean onLongClick(View v) {
229236
}
230237
});
231238

232-
233239
servo2Layout.findViewById(R.id.drag_handle).setOnLongClickListener(new View.OnLongClickListener() {
234240
@Override
235241
public boolean onLongClick(View v) {
@@ -308,6 +314,11 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
308314
return false;
309315
}
310316
});
317+
318+
LinearLayout timeIndicatorLayout = findViewById(R.id.time_indicator);
319+
LinearLayout.LayoutParams timeIndicatorParams = new LinearLayout.LayoutParams(screen_width / 6 - 2, 12);
320+
timeIndicatorParams.setMargins(3, 0, 0, 0);
321+
timeIndicatorLayout.setLayoutParams(timeIndicatorParams);
311322
}
312323

313324
private View.OnDragListener servo1DragListener = new View.OnDragListener() {

app/src/main/res/layout/activity_robotic_arm.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
android:layout_height="wrap_content"
5656
android:orientation="vertical">
5757

58+
<LinearLayout
59+
android:id="@+id/time_indicator"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:background="@color/colorPrimary"
63+
android:orientation="horizontal" />
64+
5865
<LinearLayout
5966
android:id="@+id/servo1_timeline"
6067
android:layout_width="match_parent"
@@ -112,4 +119,6 @@
112119
android:background="@drawable/ic_stop_white_24dp" />
113120
</LinearLayout>
114121
</LinearLayout>
122+
123+
115124
</RelativeLayout>

0 commit comments

Comments
 (0)