Skip to content

Commit ca39a36

Browse files
author
mandimastro
committed
Manual movement mode added
Direction buttons added Listeners implemented for l-r-u-d
1 parent 13fac1f commit ca39a36

File tree

15 files changed

+1204
-368
lines changed

15 files changed

+1204
-368
lines changed

‎HipparchusAndroid/res/drawable-hdpi/up_arrow.png‎

3.76 KB
Loading

‎HipparchusAndroid/res/drawable-ldpi/up_arrow.png‎

3.76 KB
Loading

‎HipparchusAndroid/res/drawable-mdpi/up_arrow.png‎

3.76 KB
Loading

‎HipparchusAndroid/res/drawable-xhdpi/up_arrow.png‎

3.76 KB
Loading

‎HipparchusAndroid/res/layout/settings_layout.xml‎

Lines changed: 77 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -5,124 +5,110 @@
55
android:layout_height="match_parent"
66
android:layout_gravity="center_horizontal"
77
android:orientation="vertical" >
8-
8+
99
<LinearLayout
1010
xmlns:android="http://schemas.android.com/apk/res/android"
1111
android:layout_width="match_parent"
1212
android:layout_height="155dp"
1313
android:layout_gravity="center_horizontal"
14+
android:baselineAligned="false"
1415
android:orientation="horizontal" >
15-
16-
<LinearLayout
17-
android:layout_width="wrap_content"
18-
android:layout_height="150dp"
19-
android:layout_gravity="left"
20-
android:layout_weight="0.50"
21-
android:orientation="vertical" >
2216

2317
<LinearLayout
24-
android:id="@+id/row1"
25-
android:layout_width="match_parent"
26-
android:layout_height="wrap_content"
27-
android:layout_margin="10dp"
28-
android:orientation="horizontal" >
29-
30-
<TextView
31-
android:id="@+id/latitudeLabel"
32-
android:layout_width="50dp"
18+
android:layout_width="wrap_content"
19+
android:layout_height="fill_parent"
20+
android:layout_gravity="left"
21+
android:orientation="vertical" >
22+
23+
<LinearLayout
24+
android:id="@+id/row1"
25+
android:layout_width="match_parent"
3326
android:layout_height="wrap_content"
34-
android:text="@string/lat"
35-
android:textAppearance="?android:attr/textAppearanceLarge" />
36-
37-
<EditText
38-
android:id="@+id/latitudeField"
27+
android:layout_margin="10dp"
28+
android:orientation="horizontal" >
29+
30+
<TextView
31+
android:id="@+id/latitudeLabel"
32+
android:layout_width="50dp"
33+
android:layout_height="wrap_content"
34+
android:text="@string/lat"
35+
android:textAppearance="?android:attr/textAppearanceLarge" />
36+
37+
<EditText
38+
android:id="@+id/latitudeField"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
android:inputType="numberDecimal"
42+
android:text="@string/defaultLat" />
43+
</LinearLayout>
44+
45+
<LinearLayout
46+
android:id="@+id/row2"
3947
android:layout_width="match_parent"
4048
android:layout_height="wrap_content"
41-
android:inputType="numberDecimal"
42-
android:text="@string/defaultLat" />
49+
android:layout_gravity="left"
50+
android:layout_margin="10dp" >
51+
52+
<TextView
53+
android:id="@+id/longitudeLabel"
54+
android:layout_width="50dp"
55+
android:layout_height="wrap_content"
56+
android:text="@string/lon"
57+
android:textAppearance="?android:attr/textAppearanceLarge" />
4358

