Skip to content

Commit b26b2db

Browse files
Merge pull request #790 from arthurbenemann/circleMissionItemAdv
Circle mission item support
2 parents f942a5b + 16f8f89 commit b26b2db

22 files changed

+282
-151
lines changed
6 KB
Binary file not shown.
4.75 KB
Loading
4.76 KB
Loading
6 KB
Binary file not shown.
2.86 KB
Loading
2.88 KB
Loading
6 KB
Binary file not shown.
5.32 KB
Loading
5.18 KB
Loading

Android/res/layout/fragment_editor_detail_loitern.xml renamed to Android/res/layout/fragment_editor_detail_circle.xml

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,16 @@
128128
</org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
129129

130130
<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
131-
android:id="@+id/loiterTurn"
131+
android:id="@+id/loiterRadius"
132132
android:layout_width="match_parent"
133133
android:layout_height="wrap_content"
134134
android:layout_margin="2dp"
135-
custom:inc="1"
136-
custom:max="100"
135+
custom:inc="0.1"
136+
custom:max="20"
137137
custom:min="0"
138-
custom:title="@string/Orbits"
139-
custom:unit="turns" >
138+
custom:title="@string/loiter_radius"
139+
custom:unit="m"
140+
android:visibility="gone" >
140141
</org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
141142

142143
<FrameLayout
@@ -145,28 +146,60 @@
145146
android:layout_height="wrap_content" >
146147

147148
<CheckBox
148-
android:id="@string/loiter_ccw"
149+
android:id="@+id/loiter_ccw"
149150
android:layout_width="wrap_content"
150151
android:layout_height="wrap_content"
151152
android:layout_gravity="right"
152153
android:layout_marginRight="20dp"
153-
android:text="@string/loiter_ccw" />
154+
android:text="@string/loiter_ccw"
155+
android:visibility="gone" />
154156

155157
<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
156-
android:id="@+id/loiterRadius"
158+
android:id="@+id/loiterTurn"
157159
android:layout_width="match_parent"
158160
android:layout_height="wrap_content"
159161
android:layout_margin="2dp"
160162
android:layout_marginRight="10dp"
161163
android:visibility="visible"
162164
custom:inc="1"
163-
custom:max="100"
165+
custom:max="10"
164166
custom:min="0"
165-
custom:title="@string/loiter_radius"
166-
custom:unit="m" >
167+
custom:title="@string/Orbits"
168+
custom:unit="turns" >
167169
</org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
168170
</FrameLayout>
169171

172+
<CheckBox
173+
android:id="@+id/checkBoxAdvanced"
174+
android:layout_width="wrap_content"
175+
android:layout_height="wrap_content"
176+
android:text="Advanced" />
177+
178+
<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
179+
android:id="@+id/numberSteps"
180+
android:layout_width="match_parent"
181+
android:layout_height="wrap_content"
182+
android:layout_margin="2dp"
183+
custom:inc="1"
184+
custom:max="10"
185+
custom:min="1"
186+
custom:title="Number of Steps"
187+
android:visibility="gone" >
188+
</org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
189+
190+
<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
191+
android:id="@+id/altitudeStep"
192+
android:layout_width="match_parent"
193+
android:layout_height="wrap_content"
194+
android:layout_margin="2dp"
195+
custom:inc="0.5"
196+
custom:max="10"
197+
custom:min="0.5"
198+
custom:unit="m"
199+
custom:title="Altitude Step"
200+
android:visibility="gone" >
201+
</org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
202+
170203

171204
</LinearLayout>
172205
</LinearLayout>

0 commit comments

Comments
 (0)