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

Move Discovery functionality to FAB

This commit is contained in:
Lem Dulfo 2016-04-09 12:04:39 +08:00 committed by cpfeiffer
parent 5a3004cbce
commit 80a21f2ec2
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
@ -54,6 +55,7 @@ public class ControlCenter extends AppCompatActivity {
= "nodomain.freeyourgadget.gadgetbridge.controlcenter.action.set_version"; = "nodomain.freeyourgadget.gadgetbridge.controlcenter.action.set_version";
private TextView hintTextView; private TextView hintTextView;
private FloatingActionButton fab;
private SwipeRefreshLayout swipeLayout; private SwipeRefreshLayout swipeLayout;
private GBDeviceAdapter mGBDeviceAdapter; private GBDeviceAdapter mGBDeviceAdapter;
private GBDevice selectedDevice = null; private GBDevice selectedDevice = null;
@ -124,8 +126,18 @@ public class ControlCenter extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_controlcenter); setContentView(R.layout.activity_controlcenter);
hintTextView = (TextView) findViewById(R.id.hintTextView); hintTextView = (TextView) findViewById(R.id.hintTextView);
ListView deviceListView = (ListView) findViewById(R.id.deviceListView); ListView deviceListView = (ListView) findViewById(R.id.deviceListView);
fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
launchDiscoveryActivity();
}
});
mGBDeviceAdapter = new GBDeviceAdapter(this, deviceList); mGBDeviceAdapter = new GBDeviceAdapter(this, deviceList);
deviceListView.setAdapter(this.mGBDeviceAdapter); deviceListView.setAdapter(this.mGBDeviceAdapter);
deviceListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { deviceListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@ -333,16 +345,17 @@ public class ControlCenter extends AppCompatActivity {
Intent quitIntent = new Intent(GBApplication.ACTION_QUIT); Intent quitIntent = new Intent(GBApplication.ACTION_QUIT);
LocalBroadcastManager.getInstance(this).sendBroadcast(quitIntent); LocalBroadcastManager.getInstance(this).sendBroadcast(quitIntent);
return true; return true;
case R.id.action_discover: }
return super.onOptionsItemSelected(item);
}
private void launchDiscoveryActivity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
startActivity(new Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS)); startActivity(new Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS));
} else { } else {
startActivity(new Intent(this, DiscoveryActivity.class)); startActivity(new Intent(this, DiscoveryActivity.class));
} }
return true;
}
return super.onOptionsItemSelected(item);
} }
@Override @Override

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

@ -2,8 +2,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter"> tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter">
<item android:id="@+id/action_discover" android:title="@string/action_discover"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_settings" android:title="@string/action_settings" <item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" /> android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/action_debug" android:title="@string/action_debug" <item android:id="@+id/action_debug" android:title="@string/action_debug"