59+
<EditText
60+
android:id="@+id/longitudeField"
61+
android:layout_width="match_parent"
62+
android:layout_height="wrap_content"
63+
android:inputType="numberDecimal"
64+
android:text="@string/defaultLon" >
65+
</EditText>
66+
</LinearLayout>
4467
</LinearLayout>
45-
68+
4669
<LinearLayout
47-
android:id="@+id/row2"
70+
android:id="@+id/row3"
4871
android:layout_width="match_parent"
49-
android:layout_height="wrap_content"
50-
android:layout_gravity="left"
51-
android:layout_margin="10dp" >
52-
53-
<TextView
54-
android:id="@+id/longitudeLabel"
55-
android:layout_width="50dp"
56-
android:layout_height="wrap_content"
57-
android:text="@string/lon"
58-
android:textAppearance="?android:attr/textAppearanceLarge" />
59-
60-
<EditText
61-
android:id="@+id/longitudeField"
62-
android:layout_width="match_parent"
63-
android:layout_height="wrap_content"
64-
android:inputType="numberDecimal"
65-
android:text="@string/defaultLon" >
72+
android:layout_height="150dp"
73+
android:gravity="right"
74+
android:orientation="vertical" >
6675

67-
</EditText>
68-
</LinearLayout>
69-
</LinearLayout>
70-
71-
<LinearLayout
72-
android:id="@+id/row3"
73-
android:layout_width="wrap_content"
74-
android:layout_height="150dp"
75-
android:gravity="right"
76-
android:orientation="vertical"
77-
android:layout_weight="0.5">
7876
<Button
7977
android:id="@+id/locationBtn"
8078
style="@android:color/transparent"
8179
android:layout_width="fill_parent"
82-
android:layout_height="fill_parent"
83-
android:text="@string/location_btn"
84-
android:layout_weight="0.50" />
80+
android:layout_height="0dip"
81+
android:layout_weight="0.5"
82+
android:text="@string/location_btn" />
83+
8584
<Button
8685
android:id="@+id/locationSave"
8786
style="@android:color/transparent"
8887
android:layout_width="fill_parent"
89-
android:layout_height="fill_parent"
90-
android:text="@string/saveLocation"
91-
android:layout_weight="0.50"/>
88+
android:layout_height="0dip"
89+
android:layout_weight="0.5"
90+
android:text="@string/saveLocation" />
91+
</LinearLayout>
9292
</LinearLayout>
93-
</LinearLayout>
94-
95-
<LinearLayout
96-
android:layout_width="fill_parent"
97-
android:layout_height="0dp"
98-
android:gravity="right"
99-
android:orientation="horizontal"
100-
android:layout_weight="0.5">
10193

102-
<Button
103-
android:id="@+id/connectWithTelescope"
104-
android:layout_width="0dp"
105-
android:layout_height="match_parent"
106-
android:text="@string/bt_connect_with_telescope"
107-
android:layout_weight="0.5"/>
108-
109-
<Button
110-
android:id="@+id/disconnectWithTelescope"
111-
android:layout_width="0dp"
112-
android:layout_height="match_parent"
113-
android:text="@string/bt_disconnect_with_telescope"
114-
android:layout_weight="0.5"/>
115-
116-
</LinearLayout>
117-
<EditText
118-
android:id="@+id/log"
119-
android:layout_width="match_parent"
94+
<LinearLayout
95+
android:layout_width="fill_parent"
12096
android:layout_height="wrap_content"
121-
android:ems="10"
122-
android:inputType="textMultiLine"
123-
android:layout_weight="0.5">
97+
android:gravity="right"
98+
android:orientation="horizontal" >
12499

125-
<requestFocus />
126-
</EditText>
100+
<Button
101+
android:id="@+id/connectWithTelescope"
102+
android:layout_width="0dp"
103+
android:layout_height="match_parent"
104+
android:layout_weight="0.5"
105+
android:text="@string/bt_connect_with_telescope" />
127106

107+
<Button
108+
android:id="@+id/disconnectWithTelescope"
109+
android:layout_width="0dp"
110+
android:layout_height="match_parent"
111+
android:layout_weight="0.5"
112+
android:text="@string/bt_disconnect_with_telescope" />
113+
</LinearLayout>
128114
</LinearLayout>

0 commit comments

Comments
 (0)