From 70ed14243fb7c9d2458279be90e66df722b26164 Mon Sep 17 00:00:00 2001 From: Lem Dulfo Date: Sun, 10 Apr 2016 06:13:25 +0800 Subject: [PATCH] Remove all getActionBar occurences, temporary fix for overlap --- .../activities/AbstractSettingsActivity.java | 2 - .../activities/AppBlacklistActivity.java | 1 - .../activities/AppManagerActivity.java | 1 - .../activities/ConfigureAlarms.java | 9 ++-- .../activities/DebugActivity.java | 1 - .../activities/ExternalPebbleJSActivity.java | 1 - .../activities/FwAppInstallerActivity.java | 2 +- .../res/layout/activity_configure_alarms.xml | 6 +-- .../res/layout/activity_controlcenter.xml | 49 ++++++++++--------- app/src/main/res/values/strings.xml | 4 +- 10 files changed, 36 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java index d52abe1d..d9a3b1c3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java @@ -96,8 +96,6 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity { super.onPostCreate(savedInstanceState); getDelegate().onPostCreate(savedInstanceState); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - for (String prefKey : getPreferenceKeysWithSummary()) { final Preference pref = findPreference(prefKey); if (pref != null) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java index c2767f56..06021c08 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java @@ -53,7 +53,6 @@ public class AppBlacklistActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_appblacklist); - getActionBar().setDisplayHomeAsUpEnabled(true); final PackageManager pm = getPackageManager(); sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java index 59732098..f5182ee3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java @@ -134,7 +134,6 @@ public class AppManagerActivity extends AppCompatActivity { sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); setContentView(R.layout.activity_appmanager); - getActionBar().setDisplayHomeAsUpEnabled(true); ListView appListView = (ListView) findViewById(R.id.appListView); mGBDeviceAppAdapter = new GBDeviceAppAdapter(this, appList); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java index a640faff..d04338cc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java @@ -1,11 +1,12 @@ package nodomain.freeyourgadget.gadgetbridge.activities; -import android.app.ListActivity; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.widget.ListView; import java.util.Arrays; import java.util.HashSet; @@ -20,7 +21,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ALARMS; -public class ConfigureAlarms extends ListActivity { +public class ConfigureAlarms extends AppCompatActivity { private static final int REQ_CONFIGURE_ALARM = 1; @@ -33,7 +34,6 @@ public class ConfigureAlarms extends ListActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_configure_alarms); - getActionBar().setDisplayHomeAsUpEnabled(true); SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); preferencesAlarmListSet = sharedPrefs.getStringSet(PREF_MIBAND_ALARMS, new HashSet()); @@ -45,7 +45,8 @@ public class ConfigureAlarms extends ListActivity { mGBAlarmListAdapter = new GBAlarmListAdapter(this, preferencesAlarmListSet); - setListAdapter(mGBAlarmListAdapter); + ListView listView = (ListView) findViewById(R.id.alarm_list); + listView.setAdapter(mGBAlarmListAdapter); updateAlarmsFromPrefs(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java index 1fa09724..524522e2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java @@ -81,7 +81,6 @@ public class DebugActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_debug); - getActionBar().setDisplayHomeAsUpEnabled(true); IntentFilter filter = new IntentFilter(); filter.addAction(GBApplication.ACTION_QUIT); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java index 4ddc013c..4c18bb90 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java @@ -61,7 +61,6 @@ public class ExternalPebbleJSActivity extends AppCompatActivity { } setContentView(R.layout.activity_external_pebble_js); - getActionBar().setDisplayHomeAsUpEnabled(true); WebView myWebView = (WebView) findViewById(R.id.configureWebview); myWebView.clearCache(true); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java index d74250aa..be79ea0a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java @@ -113,7 +113,7 @@ public class FwAppInstallerActivity extends AppCompatActivity implements Install protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_appinstaller); - getActionBar().setDisplayHomeAsUpEnabled(true); + GBDevice dev = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE); if (dev != null) { device = dev; diff --git a/app/src/main/res/layout/activity_configure_alarms.xml b/app/src/main/res/layout/activity_configure_alarms.xml index 3dd725a2..5d5fe957 100644 --- a/app/src/main/res/layout/activity_configure_alarms.xml +++ b/app/src/main/res/layout/activity_configure_alarms.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml index dc3eb6a7..159f955e 100644 --- a/app/src/main/res/layout/activity_controlcenter.xml +++ b/app/src/main/res/layout/activity_controlcenter.xml @@ -1,58 +1,59 @@ + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/gadgetbridge_img" /> + android:paddingTop="0px"> - - - + android:layout_above="@+id/hintTextView" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" /> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 407d428f..beac2a5d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,8 +83,8 @@ This is a Test Notification from Gadgetbridge Bluetooth is not supported. Bluetooth is disabled. - tap connected device for App Mananger - tap a device to connect + Tap connected device for App Manager + Tap a device to connect Cannot connect. BT address invalid? Gadgetbridge running installing binary %1$d/%2$d