From 3558e54169db6cd0e033ce96e139ded6583c7e8a Mon Sep 17 00:00:00 2001 From: Erwan Finot Date: Thu, 13 Aug 2020 19:59:03 +0200 Subject: [PATCH 1/6] Update gradle --- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c2eea8e..9d47245 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.5.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0deeb2..482468c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 09 18:12:26 CEST 2017 +#Thu Aug 13 19:54:02 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 0f58711ed7b100aa63627db4a145c5a51a66a096 Mon Sep 17 00:00:00 2001 From: Erwan Finot Date: Thu, 13 Aug 2020 20:20:54 +0200 Subject: [PATCH 2/6] Fix autorun on A10 PX5 Rename package to match latest PX5 allowlist. Rule extracted from PX5 Android 10 20200710 + MCU MTCE_MX_V3.57_1 : name.startsWith("com.microntek.") name.equals("android.microntek.canbus") name.startsWith("com.android.launcher") name.equals("com.vayosoft.carsystem") name.startsWith("com.hct.") name.equals("net.easyconn") --- README.md | 8 ++-- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 41 +++++++++--------- .../microntek/CarManageCallback.java | 5 +-- .../microntek/CarManager.java | 4 +- .../microntek/ICarManageCallback.java | 2 +- .../microntek/ICarService.java | 6 +-- .../{android => com}/microntek/IRTable.java | 2 +- .../{android => com}/microntek/MTCData.java | 2 +- .../mtcdtools/activities/MainActivity.java | 24 +++++------ .../activities/SettingsActivity.java | 6 +-- .../activities/input/BindingActivity.java | 18 ++++---- .../input/ObtainKeysSequenceActivity.java | 8 ++-- .../managing/ManageAutorunActivity.java | 20 ++++----- .../managing/ManageBindingsActivity.java | 14 +++---- .../managing/ManageNamedObjectsActivity.java | 42 +++++++++---------- .../named/objects/ActionsListActivity.java | 28 ++++++------- .../objects/ActionsSequenceActivity.java | 22 +++++----- .../named/objects/ModeListActivity.java | 22 +++++----- .../named/objects/NamedObjectActivity.java | 12 +++--- .../NamedObjectsContainerActivity.java | 6 +-- .../BroadcastIntentActionActivity.java | 12 +++--- .../objects/actions/CreateActionActivity.java | 6 +-- .../actions/CustomIntentActionActivity.java | 14 +++---- .../objects/actions/KeyActionActivity.java | 14 +++---- .../objects/actions/LaunchActionActivity.java | 18 ++++---- .../actions/StartIntentActionActivity.java | 12 +++--- .../ActionsInSequenceArrayAdapter.java | 8 ++-- .../InstalledPackagesArrayAdapter.java | 4 +- .../adapters/KeyCodesArrayAdapter.java | 2 +- .../adapters/KeysSequenceArrayAdapter.java | 2 +- .../adapters/NamedObjectIdsArrayAdapter.java | 6 +-- .../adapters/PackagesArrayAdapter.java | 6 +-- .../entries/ActionInSequenceEntry.java | 4 +- .../adapters/entries/PackageEntry.java | 2 +- .../f1x/mtcdtools/named/NamedObject.java | 2 +- .../f1x/mtcdtools/named/NamedObjectId.java | 2 +- .../mtcdtools/named/NamedObjectsFactory.java | 19 ++++----- .../named/objects/actions/Action.java | 6 +-- .../actions/BroadcastIntentAction.java | 4 +- .../objects/actions/CustomIntentAction.java | 4 +- .../named/objects/actions/ExtrasParser.java | 2 +- .../named/objects/actions/KeyAction.java | 8 ++-- .../named/objects/actions/LaunchAction.java | 4 +- .../objects/actions/StartIntentAction.java | 4 +- .../named/objects/actions/UriParser.java | 2 +- .../named/objects/containers/ActionsList.java | 6 +-- .../objects/containers/ActionsSequence.java | 4 +- .../named/objects/containers/ModeList.java | 6 +-- .../containers/NamedObjectsContainer.java | 6 +-- .../BootCompletedBroadcastReceiver.java | 2 +- .../f1x/mtcdtools/service/MtcdService.java | 36 ++++++++-------- .../service/MtcdServiceWatchdog.java | 2 +- .../mtcdtools/service/ServiceActivity.java | 4 +- .../f1x/mtcdtools/service/ServiceBinder.java | 14 +++---- .../service/configuration/Configuration.java | 2 +- .../ConfigurationChangeListener.java | 2 +- .../DispatchingIndicationPlayer.java | 4 +- .../dispatching/KeysSequenceDispatcher.java | 8 ++-- .../dispatching/NamedObjectDispatcher.java | 18 ++++---- .../dispatching/NamedObjectsDispatchTask.java | 12 +++--- .../ActionsListDispatchActivity.java | 22 +++++----- .../activities/VoiceDispatchActivity.java | 10 ++--- .../service/input/KeysSequenceBinding.java | 4 +- .../service/input/KeysSequenceListener.java | 2 +- .../input/PX3PressedKeysSequenceManager.java | 4 +- .../input/PX5PressedKeysSequenceManager.java | 6 +-- .../input/PressedKeysSequenceManager.java | 6 +-- .../service/storage/AutorunStorage.java | 8 ++-- .../mtcdtools/service/storage/FileReader.java | 2 +- .../service/storage/FileStorage.java | 6 +-- .../mtcdtools/service/storage/FileWriter.java | 2 +- .../storage/KeysSequenceBindingsStorage.java | 10 ++--- .../service/storage/NamedObjectsStorage.java | 16 ++++--- .../service/storage/UniqueObjectsStorage.java | 4 +- .../exceptions/DuplicatedEntryException.java | 2 +- .../exceptions/EntryCreationFailed.java | 2 +- .../utils/KeysSequenceConverter.java | 2 +- .../f1x/mtcdtools/utils/ListIndexer.java | 2 +- .../f1x/mtcdtools/utils/ListViewScroller.java | 2 +- .../f1x/mtcdtools/utils/PlatformChecker.java | 2 +- .../f1x/mtcdtools/utils/SpeechParser.java | 2 +- .../StartActivityButtonClickListener.java | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- .../named/objects/NamedObjectIdTest.java | 4 +- .../actions/BroadcastIntentActionTest.java | 4 +- .../objects/actions/ExtrasParserTest.java | 2 +- .../named/objects/actions/KeyActionTest.java | 4 +- .../objects/actions/LaunchActionTest.java | 4 +- .../actions/StartIntentActionTest.java | 4 +- .../objects/containers/ActionsListTest.java | 6 +-- .../containers/ActionsSequenceTest.java | 6 +-- .../objects/containers/ModeListTest.java | 4 +- .../KeysSequenceDispatcherTest.java | 8 ++-- .../NamedObjectDispatcherTest.java | 14 +++---- .../input/KeysSequenceBindingTest.java | 4 +- .../input/KeysSequenceConverterTest.java | 4 +- .../service/storage/AutorunStorageTest.java | 8 ++-- .../KeysSequenceBindingsStorageTest.java | 14 ++++--- .../storage/NamedObjectsStorageTest.java | 20 +++++---- .../storage/UniqueObjectsStorageTest.java | 6 +-- .../f1x/mtcdtools/utils/ListIndexerTest.java | 4 +- .../mtcdtools/utils/ListViewScrollerTest.java | 4 +- .../f1x/mtcdtools/utils/SpeechParserTest.java | 4 +- 104 files changed, 415 insertions(+), 420 deletions(-) rename app/src/main/java/{android => com}/microntek/CarManageCallback.java (55%) rename app/src/main/java/{android => com}/microntek/CarManager.java (98%) rename app/src/main/java/{android => com}/microntek/ICarManageCallback.java (99%) rename app/src/main/java/{android => com}/microntek/ICarService.java (98%) rename app/src/main/java/{android => com}/microntek/IRTable.java (99%) rename app/src/main/java/{android => com}/microntek/MTCData.java (99%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/MainActivity.java (72%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/SettingsActivity.java (97%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/input/BindingActivity.java (89%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java (82%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java (91%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java (73%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java (87%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java (79%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java (74%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java (91%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java (82%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java (81%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java (86%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java (85%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java (72%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java (75%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java (87%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java (90%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java (97%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java (93%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java (80%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java (90%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/NamedObject.java (96%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/NamedObjectId.java (96%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java (59%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/Action.java (82%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java (93%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java (96%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java (90%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java (75%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java (89%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java (85%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java (89%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java (92%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/MtcdService.java (79%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/ServiceActivity.java (94%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/ServiceBinder.java (50%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/configuration/Configuration.java (98%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java (73%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java (84%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java (82%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java (80%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java (85%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java (90%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java (89%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java (94%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java (78%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java (91%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java (89%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java (91%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java (84%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/FileReader.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/FileStorage.java (84%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/FileWriter.java (94%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java (86%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java (81%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java (91%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java (83%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java (83%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/ListIndexer.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/ListViewScroller.java (94%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/PlatformChecker.java (93%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/SpeechParser.java (95%) rename app/src/main/java/{android => com}/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java (93%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/NamedObjectIdTest.java (82%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentActionTest.java (98%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParserTest.java (98%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/KeyActionTest.java (97%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/LaunchActionTest.java (96%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/actions/StartIntentActionTest.java (98%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ActionsListTest.java (97%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequenceTest.java (97%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/named/objects/containers/ModeListTest.java (96%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcherTest.java (90%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcherTest.java (92%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/input/KeysSequenceBindingTest.java (95%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/input/KeysSequenceConverterTest.java (91%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/storage/AutorunStorageTest.java (93%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorageTest.java (92%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorageTest.java (93%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorageTest.java (95%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/utils/ListIndexerTest.java (90%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/utils/ListViewScrollerTest.java (94%) rename app/src/test/java/{android => com}/microntek/f1x/mtcdtools/utils/SpeechParserTest.java (95%) diff --git a/README.md b/README.md index 0a795d2..4187029 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,9 @@ As of version 1.3 you are able to control your device using voice. You can say y ### *In order to use the voice control feature, you have to define a "start activity" action with below parameters and bind it with desired keys sequence:* -> Class name: android.microntek.f1x.mtcdtools.service.dispatching.activities.VoiceDispatchActivity +> Class name: com.microntek.f1x.mtcdtools.service.dispatching.activities.VoiceDispatchActivity -> Intent package: android.microntek.f1x.mtcdtools +> Intent package: com.microntek.f1x.mtcdtools > Flags: 813760516 @@ -96,9 +96,9 @@ Due to Lollipop limitations, it is possible that triggering of the voice dispatc ### *Enable MtcdTools voice control:* -> Class name: android.microntek.f1x.mtcdtools.service.dispatching.activities.VoiceDispatchActivity +> Class name: com.microntek.f1x.mtcdtools.service.dispatching.activities.VoiceDispatchActivity -> Intent package: android.microntek.f1x.mtcdtools +> Intent package: com.microntek.f1x.mtcdtools > Flags: 813760516 diff --git a/app/build.gradle b/app/build.gradle index b743ac4..797388b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion '25.0.0' defaultConfig { - applicationId "android.microntek.f1x.mtcdtools" + applicationId "com.microntek.f1x.mtcdtools" minSdkVersion 19 targetSdkVersion 25 versionCode 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1704795..b5ca506 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,9 @@ + package="com.microntek.f1x.mtcdtools"> + - + @@ -18,34 +19,34 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + diff --git a/app/src/main/java/android/microntek/CarManageCallback.java b/app/src/main/java/com/microntek/CarManageCallback.java similarity index 55% rename from app/src/main/java/android/microntek/CarManageCallback.java rename to app/src/main/java/com/microntek/CarManageCallback.java index 24ebc63..992b9f5 100644 --- a/app/src/main/java/android/microntek/CarManageCallback.java +++ b/app/src/main/java/com/microntek/CarManageCallback.java @@ -1,10 +1,9 @@ -package android.microntek; +package com.microntek; -import android.microntek.ICarManageCallback.Stub; import android.os.Bundle; import android.os.RemoteException; -public class CarManageCallback extends Stub { +public class CarManageCallback extends ICarManageCallback.Stub { public void onStatusChanged(String type, Bundle bundle) throws RemoteException { } } diff --git a/app/src/main/java/android/microntek/CarManager.java b/app/src/main/java/com/microntek/CarManager.java similarity index 98% rename from app/src/main/java/android/microntek/CarManager.java rename to app/src/main/java/com/microntek/CarManager.java index d7e6e2d..0d1ddd8 100644 --- a/app/src/main/java/android/microntek/CarManager.java +++ b/app/src/main/java/com/microntek/CarManager.java @@ -1,6 +1,6 @@ -package android.microntek; +package com.microntek; -import android.microntek.ICarService.Stub; +import com.microntek.ICarService.Stub; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; diff --git a/app/src/main/java/android/microntek/ICarManageCallback.java b/app/src/main/java/com/microntek/ICarManageCallback.java similarity index 99% rename from app/src/main/java/android/microntek/ICarManageCallback.java rename to app/src/main/java/com/microntek/ICarManageCallback.java index b2c478c..a859287 100644 --- a/app/src/main/java/android/microntek/ICarManageCallback.java +++ b/app/src/main/java/com/microntek/ICarManageCallback.java @@ -1,4 +1,4 @@ -package android.microntek; +package com.microntek; import android.os.Binder; import android.os.Bundle; diff --git a/app/src/main/java/android/microntek/ICarService.java b/app/src/main/java/com/microntek/ICarService.java similarity index 98% rename from app/src/main/java/android/microntek/ICarService.java rename to app/src/main/java/com/microntek/ICarService.java index 55011be..b8dda89 100644 --- a/app/src/main/java/android/microntek/ICarService.java +++ b/app/src/main/java/com/microntek/ICarService.java @@ -1,4 +1,4 @@ -package android.microntek; +package com.microntek; import android.os.Binder; import android.os.IBinder; @@ -456,12 +456,12 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws return true; case TRANSACTION_registerCallback /*15*/: data.enforceInterface(DESCRIPTOR); - registerCallback(android.microntek.ICarManageCallback.Stub.asInterface(data.readStrongBinder())); + registerCallback(ICarManageCallback.Stub.asInterface(data.readStrongBinder())); reply.writeNoException(); return true; case TRANSACTION_unregisterCallback /*16*/: data.enforceInterface(DESCRIPTOR); - unregisterCallback(android.microntek.ICarManageCallback.Stub.asInterface(data.readStrongBinder())); + unregisterCallback(ICarManageCallback.Stub.asInterface(data.readStrongBinder())); reply.writeNoException(); return true; case TRANSACTION_setParameters /*17*/: diff --git a/app/src/main/java/android/microntek/IRTable.java b/app/src/main/java/com/microntek/IRTable.java similarity index 99% rename from app/src/main/java/android/microntek/IRTable.java rename to app/src/main/java/com/microntek/IRTable.java index bb4ac12..b454d0b 100644 --- a/app/src/main/java/android/microntek/IRTable.java +++ b/app/src/main/java/com/microntek/IRTable.java @@ -1,4 +1,4 @@ -package android.microntek; +package com.microntek; public class IRTable { public static final int IR_AB = 363; diff --git a/app/src/main/java/android/microntek/MTCData.java b/app/src/main/java/com/microntek/MTCData.java similarity index 99% rename from app/src/main/java/android/microntek/MTCData.java rename to app/src/main/java/com/microntek/MTCData.java index 09320ea..6deb78e 100644 --- a/app/src/main/java/android/microntek/MTCData.java +++ b/app/src/main/java/com/microntek/MTCData.java @@ -1,4 +1,4 @@ -package android.microntek; +package com.microntek; public class MTCData { public static final int MAX_BALANCE = 28; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/MainActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/MainActivity.java similarity index 72% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/MainActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/MainActivity.java index 14f914a..158a5d7 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/MainActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/MainActivity.java @@ -1,21 +1,21 @@ -package android.microntek.f1x.mtcdtools.activities; +package com.microntek.f1x.mtcdtools.activities; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.widget.Button; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.utils.StartActivityButtonClickListener; -import android.microntek.f1x.mtcdtools.activities.input.BindingActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.actions.CreateActionActivity; -import android.microntek.f1x.mtcdtools.activities.managing.ManageAutorunActivity; -import android.microntek.f1x.mtcdtools.activities.managing.ManageBindingsActivity; -import android.microntek.f1x.mtcdtools.activities.managing.ManageNamedObjectsActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.ActionsListActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.ActionsSequenceActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.ModeListActivity; -import android.microntek.f1x.mtcdtools.service.MtcdService; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.utils.StartActivityButtonClickListener; +import com.microntek.f1x.mtcdtools.activities.input.BindingActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.actions.CreateActionActivity; +import com.microntek.f1x.mtcdtools.activities.managing.ManageAutorunActivity; +import com.microntek.f1x.mtcdtools.activities.managing.ManageBindingsActivity; +import com.microntek.f1x.mtcdtools.activities.managing.ManageNamedObjectsActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.ActionsListActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.ActionsSequenceActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.ModeListActivity; +import com.microntek.f1x.mtcdtools.service.MtcdService; public class MainActivity extends Activity { @Override diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/SettingsActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/SettingsActivity.java similarity index 97% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/SettingsActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/SettingsActivity.java index da13063..f56c89f 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/SettingsActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities; +package com.microntek.f1x.mtcdtools.activities; import android.os.Bundle; import android.view.View; @@ -8,8 +8,8 @@ import android.widget.TabHost; import android.widget.TextView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; import java.util.Locale; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/BindingActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/BindingActivity.java similarity index 89% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/BindingActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/BindingActivity.java index 581c448..c632bb6 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/BindingActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/BindingActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.input; +package com.microntek.f1x.mtcdtools.activities.input; import android.content.Intent; import android.os.Bundle; @@ -9,14 +9,14 @@ import android.widget.Switch; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.adapters.KeysSequenceArrayAdapter; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; -import android.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.adapters.KeysSequenceArrayAdapter; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; +import com.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java index 1501b02..4b27c3e 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/input/ObtainKeysSequenceActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.input; +package com.microntek.f1x.mtcdtools.activities.input; import android.content.Intent; import android.os.Bundle; @@ -7,9 +7,9 @@ import android.widget.Button; import android.widget.ListView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java similarity index 82% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java index c63f6e0..850cf6b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageAutorunActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.managing; +package com.microntek.f1x.mtcdtools.activities.managing; import android.os.Bundle; import android.view.View; @@ -8,15 +8,15 @@ import android.widget.Spinner; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java similarity index 91% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java index e1d660f..ccacb22 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageBindingsActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.managing; +package com.microntek.f1x.mtcdtools.activities.managing; import android.content.Intent; import android.os.Bundle; @@ -8,12 +8,12 @@ import android.widget.ListView; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.input.BindingActivity; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; -import android.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.input.BindingActivity; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; +import com.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java similarity index 73% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java index 8a1bcd6..b188d0b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/managing/ManageNamedObjectsActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.managing; +package com.microntek.f1x.mtcdtools.activities.managing; import android.content.Intent; import android.os.Bundle; @@ -7,26 +7,26 @@ import android.widget.ListView; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.named.objects.ActionsListActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.ActionsSequenceActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.ModeListActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.actions.BroadcastIntentActionActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.actions.KeyActionActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.actions.LaunchActionActivity; -import android.microntek.f1x.mtcdtools.activities.named.objects.actions.StartIntentActionActivity; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.objects.containers.ModeList; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.named.objects.ActionsListActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.ActionsSequenceActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.ModeListActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.actions.BroadcastIntentActionActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.actions.KeyActionActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.actions.LaunchActionActivity; +import com.microntek.f1x.mtcdtools.activities.named.objects.actions.StartIntentActionActivity; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.objects.containers.ModeList; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java similarity index 87% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java index 90671ff..8360a36 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsListActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects; +package com.microntek.f1x.mtcdtools.activities.named.objects; import android.content.Intent; import android.view.View; @@ -7,19 +7,19 @@ import android.widget.ListView; import android.widget.TabHost; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.input.ObtainKeysSequenceActivity; -import android.microntek.f1x.mtcdtools.adapters.KeysSequenceArrayAdapter; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.input.ObtainKeysSequenceActivity; +import com.microntek.f1x.mtcdtools.adapters.KeysSequenceArrayAdapter; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java similarity index 79% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java index 1d19658..1594e95 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ActionsSequenceActivity.java @@ -1,20 +1,20 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects; +package com.microntek.f1x.mtcdtools.activities.named.objects; import android.view.View; import android.widget.AdapterView; import android.widget.Button; import android.widget.ListView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.adapters.ActionsInSequenceArrayAdapter; -import android.microntek.f1x.mtcdtools.adapters.entries.ActionInSequenceEntry; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.adapters.ActionsInSequenceArrayAdapter; +import com.microntek.f1x.mtcdtools.adapters.entries.ActionInSequenceEntry; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java similarity index 74% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java index 23f88d3..7f19295 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/ModeListActivity.java @@ -1,20 +1,20 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects; +package com.microntek.f1x.mtcdtools.activities.named.objects; import android.view.View; import android.widget.AdapterView; import android.widget.Button; import android.widget.ListView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.objects.containers.ModeList; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.objects.containers.ModeList; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import java.util.Arrays; import java.util.TreeSet; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java similarity index 91% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java index 42afbcd..a4ca959 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects; +package com.microntek.f1x.mtcdtools.activities.named.objects; import android.os.Bundle; import android.view.View; @@ -6,11 +6,11 @@ import android.widget.EditText; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java similarity index 82% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java index 7e22f60..382c51b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/NamedObjectsContainerActivity.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects; +package com.microntek.f1x.mtcdtools.activities.named.objects; import android.widget.Spinner; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; /** * Created by f1x on 2017-02-05. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java similarity index 81% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java index eeaf88d..6dd6c7f 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/BroadcastIntentActionActivity.java @@ -1,12 +1,12 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.widget.EditText; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java similarity index 86% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java index 456e7d6..bcd4505 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CreateActionActivity.java @@ -1,11 +1,11 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.app.Activity; import android.os.Bundle; import android.widget.Button; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.utils.StartActivityButtonClickListener; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.utils.StartActivityButtonClickListener; public class CreateActionActivity extends Activity { diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java similarity index 85% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java index 555c883..7e8528c 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/CustomIntentActionActivity.java @@ -1,14 +1,14 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.widget.EditText; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.CustomIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.named.objects.actions.CustomIntentAction; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java similarity index 72% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java index 7fb42ea..a96a14b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/KeyActionActivity.java @@ -1,13 +1,13 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.widget.Spinner; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; -import android.microntek.f1x.mtcdtools.adapters.KeyCodesArrayAdapter; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; +import com.microntek.f1x.mtcdtools.adapters.KeyCodesArrayAdapter; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; /** * Created by f1x on 2017-01-25. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java similarity index 75% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java index bcb0f13..aa6e43c 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/LaunchActionActivity.java @@ -1,17 +1,17 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; -import android.microntek.f1x.mtcdtools.adapters.InstalledPackagesArrayAdapter; -import android.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.activities.named.objects.NamedObjectActivity; +import com.microntek.f1x.mtcdtools.adapters.InstalledPackagesArrayAdapter; +import com.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; public class LaunchActionActivity extends NamedObjectActivity { public LaunchActionActivity() { diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java similarity index 87% rename from app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java index 7bf75c4..224928b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/activities/named/objects/actions/StartIntentActionActivity.java @@ -1,13 +1,13 @@ -package android.microntek.f1x.mtcdtools.activities.named.objects.actions; +package com.microntek.f1x.mtcdtools.activities.named.objects.actions; import android.widget.EditText; import android.widget.RadioButton; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java index c1c5594..b314bbc 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/ActionsInSequenceArrayAdapter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; import android.view.View; @@ -7,9 +7,9 @@ import android.widget.SeekBar; import android.widget.TextView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.adapters.entries.ActionInSequenceEntry; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.adapters.entries.ActionInSequenceEntry; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java similarity index 90% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java index 82b2425..72670a3 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/InstalledPackagesArrayAdapter.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; import android.content.pm.ApplicationInfo; -import android.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; +import com.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; import java.util.Comparator; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java similarity index 97% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java index a49cdc5..325fb59 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeyCodesArrayAdapter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; import android.view.KeyEvent; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java similarity index 93% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java index 3998cb4..9f185f4 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/KeysSequenceArrayAdapter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; import android.widget.ArrayAdapter; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java index bc06d01..987c75b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/NamedObjectIdsArrayAdapter.java @@ -1,10 +1,10 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import android.widget.ArrayAdapter; -import android.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObject; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java index 1626b26..a2fb527 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/PackagesArrayAdapter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.adapters; +package com.microntek.f1x.mtcdtools.adapters; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -10,8 +10,8 @@ import android.widget.ArrayAdapter; import android.widget.TextView; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.adapters.entries.PackageEntry; /** * Created by f1x on 2016-08-08. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java similarity index 80% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java index f592ae9..65ab31d 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/ActionInSequenceEntry.java @@ -1,6 +1,6 @@ -package android.microntek.f1x.mtcdtools.adapters.entries; +package com.microntek.f1x.mtcdtools.adapters.entries; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; /** * Created by COMPUTER on 2017-02-10. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java similarity index 90% rename from app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java index 07018fe..99ed5c2 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/adapters/entries/PackageEntry.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.adapters.entries; +package com.microntek.f1x.mtcdtools.adapters.entries; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObject.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObject.java similarity index 96% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObject.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObject.java index 495fe5b..ac21721 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObject.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObject.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.named; +package com.microntek.f1x.mtcdtools.named; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectId.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectId.java similarity index 96% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectId.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectId.java index be24f8b..3d506ea 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectId.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectId.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.named; +package com.microntek.f1x.mtcdtools.named; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java similarity index 59% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java index 31a29f7..42ea2dc 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/NamedObjectsFactory.java @@ -1,14 +1,13 @@ -package android.microntek.f1x.mtcdtools.named; +package com.microntek.f1x.mtcdtools.named; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.objects.containers.ModeList; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.named.objects.actions.BroadcastIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.KeyAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.LaunchAction; +import com.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.objects.containers.ModeList; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/Action.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/Action.java similarity index 82% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/Action.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/Action.java index a2d4fa9..46ad808 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/Action.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/Action.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Context; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java similarity index 93% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java index e5487d3..218784b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/BroadcastIntentAction.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Context; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java similarity index 96% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java index 5abc0c7..5984b92 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/CustomIntentAction.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Intent; import android.os.Bundle; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java index d6a3fc7..2759581 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/ExtrasParser.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.os.Bundle; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java similarity index 90% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java index 760a1b9..46a6215 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/KeyAction.java @@ -1,13 +1,13 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Context; import android.media.AudioManager; -import android.microntek.CarManager; +import com.microntek.CarManager; import android.view.KeyEvent; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.utils.PlatformChecker; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.utils.PlatformChecker; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java index cef62ac..c77c0e7 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/LaunchAction.java @@ -1,10 +1,10 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Context; import android.content.Intent; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java index efb2158..5276038 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/StartIntentAction.java @@ -1,10 +1,10 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.content.Context; import android.content.Intent; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java similarity index 75% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java index 34638ad..ab8e458 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/actions/UriParser.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.named.objects.actions; +package com.microntek.f1x.mtcdtools.named.objects.actions; import android.net.Uri; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java similarity index 89% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java index 152bcbb..a12a5ef 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsList.java @@ -1,7 +1,7 @@ -package android.microntek.f1x.mtcdtools.named.objects.containers; +package com.microntek.f1x.mtcdtools.named.objects.containers; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.utils.KeysSequenceConverter; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java index 2373710..5c53ed8 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ActionsSequence.java @@ -1,6 +1,6 @@ -package android.microntek.f1x.mtcdtools.named.objects.containers; +package com.microntek.f1x.mtcdtools.named.objects.containers; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java similarity index 85% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java index c570439..5d1af57 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/ModeList.java @@ -1,7 +1,7 @@ -package android.microntek.f1x.mtcdtools.named.objects.containers; +package com.microntek.f1x.mtcdtools.named.objects.containers; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.utils.ListIndexer; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.utils.ListIndexer; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java similarity index 89% rename from app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java index 7a17d62..4cda912 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/named/objects/containers/NamedObjectsContainer.java @@ -1,7 +1,7 @@ -package android.microntek.f1x.mtcdtools.named.objects.containers; +package com.microntek.f1x.mtcdtools.named.objects.containers; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java similarity index 92% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java index 002a969..4352d18 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service; +package com.microntek.f1x.mtcdtools.service; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdService.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java similarity index 79% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdService.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java index b20adae..442ff24 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdService.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service; +package com.microntek.f1x.mtcdtools.service; import android.app.Notification; import android.content.BroadcastReceiver; @@ -9,22 +9,22 @@ import android.support.v4.app.NotificationCompat; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; -import android.microntek.f1x.mtcdtools.service.dispatching.DispatchingIndicationPlayer; -import android.microntek.f1x.mtcdtools.service.dispatching.KeysSequenceDispatcher; -import android.microntek.f1x.mtcdtools.service.input.PX3PressedKeysSequenceManager; -import android.microntek.f1x.mtcdtools.service.input.PX5PressedKeysSequenceManager; -import android.microntek.f1x.mtcdtools.service.input.PressedKeysSequenceManager; -import android.microntek.f1x.mtcdtools.service.dispatching.NamedObjectDispatcher; -import android.microntek.f1x.mtcdtools.service.storage.AutorunStorage; -import android.microntek.f1x.mtcdtools.service.storage.FileReader; -import android.microntek.f1x.mtcdtools.service.storage.FileWriter; -import android.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; -import android.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; -import android.microntek.f1x.mtcdtools.utils.PlatformChecker; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.dispatching.DispatchingIndicationPlayer; +import com.microntek.f1x.mtcdtools.service.dispatching.KeysSequenceDispatcher; +import com.microntek.f1x.mtcdtools.service.input.PX3PressedKeysSequenceManager; +import com.microntek.f1x.mtcdtools.service.input.PX5PressedKeysSequenceManager; +import com.microntek.f1x.mtcdtools.service.input.PressedKeysSequenceManager; +import com.microntek.f1x.mtcdtools.service.dispatching.NamedObjectDispatcher; +import com.microntek.f1x.mtcdtools.service.storage.AutorunStorage; +import com.microntek.f1x.mtcdtools.service.storage.FileReader; +import com.microntek.f1x.mtcdtools.service.storage.FileWriter; +import com.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; +import com.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; +import com.microntek.f1x.mtcdtools.utils.PlatformChecker; import org.json.JSONException; @@ -165,6 +165,6 @@ public void onReceive(Context context, Intent intent) { } }; - public static final String ACTION_AUTORUN = "android.microntek.f1x.mtcdtools.action.autorun"; + public static final String ACTION_AUTORUN = "com.microntek.f1x.mtcdtools.action.autorun"; private static final String APP_NAME = "MtcdTools"; } diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java index 73fccc6..cfc2368 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdServiceWatchdog.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service; +package com.microntek.f1x.mtcdtools.service; import android.app.AlarmManager; import android.app.PendingIntent; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceActivity.java similarity index 94% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceActivity.java index 32d0583..592ff06 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceActivity.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service; +package com.microntek.f1x.mtcdtools.service; import android.app.Activity; import android.content.ComponentName; @@ -9,7 +9,7 @@ import android.os.IBinder; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.R; /** * Created by f1x on 2016-08-18. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceBinder.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceBinder.java similarity index 50% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceBinder.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceBinder.java index afce338..e7eea16 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/ServiceBinder.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/ServiceBinder.java @@ -1,13 +1,13 @@ -package android.microntek.f1x.mtcdtools.service; +package com.microntek.f1x.mtcdtools.service; import android.os.Binder; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; -import android.microntek.f1x.mtcdtools.service.input.PressedKeysSequenceManager; -import android.microntek.f1x.mtcdtools.service.dispatching.NamedObjectDispatcher; -import android.microntek.f1x.mtcdtools.service.storage.AutorunStorage; -import android.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; -import android.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.input.PressedKeysSequenceManager; +import com.microntek.f1x.mtcdtools.service.dispatching.NamedObjectDispatcher; +import com.microntek.f1x.mtcdtools.service.storage.AutorunStorage; +import com.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; +import com.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; /** * Created by f1x on 2017-01-07. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/Configuration.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/Configuration.java similarity index 98% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/Configuration.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/Configuration.java index f7d6d20..e0d3a14 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/Configuration.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/Configuration.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.configuration; +package com.microntek.f1x.mtcdtools.service.configuration; import android.content.SharedPreferences; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java similarity index 73% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java index 37e6571..1884c40 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/configuration/ConfigurationChangeListener.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.configuration; +package com.microntek.f1x.mtcdtools.service.configuration; /** * Created by f1x on 2017-02-04. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java similarity index 84% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java index cfabf7f..51db49a 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/DispatchingIndicationPlayer.java @@ -1,10 +1,10 @@ -package android.microntek.f1x.mtcdtools.service.dispatching; +package com.microntek.f1x.mtcdtools.service.dispatching; import android.content.Context; import android.media.AudioManager; import android.media.MediaPlayer; -import android.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.R; /** * Created by COMPUTER on 2017-05-10. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java similarity index 82% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java index ebe7722..42e0558 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/KeysSequenceDispatcher.java @@ -1,10 +1,10 @@ -package android.microntek.f1x.mtcdtools.service.dispatching; +package com.microntek.f1x.mtcdtools.service.dispatching; import android.content.Context; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; -import android.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; +import com.microntek.f1x.mtcdtools.service.storage.KeysSequenceBindingsStorage; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java similarity index 80% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java index 404461f..40429b9 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectDispatcher.java @@ -1,17 +1,17 @@ -package android.microntek.f1x.mtcdtools.service.dispatching; +package com.microntek.f1x.mtcdtools.service.dispatching; import android.content.Context; import android.content.Intent; -import android.microntek.f1x.mtcdtools.service.dispatching.activities.ActionsListDispatchActivity; +import com.microntek.f1x.mtcdtools.service.dispatching.activities.ActionsListDispatchActivity; import android.os.AsyncTask; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.objects.containers.ModeList; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.objects.containers.ModeList; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java similarity index 85% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java index b763616..d6a3f8c 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/NamedObjectsDispatchTask.java @@ -1,13 +1,13 @@ -package android.microntek.f1x.mtcdtools.service.dispatching; +package com.microntek.f1x.mtcdtools.service.dispatching; import android.content.Context; import android.os.AsyncTask; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsSequence; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.objects.actions.Action; +import com.microntek.f1x.mtcdtools.service.storage.NamedObjectsStorage; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java similarity index 90% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java index 77419e5..96c82b7 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/ActionsListDispatchActivity.java @@ -1,6 +1,6 @@ -package android.microntek.f1x.mtcdtools.service.dispatching.activities; +package com.microntek.f1x.mtcdtools.service.dispatching.activities; -import android.microntek.f1x.mtcdtools.utils.ListViewScroller; +import com.microntek.f1x.mtcdtools.utils.ListViewScroller; import android.os.Bundle; import android.os.CountDownTimer; import android.view.View; @@ -10,15 +10,15 @@ import android.widget.RelativeLayout; import android.widget.Toast; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; -import android.microntek.f1x.mtcdtools.service.configuration.ConfigurationChangeListener; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; -import android.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.adapters.NamedObjectIdsArrayAdapter; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.configuration.ConfigurationChangeListener; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceListener; +import com.microntek.f1x.mtcdtools.named.objects.containers.ActionsList; +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java similarity index 89% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java index 4227212..0f8ba9e 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/dispatching/activities/VoiceDispatchActivity.java @@ -1,14 +1,14 @@ -package android.microntek.f1x.mtcdtools.service.dispatching.activities; +package com.microntek.f1x.mtcdtools.service.dispatching.activities; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.speech.RecognizerIntent; -import android.microntek.f1x.mtcdtools.R; -import android.microntek.f1x.mtcdtools.utils.SpeechParser; -import android.microntek.f1x.mtcdtools.service.ServiceActivity; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.R; +import com.microntek.f1x.mtcdtools.utils.SpeechParser; +import com.microntek.f1x.mtcdtools.service.ServiceActivity; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java similarity index 94% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java index 353d61d..112ee9f 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceBinding.java @@ -1,6 +1,6 @@ -package android.microntek.f1x.mtcdtools.service.input; +package com.microntek.f1x.mtcdtools.service.input; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java similarity index 78% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java index 5302f40..6cd05f3 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/KeysSequenceListener.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.input; +package com.microntek.f1x.mtcdtools.service.input; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java similarity index 91% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java index 6142058..a41274e 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX3PressedKeysSequenceManager.java @@ -1,11 +1,11 @@ -package android.microntek.f1x.mtcdtools.service.input; +package com.microntek.f1x.mtcdtools.service.input; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; /** * Created by COMPUTER on 2017-06-19. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java similarity index 89% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java index b09d027..4000103 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PX5PressedKeysSequenceManager.java @@ -1,11 +1,11 @@ -package android.microntek.f1x.mtcdtools.service.input; +package com.microntek.f1x.mtcdtools.service.input; -import android.microntek.CarManager; +import com.microntek.CarManager; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; /** * Created by COMPUTER on 2017-06-19. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java similarity index 91% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java index 87cce70..da06a57 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/input/PressedKeysSequenceManager.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.service.input; +package com.microntek.f1x.mtcdtools.service.input; import android.os.CountDownTimer; -import android.microntek.f1x.mtcdtools.service.configuration.Configuration; -import android.microntek.f1x.mtcdtools.service.configuration.ConfigurationChangeListener; +import com.microntek.f1x.mtcdtools.service.configuration.Configuration; +import com.microntek.f1x.mtcdtools.service.configuration.ConfigurationChangeListener; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java similarity index 84% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java index 80ea516..9d7a4c0 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/AutorunStorage.java @@ -1,8 +1,8 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileReader.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileReader.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileReader.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileReader.java index e199114..4af101d 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileReader.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileReader.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; import android.content.Context; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileStorage.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileStorage.java similarity index 84% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileStorage.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileStorage.java index ceb3677..09c9820 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileStorage.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileStorage.java @@ -1,7 +1,7 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileWriter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileWriter.java similarity index 94% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileWriter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileWriter.java index 6892b17..969756c 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/FileWriter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/FileWriter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; import android.content.Context; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java similarity index 86% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java index 1f9592d..851677b 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/KeysSequenceBindingsStorage.java @@ -1,9 +1,9 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; -import android.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; +import com.microntek.f1x.mtcdtools.service.input.KeysSequenceBinding; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java similarity index 81% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java index 19e0eb1..170badc 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/NamedObjectsStorage.java @@ -1,12 +1,10 @@ -package android.microntek.f1x.mtcdtools.service.storage; - -import android.microntek.f1x.mtcdtools.named.NamedObject; -import android.microntek.f1x.mtcdtools.named.NamedObjectId; -import android.microntek.f1x.mtcdtools.named.NamedObjectsFactory; -import android.microntek.f1x.mtcdtools.named.objects.actions.Action; -import android.microntek.f1x.mtcdtools.named.objects.actions.StartIntentAction; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; +package com.microntek.f1x.mtcdtools.service.storage; + +import com.microntek.f1x.mtcdtools.named.NamedObject; +import com.microntek.f1x.mtcdtools.named.NamedObjectId; +import com.microntek.f1x.mtcdtools.named.NamedObjectsFactory; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.EntryCreationFailed; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java similarity index 91% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java index 1774390..32eb618 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/UniqueObjectsStorage.java @@ -1,6 +1,6 @@ -package android.microntek.f1x.mtcdtools.service.storage; +package com.microntek.f1x.mtcdtools.service.storage; -import android.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; +import com.microntek.f1x.mtcdtools.service.storage.exceptions.DuplicatedEntryException; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java similarity index 83% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java index 6aebdd9..5c17ced 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/DuplicatedEntryException.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.storage.exceptions; +package com.microntek.f1x.mtcdtools.service.storage.exceptions; /** * Created by f1x on 2017-01-22. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java similarity index 83% rename from app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java index ddee8c4..5825b62 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/storage/exceptions/EntryCreationFailed.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.service.storage.exceptions; +package com.microntek.f1x.mtcdtools.service.storage.exceptions; /** * Created by f1x on 2017-01-22. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java index 146c484..5ac78e5 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/KeysSequenceConverter.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListIndexer.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListIndexer.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListIndexer.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListIndexer.java index dbb2234..3302f8e 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListIndexer.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListIndexer.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; /** * Created by f1x on 2017-01-28. diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListViewScroller.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListViewScroller.java similarity index 94% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListViewScroller.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListViewScroller.java index 073cab2..c222f92 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/ListViewScroller.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/ListViewScroller.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; import android.widget.ListView; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/PlatformChecker.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/PlatformChecker.java similarity index 93% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/PlatformChecker.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/PlatformChecker.java index 7bf9287..d9622fa 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/PlatformChecker.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/PlatformChecker.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/SpeechParser.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/SpeechParser.java similarity index 95% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/SpeechParser.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/SpeechParser.java index a0eca97..888f51a 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/SpeechParser.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/SpeechParser.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java similarity index 93% rename from app/src/main/java/android/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java rename to app/src/main/java/com/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java index 1bd1520..f1dbd8d 100644 --- a/app/src/main/java/android/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/utils/StartActivityButtonClickListener.java @@ -1,4 +1,4 @@ -package android.microntek.f1x.mtcdtools.utils; +package com.microntek.f1x.mtcdtools.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 242e292..8247184 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:layout_margin="@dimen/layout_spacing" android:orientation="vertical" - tools:context="android.microntek.f1x.mtcdtools.activities.SettingsActivity"> + tools:context="com.microntek.f1x.mtcdtools.activities.SettingsActivity"> Date: Thu, 13 Aug 2020 21:23:55 +0200 Subject: [PATCH 3/6] Target SDK 29 using AndroidX Also start app at boot + start/restart app after wake-up to be sure. --- app/build.gradle | 26 +++++----- app/src/main/AndroidManifest.xml | 8 +-- .../BootCompletedBroadcastReceiver.java | 41 ++++++++++++++- .../f1x/mtcdtools/service/MtcdService.java | 51 ++++++++++++------- app/src/main/res/values/strings.xml | 3 +- gradle.properties | 4 +- 6 files changed, 94 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 797388b..d301d08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.0' + compileSdkVersion 29 + buildToolsVersion '29.0.3' defaultConfig { applicationId "com.microntek.f1x.mtcdtools" - minSdkVersion 19 - targetSdkVersion 25 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 versionName "1.9" } @@ -20,13 +20,13 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - testCompile 'org.json:json:20140107' - testCompile "org.powermock:powermock-module-junit4:1.6.4" - testCompile "org.powermock:powermock-module-junit4-rule:1.6.4" - testCompile "org.powermock:powermock-api-mockito:1.6.4" - testCompile "org.powermock:powermock-classloading-xstream:1.6.4" - testCompile "org.robolectric:robolectric:3.2.2" - compile 'com.android.support:appcompat-v7:25.1.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + testImplementation 'org.json:json:20140107' + testImplementation "org.powermock:powermock-module-junit4:1.6.4" + testImplementation "org.powermock:powermock-module-junit4-rule:1.6.4" + testImplementation "org.powermock:powermock-api-mockito:1.6.4" + testImplementation "org.powermock:powermock-classloading-xstream:1.6.4" + testImplementation "org.robolectric:robolectric:3.2.2" + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b5ca506..7c4e143 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,6 +24,7 @@ + @@ -45,11 +46,12 @@ android:launchMode="singleInstance" android:screenOrientation="landscape" android:theme="@android:style/Theme.Translucent.NoTitleBar" /> - - + + android:theme="@style/AlertDialogTheme" /> \ No newline at end of file diff --git a/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java index 4352d18..149fe20 100644 --- a/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/BootCompletedBroadcastReceiver.java @@ -1,8 +1,14 @@ package com.microntek.f1x.mtcdtools.service; +import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.os.Build; + +import java.util.Objects; + +import androidx.core.content.ContextCompat; /** * Created by f1x on 2016-08-03. @@ -10,10 +16,41 @@ public class BootCompletedBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if(intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) { + if (Objects.equals(intent.getAction(), Intent.ACTION_BOOT_COMPLETED) || + Objects.equals(intent.getAction(), Intent.ACTION_SCREEN_ON)) { + Intent startServiceIntent = new Intent(context, MtcdService.class); startServiceIntent.setAction(MtcdService.ACTION_AUTORUN); - context.startService(startServiceIntent); + startServiceIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); + + if (!isMyServiceRunning(context)) { + startService(context, startServiceIntent); + } else { + context.stopService(startServiceIntent); + startService(context, startServiceIntent); + } + } + } + + private boolean isMyServiceRunning(Context context) { + ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + + if (manager != null) { + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (MtcdService.class.getName().equals(service.service.getClassName())) { + return true; + } + } + } + return false; + } + + private void startService(Context context, Intent intent) { + if (Build.VERSION.SDK_INT < 26) { + context.startService(intent); + } else { + ContextCompat.startForegroundService(context, intent); } } + } \ No newline at end of file diff --git a/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java index 442ff24..7acdc31 100644 --- a/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java +++ b/app/src/main/java/com/microntek/f1x/mtcdtools/service/MtcdService.java @@ -1,12 +1,16 @@ package com.microntek.f1x.mtcdtools.service; import android.app.Notification; -import android.content.BroadcastReceiver; +import android.app.NotificationChannel; +import android.app.NotificationManager; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; +import android.os.Build; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; + +import androidx.annotation.RequiresApi; +import androidx.core.app.NotificationCompat; + import android.widget.Toast; import com.microntek.f1x.mtcdtools.R; @@ -29,6 +33,7 @@ import org.json.JSONException; import java.io.IOException; +import java.util.Objects; /** * Created by f1x on 2016-08-03. @@ -56,12 +61,11 @@ public void onCreate() { public void onDestroy() { super.onDestroy(); - if(mForceRestart) { + if (mForceRestart) { MtcdServiceWatchdog.scheduleServiceRestart(this); } - if(mServiceInitialized) { - unregisterReceiver(mScreenOnBroadcastReceiver); + if (mServiceInitialized) { mPressedKeysSequenceManager.destroy(); mServiceInitialized = false; } @@ -78,7 +82,7 @@ public IBinder onBind(Intent intent) { public int onStartCommand(Intent intent, int flags, int startId) { super.onStartCommand(intent, flags, startId); - if(mServiceInitialized) { + if (mServiceInitialized) { return START_STICKY; } @@ -90,11 +94,10 @@ public int onStartCommand(Intent intent, int flags, int startId) { mPressedKeysSequenceManager.init(); mPressedKeysSequenceManager.pushListener(new KeysSequenceDispatcher(this, mKeysSequenceBindingsStorage, mNamedObjectsDispatcher, mDispatchingIndicationPlayer)); startForeground(1555, createNotification()); - registerReceiver(mScreenOnBroadcastReceiver, new IntentFilter(Intent.ACTION_SCREEN_ON)); mForceRestart = true; mServiceInitialized = true; - if(ACTION_AUTORUN.equals(intent.getAction())) { + if (ACTION_AUTORUN.equals(intent.getAction())) { mNamedObjectsDispatcher.dispatch(mAutorunStorage.getItems(), this); } } catch (JSONException | IOException | DuplicatedEntryException | EntryCreationFailed e) { @@ -106,7 +109,16 @@ public int onStartCommand(Intent intent, int flags, int startId) { } private Notification createNotification() { - return new NotificationCompat.Builder(this) + String channelId; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + channelId = createNotificationChannel("MtcdToolsService", getString(R.string.PersistentNotificationChannel)); + } else { + // If earlier version, channel ID is not used + // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context) + channelId = ""; + } + + return new NotificationCompat.Builder(this, channelId) .setContentTitle(getString(R.string.app_name)) .setContentText(getString(R.string.MtcdServiceDescription)) .setSmallIcon(R.drawable.service_notification_icon) @@ -114,6 +126,16 @@ private Notification createNotification() { .build(); } + @RequiresApi(Build.VERSION_CODES.O) + private String createNotificationChannel(String channelId, String channelName) { + NotificationChannel channel = new NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_NONE); + + NotificationManager notificationManager = getSystemService(NotificationManager.class); + Objects.requireNonNull(notificationManager).createNotificationChannel(channel); + + return channelId; + } + private boolean mForceRestart; private boolean mServiceInitialized; private NamedObjectsStorage mNamedObjectsStorage; @@ -156,15 +178,6 @@ public AutorunStorage getAutorunStorage() { } }; - private final BroadcastReceiver mScreenOnBroadcastReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if(Intent.ACTION_SCREEN_ON.equals(intent.getAction())) { - mNamedObjectsDispatcher.dispatch(mAutorunStorage.getItems(), MtcdService.this); - } - } - }; - public static final String ACTION_AUTORUN = "com.microntek.f1x.mtcdtools.action.autorun"; private static final String APP_NAME = "MtcdTools"; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f66af6f..dc510d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,7 +30,8 @@ Reset Please provide name - MtcdTools Service is now active + Service is now active. + Persistent notification Service is unavailable Object not found Unknown object type diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file From 34248b492b8aaf008ccff99c4700a18791b0ac98 Mon Sep 17 00:00:00 2001 From: Erwan Finot Date: Thu, 13 Aug 2020 21:31:05 +0200 Subject: [PATCH 4/6] Add automatic dark theme --- app/build.gradle | 1 + app/src/main/res/values/styles.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d301d08..0f4aa8e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,4 +29,5 @@ dependencies { testImplementation "org.powermock:powermock-classloading-xstream:1.6.4" testImplementation "org.robolectric:robolectric:3.2.2" implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.0' } diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 27164a1..84e2e8a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml new file mode 100644 index 0000000..98e93de --- /dev/null +++ b/app/src/main/res/values-land/dimens.xml @@ -0,0 +1,6 @@ + + + 48.0dip + 12.0dip + 14.0dip + diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml new file mode 100644 index 0000000..d4db799 --- /dev/null +++ b/app/src/main/res/values-large/dimens.xml @@ -0,0 +1,10 @@ + + + 440.0dip + 60.000004% + 90.0% + 60.000004% + 90.0% + 55.000008% + 79.99999% + diff --git a/app/src/main/res/values-large/styles.xml b/app/src/main/res/values-large/styles.xml new file mode 100644 index 0000000..5303121 --- /dev/null +++ b/app/src/main/res/values-large/styles.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml new file mode 100644 index 0000000..ff707b7 --- /dev/null +++ b/app/src/main/res/values-v23/styles.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/app/src/main/res/values-v24/styles.xml b/app/src/main/res/values-v24/styles.xml new file mode 100644 index 0000000..6f9471e --- /dev/null +++ b/app/src/main/res/values-v24/styles.xml @@ -0,0 +1,5 @@ + + + + + + diff --git a/app/src/main/res/values-v28/styles.xml b/app/src/main/res/values-v28/styles.xml new file mode 100644 index 0000000..7f5111a --- /dev/null +++ b/app/src/main/res/values-v28/styles.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 4837ca9..6d46087 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -1,13 +1,5 @@ + - - 64sp - 8dp - - 16dp - 16dp - + 8.0dip + 64.0sp diff --git a/app/src/main/res/values-xlarge/dimens.xml b/app/src/main/res/values-xlarge/dimens.xml new file mode 100644 index 0000000..4bb1cbd --- /dev/null +++ b/app/src/main/res/values-xlarge/dimens.xml @@ -0,0 +1,7 @@ + + + 50.0% + 70.00001% + 45.000004% + 72.0% + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..40a9c82 --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,516 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml new file mode 100644 index 0000000..8f7c066 --- /dev/null +++ b/app/src/main/res/values/bools.xml @@ -0,0 +1,6 @@ + + + true + false + true + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9ec1ddb..14153c9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,68 @@ - #3F51B5 - #303F9F - #FF4081 - + @android:color/black + #ff7fa87f + @android:color/black + @android:color/black + @color/material_deep_teal_200 + @color/material_deep_teal_500 + @color/material_grey_800 + @android:color/white + @color/material_grey_850 + @color/material_grey_50 + #80ffffff + #80000000 + @color/bright_foreground_material_light + @color/bright_foreground_material_dark + @android:color/white + @android:color/black + #ff5a595b + #ffd6d7d7 + #fff44336 + #ff303030 + #ff303030 + #80bebebe + #80323232 + #ffbebebe + #ff323232 + #ffff7043 + #ffff5722 + @android:color/white + @android:color/black + #6680cbc4 + #66009688 + #ff37474f + #ff263238 + #ff21272b + #ff80cbc4 + #ff008577 + #fff5f5f5 + #ffe0e0e0 + #fffafafa + #ff757575 + #ff424242 + #ff303030 + #ff212121 + @color/secondary_text_default_material_light + #ff9e9e9e + @android:color/black + @color/material_grey_600 + @color/material_grey_900 + @color/material_grey_100 + #ffffffff + #de000000 + #4dffffff + #39000000 + #33ffffff + #1f000000 + #b3ffffff + #8a000000 + #36ffffff + #24000000 + #ff616161 + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 + #e6616161 + #e6ffffff diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bb8b724..226a67a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,10 +1,124 @@ + - - - 4dp - 32sp - - 16dp - 16dp - + 16.0dip + 72.0dip + 56.0dip + 0.0dip + 0.0dip + 4.0dip + 16.0dip + 10.0dip + 6.0dip + 48.0dip + 180.0dip + 5.0dip + -3.0dip + 48.0dip + 48.0dip + 36.0dip + 48.0dip + 48.0dip + @dimen/abc_control_inset_material + 6.0dip + 8.0dip + @dimen/abc_control_padding_material + 720.0dip + 320.0dip + 2.0dip + 4.0dip + 4.0dip + 2.0dip + 79.99999% + 100.0% + 320.0dip + 320.0dip + 8.0dip + 8.0dip + 65.0% + 95.00001% + 24.0dip + 18.0dip + 8.0dip + 0.3 + 0.26 + 32.0dip + 8.0dip + 8.0dip + 7.0dip + 4.0dip + 10.0dip + 16.0dip + 80.0dip + 64.0dip + 48.0dip + @dimen/abc_action_bar_content_inset_material + 296.0dip + 4.0dip + 48.0dip + 320.0dip + 2.0dip + 2.0dip + 20.0dip + 0.0px + 14.0sp + 14.0sp + 14.0sp + 12.0sp + 34.0sp + 45.0sp + 56.0sp + 112.0sp + 24.0sp + 22.0sp + 18.0sp + 14.0sp + 16.0sp + 14.0sp + 16.0sp + 16.0dip + 20.0sp + 20.0dip + 4.0dip + 32.0sp + 4.0dip + 6.0dip + 8.0dip + 4.0dip + 2.0dip + 320.0dip + 320.0dip + 0.3 + 0.26 + 16.0dip + 0.26 + 0.2 + 0.12 + 0.5 + 0.38 + 0.7 + 0.54 + 16.0dip + 32.0dip + 13.0sp + 12.0dip + 0.0dip + 64.0dip + 64.0dip + 0.0dip + 12.0dip + 16.0dip + 4.0dip + 3.0dip + 24.0dip + 13.0sp + 10.0dip + 5.0dip + 2.0dip + 16.0dip + 8.0dip + 8.0dip + 96.0dip + 6.5dip + 0.0dip + 16.0dip diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml new file mode 100644 index 0000000..6835c62 --- /dev/null +++ b/app/src/main/res/values/ids.xml @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml new file mode 100644 index 0000000..9b13c43 --- /dev/null +++ b/app/src/main/res/values/integers.xml @@ -0,0 +1,8 @@ + + + 220 + 150 + 127 + 150 + 999 + diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml new file mode 100644 index 0000000..9d426c0 --- /dev/null +++ b/app/src/main/res/values/public.xml @@ -0,0 +1,1440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 70497ef..ef873d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,4 +59,34 @@ Activity Service Key pressed sound + + Navigate home + Navigate up + More options + Done + See all + Choose an app + OFF + ON + Alt+ + Ctrl+ + delete + enter + Function+ + Meta+ + Shift+ + space + Sym+ + Menu+ + Search… + Clear query + Search query + Search + Submit query + Voice search + Share with + Share with %s + Collapse + Search + 999+ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 84e2e8a..2c56efd 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,15 +1,1107 @@ + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -