Skip to content

Commit 93b4377

Browse files
mtbiimtbii
committed
Fix control issues, icons, preferences, and dependencies
1 parent 3a70f5e commit 93b4377

File tree

16 files changed

+864
-964
lines changed

16 files changed

+864
-964
lines changed

‎src/android_foo/.idea/gradle.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/android_foo/.idea/inspectionProfiles/Project_Default.xml

-10
This file was deleted.

‎src/android_foo/.idea/inspectionProfiles/profiles_settings.xml

-7
This file was deleted.

‎src/android_foo/.idea/misc.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/android_foo/.idea/workspace.xml

+756-853
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/android_foo/control_app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ dependencies {
4848
compile 'com.android.support:appcompat-v7:23.2.0'
4949
compile 'com.android.support:cardview-v7:23.2.0'
5050
compile 'com.android.support:recyclerview-v7:23.2.0'
51-
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
5251
compile 'org.osmdroid:osmdroid-android:5.2@aar'
53-
compile 'com.github.MKergall:osmbonuspack:v5.8.1'
52+
compile(name:'osmbonuspack_v5.8.1', ext:'aar')
53+
compile 'org.apache.commons:commons-lang3:3.3.2'
54+
compile 'com.squareup.okhttp:okhttp:2.6.0'
5455
compile 'com.android.support:support-v4:23.2.0'
5556
compile 'com.github.amlcurran.showcaseview:library:5.4.1'
5657
compile project(':control_app_lib')

‎src/android_foo/control_app/libs/osmbonuspack_v5.8.1.aar

158 KB
Binary file not shown.

‎src/android_foo/control_app/src/main/java/com/robotca/ControlApp/Core/RobotStorage.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ public static synchronized void load(Activity activity) {
4848

4949
RobotInfo.resolveRobotCount(g_cRobotInfos);
5050

51-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_joystick_topic_edittext_key), RobotInfo.JOYSTICK_TOPIC_KEY);
52-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_camera_topic_edittext_key), RobotInfo.CAMERA_TOPIC_KEY);
53-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_laserscan_topic_edittext_key), RobotInfo.LASER_SCAN_TOPIC_KEY);
54-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_navsat_topic_edittext_key), RobotInfo.NAVSAT_TOPIC_KEY);
55-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_odometry_topic_edittext_key), RobotInfo.ODOMETRY_TOPIC_KEY);
56-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_pose_topic_edittext_key), RobotInfo.POSE_TOPIC_KEY);
57-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_reverse_angle_reading_key), RobotInfo.REVERSE_LASER_SCAN_KEY);
58-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_x_axis_key), RobotInfo.INVERT_X_KEY);
59-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_y_axis_key), RobotInfo.INVERT_Y_KEY);
60-
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_angular_velocity_key), RobotInfo.INVERT_ANGULAR_VELOCITY_KEY);
51+
g_cPrefKeyMap.put(RobotInfo.JOYSTICK_TOPIC_KEY, activity.getString(R.string.prefs_joystick_topic_edittext_key));
52+
g_cPrefKeyMap.put(RobotInfo.CAMERA_TOPIC_KEY, activity.getString(R.string.prefs_camera_topic_edittext_key));
53+
g_cPrefKeyMap.put(RobotInfo.LASER_SCAN_TOPIC_KEY, activity.getString(R.string.prefs_laserscan_topic_edittext_key));
54+
g_cPrefKeyMap.put(RobotInfo.NAVSAT_TOPIC_KEY, activity.getString(R.string.prefs_navsat_topic_edittext_key));
55+
g_cPrefKeyMap.put(RobotInfo.ODOMETRY_TOPIC_KEY, activity.getString(R.string.prefs_odometry_topic_edittext_key));
56+
g_cPrefKeyMap.put(RobotInfo.POSE_TOPIC_KEY, activity.getString(R.string.prefs_pose_topic_edittext_key));
57+
g_cPrefKeyMap.put(RobotInfo.REVERSE_LASER_SCAN_KEY, activity.getString(R.string.prefs_reverse_angle_reading_key));
58+
g_cPrefKeyMap.put(RobotInfo.INVERT_X_KEY, activity.getString(R.string.prefs_invert_x_axis_key));
59+
g_cPrefKeyMap.put(RobotInfo.INVERT_Y_KEY, activity.getString(R.string.prefs_invert_y_axis_key));
60+
g_cPrefKeyMap.put(RobotInfo.INVERT_ANGULAR_VELOCITY_KEY, activity.getString(R.string.prefs_invert_angular_velocity_key));
6161
}
6262

