diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7aa58bb06..a3b3cfe4a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme"> + android:theme="@style/GadgetbridgeTheme"> diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java index ef06ea94d..23403f585 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java @@ -1,5 +1,6 @@ package nodomain.freeyourgadget.gadgetbridge; +import android.app.Activity; import android.app.NotificationManager; import android.content.BroadcastReceiver; import android.content.Context; @@ -9,13 +10,12 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; -import android.support.v7.app.ActionBarActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; -public class ControlCenter extends ActionBarActivity { +public class ControlCenter extends Activity { public static final String ACTION_QUIT = "nodomain.freeyourgadget.gadgetbride.controlcenter.action.quit"; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java index bebf7d631..0e2ef3eec 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java @@ -1,5 +1,6 @@ package nodomain.freeyourgadget.gadgetbridge; +import android.app.Activity; import android.app.NotificationManager; import android.content.BroadcastReceiver; import android.content.Context; @@ -7,13 +8,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.support.v4.app.NotificationCompat; -import android.support.v7.app.ActionBarActivity; import android.view.View; import android.widget.Button; import android.widget.EditText; -public class DebugActivity extends ActionBarActivity { +public class DebugActivity extends Activity { Button sendSMSButton; Button sendEmailButton; Button incomingCallButton; diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..6ffb4e72d --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,14 @@ + + + + #ffff5000 + #f0f03000 + #ff0091ea + #de000000 + #8a000000 + #fffafafa + #fffafafa + #ffeeeeee + #ff323232 + #1f000000 + \ No newline at end of file diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml index 71f0071c9..4d153bc61 100644 --- a/app/src/main/res/values/strings_activity_settings.xml +++ b/app/src/main/res/values/strings_activity_settings.xml @@ -1,7 +1,7 @@ - General Settings + General Settings Notifications diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 766ab9930..ecc829a8a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,8 +1,22 @@ - - + + + + +