Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplified Enabler UI #92

Closed
wants to merge 4 commits into from
Closed

Simplified Enabler UI #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6551648
Replaced 'Service Status' with warning bar that only shows when Vehic…
nathorne Nov 12, 2013
d6b27b1
Added methods and UI elements to display icons for type of Vehicle Co…
nathorne Nov 13, 2013
fe0b7fb
Added logic to display icons based on the service connected.
nathorne Nov 13, 2013
6bafde7
Added 'None' connected status and new file source icon.
nathorne Nov 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added enabler/res/drawable/bluetooth_white.png
View file
Open in desktop
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 enabler/res/drawable/network_white.png
View file
Open in desktop
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 enabler/res/drawable/play_from_file_white.png
View file
Open in desktop
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 enabler/res/drawable/questionmark_white.png
View file
Open in desktop
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 enabler/res/drawable/usb_white.png
View file
Open in desktop
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 enabler/res/drawable/warning.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 55 additions & 36 deletions enabler/res/layout-land/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,64 @@
android:paddingRight="5sp"
android:orientation="vertical">

<LinearLayout
android:id="@+id/service_not_running_bar"
style="@style/WarningBar">
<ImageView
style="@style/WarningImage"
android:contentDescription="@string/warning"
android:src="@drawable/warning"/>
<TextView
style="@style/WarningText"
android:text="@string/service_not_running"/>
</LinearLayout>

<TextView
style="@style/SectionHeader"
android:layout_marginTop="0sp"
android:text="@string/status_label"/>
<LinearLayout
style="@style/ItemRow" >

<TextView
style="@style/ItemLabel"
android:text="@string/vehicle_service_status_label"/>
<TextView
android:id="@+id/vehicle_service_status"
style="@style/ItemData"/>
</LinearLayout>
android:text="@string/status_label"/>

<LinearLayout
style="@style/ItemRow">
<TextView
style="@style/ItemLabel"
android:text="@string/active_connections"/>
<LinearLayout
android:id="@+id/connection_status"
style="@style/ItemData"
android:orientation="horizontal">
<ImageView
android:id="@+id/connection_unknown"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_unknown"
android:src="@drawable/questionmark_white"/>
<ImageView
android:id="@+id/connection_file"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_file"
android:src="@drawable/play_from_file_white"/>
<ImageView
android:id="@+id/connection_bluetooth"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_bluetooth"
android:src="@drawable/bluetooth_white"/>
<ImageView
android:id="@+id/connection_network"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_network"
android:src="@drawable/network_white"/>
<ImageView
android:id="@+id/connection_usb"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_usb"
android:src="@drawable/usb_white"/>
<TextView
android:id="@+id/connection_none"
android:text="@string/connection_none"
style="@style/ItemDataRedBold"/>
</LinearLayout>
</LinearLayout>

<LinearLayout
style="@style/ItemRow" >

Expand All @@ -31,29 +75,4 @@
style="@style/ItemData"/>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
style="@style/HorizontallyStackedScroller">
<TextView
style="@style/SectionHeader"
android:text="@string/source_list_label"/>
<ListView
android:id="@+id/source_list"
style="@style/DefaultFont" />
</LinearLayout>
<LinearLayout
style="@style/HorizontallyStackedScroller">
<TextView
style="@style/SectionHeader"
android:text="@string/sink_list_label" />
<ListView
android:id="@+id/sink_list"
style="@style/DefaultFont" />
</LinearLayout>
</LinearLayout>

</LinearLayout>
87 changes: 56 additions & 31 deletions enabler/res/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,64 @@
android:paddingRight="5sp"
android:orientation="vertical">

<LinearLayout
android:id="@+id/service_not_running_bar"
style="@style/WarningBar">
<ImageView
style="@style/WarningImage"
android:contentDescription="@string/warning"
android:src="@drawable/warning"/>
<TextView
style="@style/WarningText"
android:text="@string/service_not_running"/>
</LinearLayout>

<TextView
style="@style/SectionHeader"
android:layout_marginTop="0sp"
android:text="@string/status_label"/>
<LinearLayout
style="@style/ItemRow" >

<TextView
style="@style/ItemLabel"
android:text="@string/vehicle_service_status_label"/>
<TextView
android:id="@+id/vehicle_service_status"
style="@style/ItemData"/>
</LinearLayout>
android:text="@string/status_label"/>

<LinearLayout
style="@style/ItemRow">
<TextView
style="@style/ItemLabel"
android:text="@string/active_connections"/>
<LinearLayout
android:id="@+id/connection_status"
style="@style/ItemData"
android:orientation="horizontal">
<ImageView
android:id="@+id/connection_unknown"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_unknown"
android:src="@drawable/questionmark_white"/>
<ImageView
android:id="@+id/connection_file"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_file"
android:src="@drawable/play_from_file_white"/>
<ImageView
android:id="@+id/connection_bluetooth"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_bluetooth"
android:src="@drawable/bluetooth_white"/>
<ImageView
android:id="@+id/connection_network"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_network"
android:src="@drawable/network_white"/>
<ImageView
android:id="@+id/connection_usb"
style="@style/ItemDataImage"
android:contentDescription="@string/connection_usb"
android:src="@drawable/usb_white"/>
<TextView
android:id="@+id/connection_none"
android:text="@string/connection_none"
style="@style/ItemDataRedBold"/>
</LinearLayout>
</LinearLayout>

<LinearLayout
style="@style/ItemRow" >

Expand All @@ -29,24 +73,5 @@
<TextView
android:id="@+id/message_count"
style="@style/ItemData"/>
</LinearLayout>