6363
public static String getPreferenceKey(String bundleKey) {

‎src/android_foo/control_app/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png

350 Bytes
Loading

‎src/android_foo/control_app/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png

253 Bytes
Loading

‎src/android_foo/control_app/src/main/res/drawable-xhdpi/ic_settings_ethernet_black_24dp.png

447 Bytes
Loading

‎src/android_foo/control_app/src/main/res/drawable-xxhdpi/ic_settings_ethernet_black_24dp.png

649 Bytes
Loading

‎src/android_foo/control_app/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_black_24dp.png

894 Bytes
Loading

‎src/android_foo/control_app/src/main/res/layout/dialog_add_robot.xml

+70-73
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,84 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:orientation="vertical">
66

7-
<TextView
8-
android:id="@+id/robot_name_textview"
9-
android:layout_width="wrap_content"
10-
android:layout_height="wrap_content"
11-
android:layout_marginBottom="4dp"
12-
android:layout_marginEnd="4dp"
13-
android:layout_marginLeft="8dp"
14-
android:layout_marginRight="4dp"
15-
android:layout_marginStart="8dp"
16-
android:layout_marginTop="16dp"
17-
android:text="@string/robot_name"
18-
android:textStyle="bold" />
19-
20-
<EditText
21-
android:id="@+id/robot_name_edit_text"
7+
<RelativeLayout
228
android:layout_width="match_parent"
23-
android:layout_height="wrap_content"
24-
android:layout_marginBottom="4dp"
25-
android:layout_marginLeft="4dp"
26-
android:layout_marginRight="4dp"
27-
android:layout_marginTop="4dp"
28-
android:layout_toEndOf="@id/robot_name_textview"
29-
android:layout_toRightOf="@id/robot_name_textview"
30-
android:hint="@string/robot_name_hint"
31-
android:singleLine="true" />
32-
33-
<TextView
34-
android:id="@+id/robot_masteruri_textview"
35-
android:layout_width="wrap_content"
36-
android:layout_height="wrap_content"
37-
android:layout_below="@id/robot_name_textview"
38-
android:layout_marginBottom="4dp"
39-
android:layout_marginEnd="4dp"
40-
android:layout_marginLeft="8dp"
41-
android:layout_marginRight="4dp"
42-
android:layout_marginStart="8dp"
43-
android:layout_marginTop="16dp"
44-
android:text="@string/master_uri"
45-
android:textStyle="bold" />
46-
47-
<EditText
48-
android:id="@+id/master_uri_edit_view"
49-
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:layout_alignLeft="@+id/robot_name_edit_text"
52-
android:layout_alignStart="@+id/robot_name_edit_text"
53-
android:layout_below="@id/robot_name_textview"
54-
android:layout_marginBottom="16dp"
55-
android:layout_marginEnd="4dp"
56-
android:layout_marginRight="4dp"
57-
android:layout_marginTop="4dp"
58-
android:layout_toEndOf="@id/robot_masteruri_textview"
59-
android:layout_toRightOf="@id/robot_masteruri_textview"
60-
android:hint="@string/chooser_uri_hint"
61-
android:inputType="textUri"
62-
android:singleLine="true" />
63-
64-
<CheckBox
65-
android:id="@+id/advanced_options_checkbox_view"
66-
android:layout_width="match_parent"
67-
android:layout_height="wrap_content"
68-
android:layout_below="@id/master_uri_edit_view"
69-
android:text="@string/show_advanced_options" />
9+
android:layout_height="match_parent">
7010

71-
<ScrollView
72-
android:id="@+id/advanced_options_view"
73-
android:layout_width="match_parent"
74-
android:layout_height="match_parent"
75-
android:layout_below="@id/advanced_options_checkbox_view"
76-
android:orientation="vertical"
77-
android:visibility="gone">
11+
<TextView
12+
android:id="@+id/robot_name_textview"
13+
android:layout_width="wrap_content"
14+
android:layout_height="wrap_content"
15+
android:layout_marginBottom="4dp"
16+
android:layout_marginEnd="4dp"
17+
android:layout_marginLeft="8dp"
18+
android:layout_marginRight="4dp"
19+
android:layout_marginStart="8dp"
20+
android:layout_marginTop="16dp"
21+
android:text="@string/robot_name"
22+
android:textStyle="bold" />
23+
<EditText
24+
android:id="@+id/robot_name_edit_text"
25+
android:layout_width="match_parent"
26+
android:layout_height="wrap_content"
27+
android:layout_marginBottom="4dp"
28+
android:layout_marginLeft="4dp"
29+
android:layout_marginRight="4dp"
30+
android:layout_marginTop="4dp"
31+
android:layout_toEndOf="@id/robot_name_textview"
32+
android:layout_toRightOf="@id/robot_name_textview"
33+
android:hint="@string/robot_name_hint"
34+
android:singleLine="true" />
35+
36+
<TextView
37+
android:id="@+id/robot_masteruri_textview"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:layout_below="@id/robot_name_textview"
41+
android:layout_marginBottom="4dp"
42+
android:layout_marginEnd="4dp"
43+
android:layout_marginLeft="8dp"
44+
android:layout_marginRight="4dp"
45+
android:layout_marginStart="8dp"
46+
android:layout_marginTop="16dp"
47+
android:text="@string/master_uri"
48+
android:textStyle="bold" />
49+
<EditText
50+
android:id="@+id/master_uri_edit_view"
51+
android:layout_width="match_parent"
52+
android:layout_height="wrap_content"
53+
android:layout_alignLeft="@+id/robot_name_edit_text"
54+
android:layout_alignStart="@+id/robot_name_edit_text"
55+
android:layout_below="@id/robot_name_textview"
56+
android:layout_marginBottom="16dp"
57+
android:layout_marginEnd="4dp"
58+
android:layout_marginRight="4dp"
59+
android:layout_marginTop="4dp"
60+
android:layout_toEndOf="@id/robot_masteruri_textview"
61+
android:layout_toRightOf="@id/robot_masteruri_textview"
62+
android:hint="@string/chooser_uri_hint"
63+
android:inputType="textUri"
64+
android:singleLine="true" />
65+
66+
<CheckBox
67+
android:id="@+id/advanced_options_checkbox_view"
68+
android:layout_width="match_parent"
69+
android:layout_height="wrap_content"
70+
android:layout_below="@id/master_uri_edit_view"
71+
android:text="@string/show_advanced_options" />
7872

7973
<LinearLayout
74+
android:id="@+id/advanced_options_view"
8075
android:layout_width="match_parent"
8176
android:layout_height="wrap_content"
77+
android:layout_below="@id/advanced_options_checkbox_view"
8278
android:layout_marginLeft="8dp"
8379
android:layout_marginStart="8dp"
84-
android:orientation="vertical">
80+
android:orientation="vertical"
81+
android:visibility="gone">
8582

8683
<LinearLayout
8784
android:layout_width="match_parent"
@@ -308,5 +305,5 @@
308305
android:singleLine="true" />
309306
</LinearLayout>
310307
</LinearLayout>
311-
</ScrollView>
312-
</RelativeLayout>
308+
</RelativeLayout>
309+
</ScrollView>

‎src/android_foo/control_app/src/main/res/raw/about.html

+20-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<!DOCTYPE html>
22
<html>
3+
<head>
4+
<style type="text/css">
5+
.subheader{
6+
padding: 0;
7+
margin: 0;
8+
}
9+
</style>
10+
</head>
311
<body style="background-color:#00000000">
412

513
<h1 style="background-color:#000044;color:white">&nbsp;About ROS Control</h1>
@@ -11,16 +19,24 @@ <h1 style="background-color:#000044;color:white">&nbsp;About ROS Control</h1>
1119

1220
<hr>
1321

14-
<h5><font color="#000044">Developed By:</font></h5>
22+
<h4 class="subheader"><font color="#000044">Developed By:</font></h4>
1523
<i>
1624
&emsp;Michael Brunson<br>
1725
&emsp;Kenneth Spear<br>
1826
&emsp;Nathaniel Stone<br>
1927
&emsp;Cam Stewart<br>
2028
&emsp;Zipporah Lighty<br>
2129
</i>
22-
<br>
23-
<br>
24-
30+
<hr>
31+
<h4 class="subheader"><font color="#000044">Open Source Dependencies:</font></h4>
32+
<span>
33+
&emsp;<a href="https://github.com/google/gson">Gson</a><br>
34+
&emsp;<a href="https://github.com/ros">ROS</a><br>
35+
&emsp;<a href="https://github.com/rosjava">rosjava</a><br>
36+
&emsp;<a href="https://github.com/osmdroid/osmdroid">osmdroid (OpenStreetMap)</a><br>
37+
&emsp;<a href="https://github.com/MKergall/osmbonuspack">osmbonuspack</a><br>
38+
&emsp;<a href="https://github.com/amlcurran/ShowcaseView">ShowcaseView</a><br>
39+
</span>
40+
<hr/>
2541
</body>
2642
</html>

‎src/android_foo/control_app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<string name="reverse_angle_reading_title">Invert Laser Scan</string>
172172
<string name="prefs_reverse_angle_reading_key">prefs_reverse_angle_reading_key</string>
173173
<string name="prefs_invert_x_axis_key">prefs_invert_x_axis_key</string>
174-
<string name="prefs_invert_angular_velocity_key">prefs_invert_y_axis_key</string>
174+
<string name="prefs_invert_angular_velocity_key">prefs_invert_angular_velocity_key</string>
175175
<string name="invert_angular_velocity_summary">Invert angular velocity driving direction</string>
176176
<string name="invert_x_axis_summary">Invert X-Axis driving direction</string>
177177
<string name="invert_x_axis_title">Invert X-Axis</string>

0 commit comments

Comments
 (0)