Skip to content

Commit

Permalink
Fix control issues, icons, preferences, and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtbii
mtbii committed May 15, 2016
1 parent 3a70f5e commit 93b4377
Show file tree
Hide file tree
Showing 16 changed files with 864 additions and 964 deletions.
2 changes: 1 addition & 1 deletion src/android_foo/.idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions src/android_foo/.idea/inspectionProfiles/Project_Default.xml
View file

This file was deleted.

7 changes: 0 additions & 7 deletions src/android_foo/.idea/inspectionProfiles/profiles_settings.xml
View file

This file was deleted.

6 changes: 3 additions & 3 deletions src/android_foo/.idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,609 changes: 756 additions & 853 deletions src/android_foo/.idea/workspace.xml
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/android_foo/control_app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.2.0'
compile 'com.android.support:cardview-v7:23.2.0'
compile 'com.android.support:recyclerview-v7:23.2.0'
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
compile 'org.osmdroid:osmdroid-android:5.2@aar'
compile 'com.github.MKergall:osmbonuspack:v5.8.1'
compile(name:'osmbonuspack_v5.8.1', ext:'aar')
compile 'org.apache.commons:commons-lang3:3.3.2'
compile 'com.squareup.okhttp:okhttp:2.6.0'
compile 'com.android.support:support-v4:23.2.0'
compile 'com.github.amlcurran.showcaseview:library:5.4.1'
compile project(':control_app_lib')
Expand Down
Binary file added src/android_foo/control_app/libs/osmbonuspack_v5.8.1.aar
View file
Binary file not shown.
20 changes: 10 additions & 10 deletions src/android_foo/control_app/src/main/java/com/robotca/ControlApp/Core/RobotStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ public static synchronized void load(Activity activity) {

RobotInfo.resolveRobotCount(g_cRobotInfos);

g_cPrefKeyMap.put(activity.getString(R.string.prefs_joystick_topic_edittext_key), RobotInfo.JOYSTICK_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_camera_topic_edittext_key), RobotInfo.CAMERA_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_laserscan_topic_edittext_key), RobotInfo.LASER_SCAN_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_navsat_topic_edittext_key), RobotInfo.NAVSAT_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_odometry_topic_edittext_key), RobotInfo.ODOMETRY_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_pose_topic_edittext_key), RobotInfo.POSE_TOPIC_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_reverse_angle_reading_key), RobotInfo.REVERSE_LASER_SCAN_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_x_axis_key), RobotInfo.INVERT_X_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_y_axis_key), RobotInfo.INVERT_Y_KEY);
g_cPrefKeyMap.put(activity.getString(R.string.prefs_invert_angular_velocity_key), RobotInfo.INVERT_ANGULAR_VELOCITY_KEY);
g_cPrefKeyMap.put(RobotInfo.JOYSTICK_TOPIC_KEY, activity.getString(R.string.prefs_joystick_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.CAMERA_TOPIC_KEY, activity.getString(R.string.prefs_camera_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.LASER_SCAN_TOPIC_KEY, activity.getString(R.string.prefs_laserscan_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.NAVSAT_TOPIC_KEY, activity.getString(R.string.prefs_navsat_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.ODOMETRY_TOPIC_KEY, activity.getString(R.string.prefs_odometry_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.POSE_TOPIC_KEY, activity.getString(R.string.prefs_pose_topic_edittext_key));
g_cPrefKeyMap.put(RobotInfo.REVERSE_LASER_SCAN_KEY, activity.getString(R.string.prefs_reverse_angle_reading_key));
g_cPrefKeyMap.put(RobotInfo.INVERT_X_KEY, activity.getString(R.string.prefs_invert_x_axis_key));
g_cPrefKeyMap.put(RobotInfo.INVERT_Y_KEY, activity.getString(R.string.prefs_invert_y_axis_key));
g_cPrefKeyMap.put(RobotInfo.INVERT_ANGULAR_VELOCITY_KEY, activity.getString(R.string.prefs_invert_angular_velocity_key));
}

public static String getPreferenceKey(String bundleKey) {
Expand Down
Binary file added ..._foo/control_app/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ..._foo/control_app/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...foo/control_app/src/main/res/drawable-xhdpi/ic_settings_ethernet_black_24dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...oo/control_app/src/main/res/drawable-xxhdpi/ic_settings_ethernet_black_24dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...o/control_app/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_black_24dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
143 changes: 70 additions & 73 deletions src/android_foo/control_app/src/main/res/layout/dialog_add_robot.xml
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/robot_name_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginEnd="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="4dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/robot_name"
android:textStyle="bold" />

<EditText
android:id="@+id/robot_name_edit_text"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_toEndOf="@id/robot_name_textview"
android:layout_toRightOf="@id/robot_name_textview"
android:hint="@string/robot_name_hint"
android:singleLine="true" />

<TextView
android:id="@+id/robot_masteruri_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/robot_name_textview"
android:layout_marginBottom="4dp"
android:layout_marginEnd="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="4dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/master_uri"
android:textStyle="bold" />

<EditText
android:id="@+id/master_uri_edit_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/robot_name_edit_text"
android:layout_alignStart="@+id/robot_name_edit_text"
android:layout_below="@id/robot_name_textview"
android:layout_marginBottom="16dp"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_toEndOf="@id/robot_masteruri_textview"
android:layout_toRightOf="@id/robot_masteruri_textview"
android:hint="@string/chooser_uri_hint"
android:inputType="textUri"
android:singleLine="true" />

<CheckBox
android:id="@+id/advanced_options_checkbox_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/master_uri_edit_view"
android:text="@string/show_advanced_options" />
android:layout_height="match_parent">

<ScrollView
android:id="@+id/advanced_options_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/advanced_options_checkbox_view"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/robot_name_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginEnd="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="4dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/robot_name"
android:textStyle="bold" />
<EditText
android:id="@+id/robot_name_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_toEndOf="@id/robot_name_textview"
android:layout_toRightOf="@id/robot_name_textview"
android:hint="@string/robot_name_hint"
android:singleLine="true" />

<TextView
android:id="@+id/robot_masteruri_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/robot_name_textview"
android:layout_marginBottom="4dp"
android:layout_marginEnd="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="4dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="@string/master_uri"
android:textStyle="bold" />
<EditText
android:id="@+id/master_uri_edit_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/robot_name_edit_text"
android:layout_alignStart="@+id/robot_name_edit_text"
android:layout_below="@id/robot_name_textview"
android:layout_marginBottom="16dp"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_toEndOf="@id/robot_masteruri_textview"
android:layout_toRightOf="@id/robot_masteruri_textview"
android:hint="@string/chooser_uri_hint"
android:inputType="textUri"
android:singleLine="true" />

<CheckBox
android:id="@+id/advanced_options_checkbox_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/master_uri_edit_view"
android:text="@string/show_advanced_options" />

<LinearLayout
android:id="@+id/advanced_options_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/advanced_options_checkbox_view"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -308,5 +305,5 @@
android:singleLine="true" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>
</RelativeLayout>
</ScrollView>
24 changes: 20 additions & 4 deletions src/android_foo/control_app/src/main/res/raw/about.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
.subheader{
padding: 0;
margin: 0;
}
</style>
</head>
<body style="background-color:#00000000">

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

<hr>

<h5><font color="#000044">Developed By:</font></h5>
<h4 class="subheader"><font color="#000044">Developed By:</font></h4>
<i>
&emsp;Michael Brunson<br>
&emsp;Kenneth Spear<br>
&emsp;Nathaniel Stone<br>
&emsp;Cam Stewart<br>
&emsp;Zipporah Lighty<br>
</i>
<br>
<br>

<hr>
<h4 class="subheader"><font color="#000044">Open Source Dependencies:</font></h4>
<span>
&emsp;<a href="https://github.com/google/gson">Gson</a><br>
&emsp;<a href="https://github.com/ros">ROS</a><br>
&emsp;<a href="https://github.com/rosjava">rosjava</a><br>
&emsp;<a href="https://github.com/osmdroid/osmdroid">osmdroid (OpenStreetMap)</a><br>
&emsp;<a href="https://github.com/MKergall/osmbonuspack">osmbonuspack</a><br>
&emsp;<a href="https://github.com/amlcurran/ShowcaseView">ShowcaseView</a><br>
</span>
<hr/>
</body>
</html>
2 changes: 1 addition & 1 deletion src/android_foo/control_app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<string name="reverse_angle_reading_title">Invert Laser Scan</string>
<string name="prefs_reverse_angle_reading_key">prefs_reverse_angle_reading_key</string>
<string name="prefs_invert_x_axis_key">prefs_invert_x_axis_key</string>
<string name="prefs_invert_angular_velocity_key">prefs_invert_y_axis_key</string>
<string name="prefs_invert_angular_velocity_key">prefs_invert_angular_velocity_key</string>
<string name="invert_angular_velocity_summary">Invert angular velocity driving direction</string>
<string name="invert_x_axis_summary">Invert X-Axis driving direction</string>
<string name="invert_x_axis_title">Invert X-Axis</string>
Expand Down

0 comments on commit 93b4377

Please sign in to comment.