<LinearLayout
style="@style/VerticallyStackedScroller">
<TextView
style="@style/SectionHeader"
android:text="@string/source_list_label"/>
<ListView
android:id="@+id/source_list"
style="@style/DefaultFont" />
</LinearLayout>
<LinearLayout
style="@style/VerticallyStackedScroller">
<TextView
style="@style/SectionHeader"
android:text="@string/sink_list_label" />
<ListView
android:id="@+id/sink_list"
style="@style/DefaultFont" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
10 changes: 9 additions & 1 deletion enabler/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
<resources>
<string name="app_name">OpenXC Enabler</string>
<string name="status_label">Status</string>
<string name="vehicle_service_status_label">Vehicle Service: </string>
<string name="active_connections">Active Connections:</string>
<string name="recording_status_label">Recording Status: </string>
<string name="message_count_label">Messages Received: </string>
<string name="connection_unknown">Unknown</string>
<string name="connection_file">File</string>
<string name="connection_bluetooth">Bluetooth</string>
<string name="connection_usb">USB</string>
<string name="connection_network">Network</string>
<string name="connection_none">None</string>

<string name="settings">Settings</string>
<string name="recording_preferences">Recording</string>
Expand Down Expand Up @@ -44,4 +50,6 @@
<string name="application_version_title">Version</string>
<string name="application_version_summary">Version Number</string>
<string name="application_version_key">application_version</string>
<string name="service_not_running">VehicleService not running.</string>
<string name="warning">Warning</string>
</resources>
30 changes: 30 additions & 0 deletions enabler/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@
<item name="android:gravity">right</item>
</style>

<style name="ItemDataRedBold" parent="ItemData">
<item name="android:textColor">#ED1C1C</item>
<item name="android:textStyle">bold</item>
</style>

<style name="ItemDataImage">
<item name="android:layout_width">26sp</item>
<item name="android:layout_height">26sp</item>
<item name="android:padding">0sp</item>
<item name="android:visibility">gone</item>
</style>

<style name="VerticallyStackedScroller">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0dip</item>
Expand All @@ -50,5 +62,23 @@
<item name="android:orientation">vertical</item>
</style>

<!-- Warning Styles -->
<style name="WarningBar">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:minHeight">36sp</item>
<item name="android:orientation">horizontal</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="WarningImage">
<item name="android:layout_width">36sp</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="WarningText">
<item name="android:layout_width">0dip</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:textSize">20sp</item>
</style>

</resources>
32 changes: 20 additions & 12 deletions enabler/src/com/openxc/enabler/OpenXcEnablerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.ListView;
import android.view.View;
import android.widget.TextView;

import com.openxc.VehicleManager;
Expand Down Expand Up @@ -42,10 +42,14 @@
public class OpenXcEnablerActivity extends Activity {
private static String TAG = "OpenXcEnablerActivity";

private TextView mVehicleManagerStatusView;
private View mServiceNotRunningWarningView;
private TextView mMessageCountView;
private ListView mSourceListView;
private ListView mSinkListView;
private View mUnknownConnIV;
private View mBluetoothConnIV;
private View mUsbConnIV;
private View mNetworkConnIV;
private View mFileConnIV;
private View mNoneConnView;
private TimerTask mUpdateMessageCountTask;
private TimerTask mUpdatePipelineStatusTask;
private Timer mTimer;
Expand All @@ -63,7 +67,7 @@ public void run() {
mVehicleManager.waitUntilBound();
OpenXcEnablerActivity.this.runOnUiThread(new Runnable() {
public void run() {
mVehicleManagerStatusView.setText("Running");
mServiceNotRunningWarningView.setVisibility(View.GONE);
}
});
}
Expand All @@ -73,7 +77,8 @@ public void run() {
OpenXcEnablerActivity.this, mMessageCountView);
mUpdatePipelineStatusTask = new PipelineStatusUpdateTask(
mVehicleManager, OpenXcEnablerActivity.this,
mSourceListView, mSinkListView);
mUnknownConnIV, mFileConnIV, mNetworkConnIV,
mBluetoothConnIV, mUsbConnIV, mNoneConnView);
mTimer = new Timer();
mTimer.schedule(mUpdateMessageCountTask, 100, 1000);
mTimer.schedule(mUpdatePipelineStatusTask, 100, 1000);
Expand All @@ -84,7 +89,7 @@ public void onServiceDisconnected(ComponentName className) {
mVehicleManager = null;
OpenXcEnablerActivity.this.runOnUiThread(new Runnable() {
public void run() {
mVehicleManagerStatusView.setText("Not running");
mServiceNotRunningWarningView.setVisibility(View.VISIBLE);
}
});
}
Expand All @@ -99,15 +104,18 @@ public void onCreate(Bundle savedInstanceState) {
startService(new Intent(this, VehicleManager.class));
startService(new Intent(this, PreferenceManagerService.class));

mVehicleManagerStatusView = (TextView) findViewById(
R.id.vehicle_service_status);
mServiceNotRunningWarningView = findViewById(R.id.service_not_running_bar);
mMessageCountView = (TextView) findViewById(R.id.message_count);
mSourceListView = (ListView) findViewById(R.id.source_list);
mSinkListView = (ListView) findViewById(R.id.sink_list);
mBluetoothConnIV = findViewById(R.id.connection_bluetooth);
mUsbConnIV = findViewById(R.id.connection_usb);
mFileConnIV = findViewById(R.id.connection_file);
mNetworkConnIV = findViewById(R.id.connection_network);
mUnknownConnIV = findViewById(R.id.connection_unknown);
mNoneConnView = findViewById(R.id.connection_none);

OpenXcEnablerActivity.this.runOnUiThread(new Runnable() {
public void run() {
mVehicleManagerStatusView.setText("Not running");
mServiceNotRunningWarningView.setVisibility(View.VISIBLE);
}
});
}
Expand Down
Loading