nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove quit button from the service notification, put a quit item in the context menu instead. Closes #12

master
Andreas Shimokawa 2015-03-22 13:10:45 +01:00
parent 79c7085264
commit ecb7a9f3b5
6 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,8 +1,9 @@
###Changelog
####Version 0.1.3
* List all suported devices and connect on tap
* Remove the connect button
* Remove the connect button, list all suported devices and connect on tap instead
* Display firmware version of connected devices
* Remove quit button from the service notification, put a quit item in the context menu instead
####Version 0.1.2
* Added option to start Gadgetbridge and connect automatically when bluetooth is turned on

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
View File

@ -96,18 +96,13 @@ public class BluetoothCommunicationService extends Service {
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0,
notificationIntent, 0);
Intent stopIntent = new Intent(this, StopServiceReceiver.class);
PendingIntent pendingIntentStop = PendingIntent.getBroadcast(this, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT);
return new NotificationCompat.Builder(this)
.setContentTitle("Gadgetbridge")
.setTicker(text)
.setContentText(text)
.setSmallIcon(R.drawable.ic_notification)
.addAction(android.R.drawable.ic_menu_close_clear_cancel, "Quit", pendingIntentStop)
.setContentIntent(pendingIntent)
.setOngoing(true).build();
}
private void updateNotification(String text) {

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
View File

@ -125,11 +125,18 @@ public class ControlCenter extends Activity {
startActivity(intent);
return true;
}
if (id == R.id.action_debug) {
else if (id == R.id.action_debug) {
Intent intent = new Intent(this, DebugActivity.class);
startActivity(intent);
return true;
}
else if (id == R.id.action_quit) {
Intent stopIntent = new Intent(this, BluetoothCommunicationService.class);
stopService(stopIntent);
Intent quitIntent = new Intent(ControlCenter.ACTION_QUIT);
sendBroadcast(quitIntent);
}
return super.onOptionsItemSelected(item);
}

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/StopServiceReceiver.java
View File

@ -1,16 +0,0 @@
package nodomain.freeyourgadget.gadgetbridge;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
public class StopServiceReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Intent stopIntent = new Intent(context, BluetoothCommunicationService.class);
context.stopService(stopIntent);
Intent quitIntent = new Intent(ControlCenter.ACTION_QUIT);
context.sendBroadcast(quitIntent);
}
}

2
app/src/main/res/menu/menu_main.xml
View File

@ -6,4 +6,6 @@
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_debug" android:title="@string/action_debug"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_quit" android:title="@string/action_quit"
android:orderInCategory="100" app:showAsAction="never" />
</menu>

3
app/src/main/res/values/strings.xml
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Gadgetbridge</string>
<string name="title_activity_main">Gadgetbridge Control Center</string>
<string name="action_settings">Settings</string>
<string name="action_debug">Debug</string>
<string name="action_quit">Quit</string>
<string name="title_activity_debug">Debug</string>
</resources>