From 9ffc0aa7730c4eb0c9b16290baa3de416ec4b300 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 12 Aug 2015 13:52:38 +1200 Subject: [PATCH] Rename main app module --- .gitignore | 4 ++-- {traccar-client => app}/build.gradle | 4 ---- .../src/main/AndroidManifest.xml | 0 .../main/java/org/traccar/client/AboutActivity.java | 0 .../java/org/traccar/client/AutostartReceiver.java | 0 .../java/org/traccar/client/ClientController.java | 0 .../main/java/org/traccar/client/Connection.java | 0 .../java/org/traccar/client/PositionProvider.java | 0 .../src/main/java/org/traccar/client/Protocol.java | 0 .../java/org/traccar/client/RequestManager.java | 0 .../java/org/traccar/client/StatusActivity.java | 0 .../java/org/traccar/client/TraccarActivity.java | 0 .../java/org/traccar/client/TraccarService.java | 0 .../src/main/res/drawable-hdpi/ic_launcher.png | Bin .../src/main/res/drawable-ldpi/ic_launcher.png | Bin .../src/main/res/drawable-mdpi/ic_launcher.png | Bin .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin .../src/main/res/layout/about.xml | 0 .../src/main/res/layout/status.xml | 0 {traccar-client => app}/src/main/res/menu/main.xml | 0 .../src/main/res/menu/status.xml | 0 .../src/main/res/values-cs/strings.xml | 0 .../src/main/res/values-da/strings.xml | 0 .../src/main/res/values-de/strings.xml | 0 .../src/main/res/values-es/strings.xml | 0 .../src/main/res/values-fr/strings.xml | 0 .../src/main/res/values-nb/strings.xml | 0 .../src/main/res/values-pt/strings.xml | 0 .../src/main/res/values-ru/strings.xml | 0 .../src/main/res/values-sr/strings.xml | 0 .../src/main/res/values-v11/themes.xml | 0 .../src/main/res/values-v21/themes.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/themes.xml | 0 .../src/main/res/values/values.xml | 0 .../src/main/res/xml-v14/preferences.xml | 0 .../src/main/res/xml/preferences.xml | 0 .../java/org/traccar/client/RequestManagerTest.java | 0 settings.gradle | 2 +- 42 files changed, 3 insertions(+), 7 deletions(-) rename {traccar-client => app}/build.gradle (91%) rename {traccar-client => app}/src/main/AndroidManifest.xml (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/AboutActivity.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/AutostartReceiver.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/ClientController.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/Connection.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/PositionProvider.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/Protocol.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/RequestManager.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/StatusActivity.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/TraccarActivity.java (100%) rename {traccar-client => app}/src/main/java/org/traccar/client/TraccarService.java (100%) rename {traccar-client => app}/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/drawable-ldpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/drawable-xxxhdpi/ic_launcher.png (100%) rename {traccar-client => app}/src/main/res/layout/about.xml (100%) rename {traccar-client => app}/src/main/res/layout/status.xml (100%) rename {traccar-client => app}/src/main/res/menu/main.xml (100%) rename {traccar-client => app}/src/main/res/menu/status.xml (100%) rename {traccar-client => app}/src/main/res/values-cs/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-da/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-de/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-es/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-fr/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-nb/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-pt/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-ru/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-sr/strings.xml (100%) rename {traccar-client => app}/src/main/res/values-v11/themes.xml (100%) rename {traccar-client => app}/src/main/res/values-v21/themes.xml (100%) rename {traccar-client => app}/src/main/res/values/dimens.xml (100%) rename {traccar-client => app}/src/main/res/values/strings.xml (100%) rename {traccar-client => app}/src/main/res/values/themes.xml (100%) rename {traccar-client => app}/src/main/res/values/values.xml (100%) rename {traccar-client => app}/src/main/res/xml-v14/preferences.xml (100%) rename {traccar-client => app}/src/main/res/xml/preferences.xml (100%) rename {traccar-client => app}/src/test/java/org/traccar/client/RequestManagerTest.java (100%) diff --git a/.gitignore b/.gitignore index fb32647..52708fd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ .idea/ local.properties traccar-client-android.iml -traccar-client/traccar-client.iml +app/app.iml build/ -traccar-client/build/ +app/build/ diff --git a/traccar-client/build.gradle b/app/build.gradle similarity index 91% rename from traccar-client/build.gradle rename to app/build.gradle index aed4ffc..0ede8ec 100644 --- a/traccar-client/build.gradle +++ b/app/build.gradle @@ -26,10 +26,6 @@ android { signingConfig signingConfigs.release } } - - lintOptions { - checkReleaseBuilds false - } } dependencies { diff --git a/traccar-client/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from traccar-client/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/traccar-client/src/main/java/org/traccar/client/AboutActivity.java b/app/src/main/java/org/traccar/client/AboutActivity.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/AboutActivity.java rename to app/src/main/java/org/traccar/client/AboutActivity.java diff --git a/traccar-client/src/main/java/org/traccar/client/AutostartReceiver.java b/app/src/main/java/org/traccar/client/AutostartReceiver.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/AutostartReceiver.java rename to app/src/main/java/org/traccar/client/AutostartReceiver.java diff --git a/traccar-client/src/main/java/org/traccar/client/ClientController.java b/app/src/main/java/org/traccar/client/ClientController.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/ClientController.java rename to app/src/main/java/org/traccar/client/ClientController.java diff --git a/traccar-client/src/main/java/org/traccar/client/Connection.java b/app/src/main/java/org/traccar/client/Connection.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/Connection.java rename to app/src/main/java/org/traccar/client/Connection.java diff --git a/traccar-client/src/main/java/org/traccar/client/PositionProvider.java b/app/src/main/java/org/traccar/client/PositionProvider.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/PositionProvider.java rename to app/src/main/java/org/traccar/client/PositionProvider.java diff --git a/traccar-client/src/main/java/org/traccar/client/Protocol.java b/app/src/main/java/org/traccar/client/Protocol.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/Protocol.java rename to app/src/main/java/org/traccar/client/Protocol.java diff --git a/traccar-client/src/main/java/org/traccar/client/RequestManager.java b/app/src/main/java/org/traccar/client/RequestManager.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/RequestManager.java rename to app/src/main/java/org/traccar/client/RequestManager.java diff --git a/traccar-client/src/main/java/org/traccar/client/StatusActivity.java b/app/src/main/java/org/traccar/client/StatusActivity.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/StatusActivity.java rename to app/src/main/java/org/traccar/client/StatusActivity.java diff --git a/traccar-client/src/main/java/org/traccar/client/TraccarActivity.java b/app/src/main/java/org/traccar/client/TraccarActivity.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/TraccarActivity.java rename to app/src/main/java/org/traccar/client/TraccarActivity.java diff --git a/traccar-client/src/main/java/org/traccar/client/TraccarService.java b/app/src/main/java/org/traccar/client/TraccarService.java similarity index 100% rename from traccar-client/src/main/java/org/traccar/client/TraccarService.java rename to app/src/main/java/org/traccar/client/TraccarService.java diff --git a/traccar-client/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/traccar-client/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-ldpi/ic_launcher.png rename to app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/traccar-client/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/traccar-client/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/traccar-client/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/traccar-client/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from traccar-client/src/main/res/drawable-xxxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/traccar-client/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml similarity index 100% rename from traccar-client/src/main/res/layout/about.xml rename to app/src/main/res/layout/about.xml diff --git a/traccar-client/src/main/res/layout/status.xml b/app/src/main/res/layout/status.xml similarity index 100% rename from traccar-client/src/main/res/layout/status.xml rename to app/src/main/res/layout/status.xml diff --git a/traccar-client/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from traccar-client/src/main/res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/traccar-client/src/main/res/menu/status.xml b/app/src/main/res/menu/status.xml similarity index 100% rename from traccar-client/src/main/res/menu/status.xml rename to app/src/main/res/menu/status.xml diff --git a/traccar-client/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/traccar-client/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/traccar-client/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/traccar-client/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/traccar-client/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/traccar-client/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-nb/strings.xml rename to app/src/main/res/values-nb/strings.xml diff --git a/traccar-client/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/traccar-client/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/traccar-client/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml similarity index 100% rename from traccar-client/src/main/res/values-sr/strings.xml rename to app/src/main/res/values-sr/strings.xml diff --git a/traccar-client/src/main/res/values-v11/themes.xml b/app/src/main/res/values-v11/themes.xml similarity index 100% rename from traccar-client/src/main/res/values-v11/themes.xml rename to app/src/main/res/values-v11/themes.xml diff --git a/traccar-client/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml similarity index 100% rename from traccar-client/src/main/res/values-v21/themes.xml rename to app/src/main/res/values-v21/themes.xml diff --git a/traccar-client/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from traccar-client/src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/traccar-client/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from traccar-client/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/traccar-client/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from traccar-client/src/main/res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/traccar-client/src/main/res/values/values.xml b/app/src/main/res/values/values.xml similarity index 100% rename from traccar-client/src/main/res/values/values.xml rename to app/src/main/res/values/values.xml diff --git a/traccar-client/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml similarity index 100% rename from traccar-client/src/main/res/xml-v14/preferences.xml rename to app/src/main/res/xml-v14/preferences.xml diff --git a/traccar-client/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from traccar-client/src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/traccar-client/src/test/java/org/traccar/client/RequestManagerTest.java b/app/src/test/java/org/traccar/client/RequestManagerTest.java similarity index 100% rename from traccar-client/src/test/java/org/traccar/client/RequestManagerTest.java rename to app/src/test/java/org/traccar/client/RequestManagerTest.java diff --git a/settings.gradle b/settings.gradle index 70744aa..e7b4def 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':traccar-client' +include ':app'