Skip to content

Commit 13fac1f

Browse files
author
mandimastro
committed
Notifications implemented
New components added (disconnect button and log)
1 parent 83792b0 commit 13fac1f

File tree

6 files changed

+302
-209
lines changed

6 files changed

+302
-209
lines changed

‎HipparchusAndroid/res/layout/settings_layout.xml‎

Lines changed: 105 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -5,78 +5,124 @@
55
android:layout_height="match_parent"
66
android:layout_gravity="center_horizontal"
77
android:orientation="vertical" >
8-
8+
99
<LinearLayout
10-
android:id="@+id/row1"
11-
android:layout_width="fill_parent"
12-
android:layout_height="wrap_content"
10+
xmlns:android="http://schemas.android.com/apk/res/android"
11+
android:layout_width="match_parent"
12+
android:layout_height="155dp"
1313
android:layout_gravity="center_horizontal"
14-
android:layout_margin="10dp" >
14+
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" >
1522

16-
<TextView
17-
android:id="@+id/latitudeLabel"
18-
android:layout_width="0dp"
19-
android:layout_height="wrap_content"
20-
android:layout_weight="1"
21-
android:text="@string/lat"
22-
android:textAppearance="?android:attr/textAppearanceLarge" />
23+
<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"
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" />
2343

24-
<EditText
25-
android:id="@+id/latitudeField"
26-
android:layout_width="0dp"
44+
</LinearLayout>
45+
46+
<LinearLayout
47+
android:id="@+id/row2"
48+
android:layout_width="match_parent"
2749
android:layout_height="wrap_content"
28-
android:layout_weight="1.5"
29-
android:inputType="numberDecimal"
30-
android:text="@string/defaultLat">
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" >
3166

32-
<requestFocus />
33-
</EditText>
67+
</EditText>
68+
</LinearLayout>
3469
</LinearLayout>
35-
70+
3671
<LinearLayout
37-
android:id="@+id/row2"
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">
78+
<Button
79+
android:id="@+id/locationBtn"
80+
style="@android:color/transparent"
81+
android:layout_width="fill_parent"
82+
android:layout_height="fill_parent"
83+
android:text="@string/location_btn"
84+
android:layout_weight="0.50" />
85+
<Button
86+
android:id="@+id/locationSave"
87+
style="@android:color/transparent"
88+
android:layout_width="fill_parent"
89+
android:layout_height="fill_parent"
90+
android:text="@string/saveLocation"
91+
android:layout_weight="0.50"/>
92+
</LinearLayout>
93+
</LinearLayout>
94+
95+
<LinearLayout
3896
android:layout_width="fill_parent"
39-
android:layout_height="wrap_content"
40-
android:layout_gravity="center_horizontal"
41-
android:layout_margin="10dp" >
97+
android:layout_height="0dp"
98+
android:gravity="right"
99+
android:orientation="horizontal"
100+
android:layout_weight="0.5">
42101

43-
<TextView
44-
android:id="@+id/longitudeLabel"
45-
android:layout_width="0dp"
46-
android:layout_height="wrap_content"
47-
android:layout_weight="1"
48-
android:text="@string/lon"
49-
android:textAppearance="?android:attr/textAppearanceLarge" />
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"/>
50115

51-
<EditText
52-
android:id="@+id/longitudeField"
53-
android:layout_width="0dp"
54-
android:layout_height="wrap_content"
55-
android:layout_weight="1.5"
56-
android:inputType="numberDecimal"
57-
android:text="@string/defaultLon" >
58-
</EditText>
59116
</LinearLayout>
60-
61-
<LinearLayout
62-
android:id="@+id/row3"
63-
android:layout_width="wrap_content"
117+
<EditText
118+
android:id="@+id/log"
119+
android:layout_width="match_parent"
64120
android:layout_height="wrap_content"
65-
android:layout_gravity="center_horizontal" >
66-
67-
<Button
68-
android:id="@+id/locationBtn"
69-
style="@android:color/transparent"
70-
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
android:text="@string/location_btn" />
121+
android:ems="10"
122+
android:inputType="textMultiLine"
123+
android:layout_weight="0.5">
73124

74-
<Button
75-
android:id="@+id/locationSave"
76-
style="@android:color/transparent"
77-
android:layout_width="wrap_content"
78-
android:layout_height="wrap_content"
79-
android:text="@string/saveLocation" />
80-
</LinearLayout>
125+
<requestFocus />
126+
</EditText>
81127

82128
</LinearLayout>

‎HipparchusAndroid/res/values/strings.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<resources>
33
<string name="bt_reconnect">Connect To Telescope</string>
44
<string name="location_btn">Update location</string>
5-
<string name="lon">Longitude:</string>
6-
<string name="lat">Latitude:</string>
5+
<string name="lon">Lon:</string>
6+
<string name="lat">Lat:</string>
77
<string name="starAlignment">Two Star Alignment</string>
88
<string name="saveLocation">Save</string>
99
<string name="locateFirstStarLabel">Locate First Star</string>
@@ -16,5 +16,7 @@
1616
<string name="selectStar">Select</string>
1717
<string name="defaultLat">35.3330</string>
1818
<string name="defaultLon">25.1330</string>
19-
<string name="not_connected">You are not connected to a device</string>
19+
<string name="not_connected">You are not connected to a device</string>
20+
<string name="bt_connect_with_telescope">Connect with telescope</string>
21+
<string name="bt_disconnect_with_telescope">Disconnect</string>
2022
</resources>

0 commit comments

Comments
 (0)