From b3499d57d38321f8073e9125aa0fbf5af43636c5 Mon Sep 17 00:00:00 2001 From: Iu-Wei Date: Mon, 4 Apr 2016 19:37:09 -0400 Subject: [PATCH] renamed files and folders to Electric_Boat_app --- .../.gitignore | 0 Electric_Boat_Application/.idea/.name | 1 + .../.idea/compiler.xml | 0 .../.idea/copyright/profiles_settings.xml | 0 .../.idea/encodings.xml | 0 .../.idea/gradle.xml | 0 .../.idea/misc.xml | 0 .../.idea/modules.xml | 2 +- .../.idea/runConfigurations.xml | 0 .../.idea/vcs.xml | 0 .../app/.gitignore | 0 .../app/build.gradle | 0 .../app/proguard-rules.pro | 0 .../botton/testapplication/ApplicationTest.java | 0 .../app/src/main/AndroidManifest.xml | 0 .../botton/testapplication/MainActivity.java | 5 +++-- .../app/src/main/res/layout/activity_main.xml | 0 .../app/src/main/res/layout/content_main.xml | 0 .../app/src/main/res/menu/menu_main.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-v21/styles.xml | 0 .../app/src/main/res/values-w820dp/dimens.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/dimens.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../botton/testapplication/ExampleUnitTest.java | 0 .../build.gradle | 0 .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../settings.gradle | 0 TestApplication/.idea/.name | 1 - 39 files changed, 5 insertions(+), 4 deletions(-) rename {TestApplication => Electric_Boat_Application}/.gitignore (100%) create mode 100644 Electric_Boat_Application/.idea/.name rename {TestApplication => Electric_Boat_Application}/.idea/compiler.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/copyright/profiles_settings.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/encodings.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/gradle.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/misc.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/modules.xml (63%) rename {TestApplication => Electric_Boat_Application}/.idea/runConfigurations.xml (100%) rename {TestApplication => Electric_Boat_Application}/.idea/vcs.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/.gitignore (100%) rename {TestApplication => Electric_Boat_Application}/app/build.gradle (100%) rename {TestApplication => Electric_Boat_Application}/app/proguard-rules.pro (100%) rename {TestApplication => Electric_Boat_Application}/app/src/androidTest/java/example/botton/testapplication/ApplicationTest.java (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/AndroidManifest.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/java/example/botton/testapplication/MainActivity.java (97%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/layout/activity_main.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/layout/content_main.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/menu/menu_main.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values-v21/styles.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values-w820dp/dimens.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values/colors.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values/dimens.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values/strings.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/main/res/values/styles.xml (100%) rename {TestApplication => Electric_Boat_Application}/app/src/test/java/example/botton/testapplication/ExampleUnitTest.java (100%) rename {TestApplication => Electric_Boat_Application}/build.gradle (100%) rename {TestApplication => Electric_Boat_Application}/gradle.properties (100%) rename {TestApplication => Electric_Boat_Application}/gradle/wrapper/gradle-wrapper.jar (100%) rename {TestApplication => Electric_Boat_Application}/gradle/wrapper/gradle-wrapper.properties (100%) rename {TestApplication => Electric_Boat_Application}/gradlew (100%) rename {TestApplication => Electric_Boat_Application}/gradlew.bat (100%) rename {TestApplication => Electric_Boat_Application}/settings.gradle (100%) delete mode 100644 TestApplication/.idea/.name diff --git a/TestApplication/.gitignore b/Electric_Boat_Application/.gitignore similarity index 100% rename from TestApplication/.gitignore rename to Electric_Boat_Application/.gitignore diff --git a/Electric_Boat_Application/.idea/.name b/Electric_Boat_Application/.idea/.name new file mode 100644 index 0000000..a0adc15 --- /dev/null +++ b/Electric_Boat_Application/.idea/.name @@ -0,0 +1 @@ +Electric_Boat_Application \ No newline at end of file diff --git a/TestApplication/.idea/compiler.xml b/Electric_Boat_Application/.idea/compiler.xml similarity index 100% rename from TestApplication/.idea/compiler.xml rename to Electric_Boat_Application/.idea/compiler.xml diff --git a/TestApplication/.idea/copyright/profiles_settings.xml b/Electric_Boat_Application/.idea/copyright/profiles_settings.xml similarity index 100% rename from TestApplication/.idea/copyright/profiles_settings.xml rename to Electric_Boat_Application/.idea/copyright/profiles_settings.xml diff --git a/TestApplication/.idea/encodings.xml b/Electric_Boat_Application/.idea/encodings.xml similarity index 100% rename from TestApplication/.idea/encodings.xml rename to Electric_Boat_Application/.idea/encodings.xml diff --git a/TestApplication/.idea/gradle.xml b/Electric_Boat_Application/.idea/gradle.xml similarity index 100% rename from TestApplication/.idea/gradle.xml rename to Electric_Boat_Application/.idea/gradle.xml diff --git a/TestApplication/.idea/misc.xml b/Electric_Boat_Application/.idea/misc.xml similarity index 100% rename from TestApplication/.idea/misc.xml rename to Electric_Boat_Application/.idea/misc.xml diff --git a/TestApplication/.idea/modules.xml b/Electric_Boat_Application/.idea/modules.xml similarity index 63% rename from TestApplication/.idea/modules.xml rename to Electric_Boat_Application/.idea/modules.xml index e8fd3ac..ab1e9df 100644 --- a/TestApplication/.idea/modules.xml +++ b/Electric_Boat_Application/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/TestApplication/.idea/runConfigurations.xml b/Electric_Boat_Application/.idea/runConfigurations.xml similarity index 100% rename from TestApplication/.idea/runConfigurations.xml rename to Electric_Boat_Application/.idea/runConfigurations.xml diff --git a/TestApplication/.idea/vcs.xml b/Electric_Boat_Application/.idea/vcs.xml similarity index 100% rename from TestApplication/.idea/vcs.xml rename to Electric_Boat_Application/.idea/vcs.xml diff --git a/TestApplication/app/.gitignore b/Electric_Boat_Application/app/.gitignore similarity index 100% rename from TestApplication/app/.gitignore rename to Electric_Boat_Application/app/.gitignore diff --git a/TestApplication/app/build.gradle b/Electric_Boat_Application/app/build.gradle similarity index 100% rename from TestApplication/app/build.gradle rename to Electric_Boat_Application/app/build.gradle diff --git a/TestApplication/app/proguard-rules.pro b/Electric_Boat_Application/app/proguard-rules.pro similarity index 100% rename from TestApplication/app/proguard-rules.pro rename to Electric_Boat_Application/app/proguard-rules.pro diff --git a/TestApplication/app/src/androidTest/java/example/botton/testapplication/ApplicationTest.java b/Electric_Boat_Application/app/src/androidTest/java/example/botton/testapplication/ApplicationTest.java similarity index 100% rename from TestApplication/app/src/androidTest/java/example/botton/testapplication/ApplicationTest.java rename to Electric_Boat_Application/app/src/androidTest/java/example/botton/testapplication/ApplicationTest.java diff --git a/TestApplication/app/src/main/AndroidManifest.xml b/Electric_Boat_Application/app/src/main/AndroidManifest.xml similarity index 100% rename from TestApplication/app/src/main/AndroidManifest.xml rename to Electric_Boat_Application/app/src/main/AndroidManifest.xml diff --git a/TestApplication/app/src/main/java/example/botton/testapplication/MainActivity.java b/Electric_Boat_Application/app/src/main/java/example/botton/testapplication/MainActivity.java similarity index 97% rename from TestApplication/app/src/main/java/example/botton/testapplication/MainActivity.java rename to Electric_Boat_Application/app/src/main/java/example/botton/testapplication/MainActivity.java index dff0b86..2945592 100644 --- a/TestApplication/app/src/main/java/example/botton/testapplication/MainActivity.java +++ b/Electric_Boat_Application/app/src/main/java/example/botton/testapplication/MainActivity.java @@ -42,6 +42,7 @@ public class MainActivity extends AppCompatActivity { this.idNum = num; this.value = 0; + } public int getValue() @@ -80,6 +81,8 @@ public class MainActivity extends AppCompatActivity seekbar1 = (SeekBar)findViewById(R.id.motorBar1); seekbar2 = (SeekBar)findViewById(R.id.motorBar2); + seekbar1.setProgress(SeekBarChangeListener.RANGE); + seekbar2.setProgress(SeekBarChangeListener.RANGE); //result = (TextView)findViewById(R.id.tvResult); @@ -111,8 +114,6 @@ public class MainActivity extends AppCompatActivity Log.d("bt", "Created a connection with the JY-MCU"); robotSock.connect(); outputStream = robotSock.getOutputStream(); - String mine = "q"; - outputStream.write(mine.getBytes()); } catch (IOException e) { e.printStackTrace(); diff --git a/TestApplication/app/src/main/res/layout/activity_main.xml b/Electric_Boat_Application/app/src/main/res/layout/activity_main.xml similarity index 100% rename from TestApplication/app/src/main/res/layout/activity_main.xml rename to Electric_Boat_Application/app/src/main/res/layout/activity_main.xml diff --git a/TestApplication/app/src/main/res/layout/content_main.xml b/Electric_Boat_Application/app/src/main/res/layout/content_main.xml similarity index 100% rename from TestApplication/app/src/main/res/layout/content_main.xml rename to Electric_Boat_Application/app/src/main/res/layout/content_main.xml diff --git a/TestApplication/app/src/main/res/menu/menu_main.xml b/Electric_Boat_Application/app/src/main/res/menu/menu_main.xml similarity index 100% rename from TestApplication/app/src/main/res/menu/menu_main.xml rename to Electric_Boat_Application/app/src/main/res/menu/menu_main.xml diff --git a/TestApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Electric_Boat_Application/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from TestApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to Electric_Boat_Application/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/TestApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Electric_Boat_Application/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from TestApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to Electric_Boat_Application/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/TestApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Electric_Boat_Application/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from TestApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to Electric_Boat_Application/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/TestApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Electric_Boat_Application/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from TestApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to Electric_Boat_Application/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/TestApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Electric_Boat_Application/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from TestApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to Electric_Boat_Application/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/TestApplication/app/src/main/res/values-v21/styles.xml b/Electric_Boat_Application/app/src/main/res/values-v21/styles.xml similarity index 100% rename from TestApplication/app/src/main/res/values-v21/styles.xml rename to Electric_Boat_Application/app/src/main/res/values-v21/styles.xml diff --git a/TestApplication/app/src/main/res/values-w820dp/dimens.xml b/Electric_Boat_Application/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from TestApplication/app/src/main/res/values-w820dp/dimens.xml rename to Electric_Boat_Application/app/src/main/res/values-w820dp/dimens.xml diff --git a/TestApplication/app/src/main/res/values/colors.xml b/Electric_Boat_Application/app/src/main/res/values/colors.xml similarity index 100% rename from TestApplication/app/src/main/res/values/colors.xml rename to Electric_Boat_Application/app/src/main/res/values/colors.xml diff --git a/TestApplication/app/src/main/res/values/dimens.xml b/Electric_Boat_Application/app/src/main/res/values/dimens.xml similarity index 100% rename from TestApplication/app/src/main/res/values/dimens.xml rename to Electric_Boat_Application/app/src/main/res/values/dimens.xml diff --git a/TestApplication/app/src/main/res/values/strings.xml b/Electric_Boat_Application/app/src/main/res/values/strings.xml similarity index 100% rename from TestApplication/app/src/main/res/values/strings.xml rename to Electric_Boat_Application/app/src/main/res/values/strings.xml diff --git a/TestApplication/app/src/main/res/values/styles.xml b/Electric_Boat_Application/app/src/main/res/values/styles.xml similarity index 100% rename from TestApplication/app/src/main/res/values/styles.xml rename to Electric_Boat_Application/app/src/main/res/values/styles.xml diff --git a/TestApplication/app/src/test/java/example/botton/testapplication/ExampleUnitTest.java b/Electric_Boat_Application/app/src/test/java/example/botton/testapplication/ExampleUnitTest.java similarity index 100% rename from TestApplication/app/src/test/java/example/botton/testapplication/ExampleUnitTest.java rename to Electric_Boat_Application/app/src/test/java/example/botton/testapplication/ExampleUnitTest.java diff --git a/TestApplication/build.gradle b/Electric_Boat_Application/build.gradle similarity index 100% rename from TestApplication/build.gradle rename to Electric_Boat_Application/build.gradle diff --git a/TestApplication/gradle.properties b/Electric_Boat_Application/gradle.properties similarity index 100% rename from TestApplication/gradle.properties rename to Electric_Boat_Application/gradle.properties diff --git a/TestApplication/gradle/wrapper/gradle-wrapper.jar b/Electric_Boat_Application/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from TestApplication/gradle/wrapper/gradle-wrapper.jar rename to Electric_Boat_Application/gradle/wrapper/gradle-wrapper.jar diff --git a/TestApplication/gradle/wrapper/gradle-wrapper.properties b/Electric_Boat_Application/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from TestApplication/gradle/wrapper/gradle-wrapper.properties rename to Electric_Boat_Application/gradle/wrapper/gradle-wrapper.properties diff --git a/TestApplication/gradlew b/Electric_Boat_Application/gradlew similarity index 100% rename from TestApplication/gradlew rename to Electric_Boat_Application/gradlew diff --git a/TestApplication/gradlew.bat b/Electric_Boat_Application/gradlew.bat similarity index 100% rename from TestApplication/gradlew.bat rename to Electric_Boat_Application/gradlew.bat diff --git a/TestApplication/settings.gradle b/Electric_Boat_Application/settings.gradle similarity index 100% rename from TestApplication/settings.gradle rename to Electric_Boat_Application/settings.gradle diff --git a/TestApplication/.idea/.name b/TestApplication/.idea/.name deleted file mode 100644 index ef26856..0000000 --- a/TestApplication/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Test Application \ No newline at end of file