From f2e7ae7c211b92db639d4c1841e46ac7791e6edd Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 30 Aug 2017 13:42:04 +1200 Subject: [PATCH] Finish app modernization --- app/src/main/AndroidManifest.xml | 14 ++++---- .../traccar/client/DialLaunchReceiver.java | 2 +- .../java/org/traccar/client/MainActivity.java | 32 +++++++++++++++++++ .../java/org/traccar/client/MainFragment.java | 4 ++- .../org/traccar/client/TrackingService.java | 2 +- app/src/main/res/menu/main.xml | 10 +++--- app/src/main/res/menu/status.xml | 6 ++-- app/src/main/res/values-v11/themes.xml | 7 ---- app/src/main/res/values-v21/themes.xml | 7 ---- app/src/main/res/values/colors.xml | 8 +++++ app/src/main/res/values/themes.xml | 5 ++- 11 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 app/src/main/java/org/traccar/client/MainActivity.java delete mode 100644 app/src/main/res/values-v11/themes.xml delete mode 100644 app/src/main/res/values-v21/themes.xml create mode 100644 app/src/main/res/values/colors.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 35911e1..c283f9f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - @@ -14,14 +15,12 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:theme="@style/TraccarTheme" + android:theme="@style/AppTheme" android:name=".MainApplication"> - + - + @@ -32,8 +31,7 @@ - + diff --git a/app/src/main/java/org/traccar/client/DialLaunchReceiver.java b/app/src/main/java/org/traccar/client/DialLaunchReceiver.java index 5029efa..86b5db7 100644 --- a/app/src/main/java/org/traccar/client/DialLaunchReceiver.java +++ b/app/src/main/java/org/traccar/client/DialLaunchReceiver.java @@ -28,7 +28,7 @@ public class DialLaunchReceiver extends BroadcastReceiver { String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); if (phoneNumber.equals(LAUNCHER_NUMBER)) { setResultData(null); - Intent appIntent = new Intent(context, MainFragment.class); + Intent appIntent = new Intent(context, MainActivity.class); appIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(appIntent); } diff --git a/app/src/main/java/org/traccar/client/MainActivity.java b/app/src/main/java/org/traccar/client/MainActivity.java new file mode 100644 index 0000000..ecfb718 --- /dev/null +++ b/app/src/main/java/org/traccar/client/MainActivity.java @@ -0,0 +1,32 @@ +/* + * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.client; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (savedInstanceState == null) { + getFragmentManager().beginTransaction().replace(android.R.id.content, new MainFragment()).commit(); + } + } + +} diff --git a/app/src/main/java/org/traccar/client/MainFragment.java b/app/src/main/java/org/traccar/client/MainFragment.java index 8ffce29..fbb040a 100644 --- a/app/src/main/java/org/traccar/client/MainFragment.java +++ b/app/src/main/java/org/traccar/client/MainFragment.java @@ -73,6 +73,8 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen removeLauncherIcon(); } + setHasOptionsMenu(true); + sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); migrateLegacyPreferences(sharedPreferences); addPreferencesFromResource(R.xml.preferences); @@ -132,7 +134,7 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen } private void removeLauncherIcon() { - String className = MainFragment.class.getCanonicalName().replace(".MainActivity", ".Launcher"); + String className = MainActivity.class.getCanonicalName().replace(".MainActivity", ".Launcher"); ComponentName componentName = new ComponentName(getActivity().getPackageName(), className); PackageManager packageManager = getActivity().getPackageManager(); if (packageManager.getComponentEnabledSetting(componentName) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) { diff --git a/app/src/main/java/org/traccar/client/TrackingService.java b/app/src/main/java/org/traccar/client/TrackingService.java index c6f7ac3..b778fc8 100644 --- a/app/src/main/java/org/traccar/client/TrackingService.java +++ b/app/src/main/java/org/traccar/client/TrackingService.java @@ -36,7 +36,7 @@ public class TrackingService extends Service { private TrackingController trackingController; private static Notification createNotification(Context context) { - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainFragment.class), 0); + PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index ecd52c1..87fa94e 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,19 +1,21 @@ - + + app:showAsAction="always" /> + app:showAsAction="never" /> + app:showAsAction="never" /> diff --git a/app/src/main/res/menu/status.xml b/app/src/main/res/menu/status.xml index 3e977f4..60788a5 100644 --- a/app/src/main/res/menu/status.xml +++ b/app/src/main/res/menu/status.xml @@ -1,9 +1,11 @@ - + + app:showAsAction="always" /> diff --git a/app/src/main/res/values-v11/themes.xml b/app/src/main/res/values-v11/themes.xml deleted file mode 100644 index 283f921..0000000 --- a/app/src/main/res/values-v11/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml deleted file mode 100644 index 09093fe..0000000 --- a/app/src/main/res/values-v21/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..12249fb --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + + + #43A047 + #2E7D32 + #388E3C + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 44af61e..ceb991e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,7 +1,10 @@ -