diff --git a/.classpath b/.classpath deleted file mode 100644 index 1a9a798..0000000 --- a/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index e0cba59..6169ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,10 @@ gen/ local.properties lint.xml -.DS_Store \ No newline at end of file +.DS_Store + +# gradle +.idea +.gradle +build +app/build \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/activation.xml b/.idea/libraries/activation.xml new file mode 100644 index 0000000..1b24690 --- /dev/null +++ b/.idea/libraries/activation.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/additionnal.xml b/.idea/libraries/additionnal.xml new file mode 100644 index 0000000..64eeb8b --- /dev/null +++ b/.idea/libraries/additionnal.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/android_support_v4.xml b/.idea/libraries/android_support_v4.xml new file mode 100644 index 0000000..15cf6de --- /dev/null +++ b/.idea/libraries/android_support_v4.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml b/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml new file mode 100644 index 0000000..dd71084 --- /dev/null +++ b/.idea/libraries/animated_vector_drawable_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml b/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml new file mode 100644 index 0000000..6757151 --- /dev/null +++ b/.idea/libraries/appcompat_v7_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/commons_io_2_5.xml b/.idea/libraries/commons_io_2_5.xml new file mode 100644 index 0000000..9bb8366 --- /dev/null +++ b/.idea/libraries/commons_io_2_5.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_1_0_2.xml b/.idea/libraries/constraint_layout_1_0_2.xml new file mode 100644 index 0000000..7921b84 --- /dev/null +++ b/.idea/libraries/constraint_layout_1_0_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_solver_1_0_2.xml b/.idea/libraries/constraint_layout_solver_1_0_2.xml new file mode 100644 index 0000000..1645e21 --- /dev/null +++ b/.idea/libraries/constraint_layout_solver_1_0_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml new file mode 100644 index 0000000..5b49501 --- /dev/null +++ b/.idea/libraries/espresso_core_2_2_2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml new file mode 100644 index 0000000..0914992 --- /dev/null +++ b/.idea/libraries/espresso_idling_resource_2_2_2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml new file mode 100644 index 0000000..200b42b --- /dev/null +++ b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml new file mode 100644 index 0000000..157e3f3 --- /dev/null +++ b/.idea/libraries/hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml new file mode 100644 index 0000000..bab4b95 --- /dev/null +++ b/.idea/libraries/hamcrest_integration_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml new file mode 100644 index 0000000..923d5fc --- /dev/null +++ b/.idea/libraries/hamcrest_library_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml new file mode 100644 index 0000000..6630dda --- /dev/null +++ b/.idea/libraries/javawriter_2_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml new file mode 100644 index 0000000..4179473 --- /dev/null +++ b/.idea/libraries/javax_annotation_api_1_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/javax_inject_1.xml new file mode 100644 index 0000000..eebeedd --- /dev/null +++ b/.idea/libraries/javax_inject_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/jsr305_2_0_1.xml new file mode 100644 index 0000000..cdf9878 --- /dev/null +++ b/.idea/libraries/jsr305_2_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml new file mode 100644 index 0000000..305df30 --- /dev/null +++ b/.idea/libraries/junit_4_12.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/mail.xml b/.idea/libraries/mail.xml new file mode 100644 index 0000000..091e8f3 --- /dev/null +++ b/.idea/libraries/mail.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml new file mode 100644 index 0000000..279e72f --- /dev/null +++ b/.idea/libraries/rules_0_5.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml new file mode 100644 index 0000000..60a921f --- /dev/null +++ b/.idea/libraries/runner_0_5.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_26_0_0_alpha1.xml b/.idea/libraries/support_annotations_26_0_0_alpha1.xml new file mode 100644 index 0000000..6c673ac --- /dev/null +++ b/.idea/libraries/support_annotations_26_0_0_alpha1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_compat_26_0_0_alpha1.xml b/.idea/libraries/support_compat_26_0_0_alpha1.xml new file mode 100644 index 0000000..0887e78 --- /dev/null +++ b/.idea/libraries/support_compat_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_26_0_0_alpha1.xml b/.idea/libraries/support_core_ui_26_0_0_alpha1.xml new file mode 100644 index 0000000..79530ba --- /dev/null +++ b/.idea/libraries/support_core_ui_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_26_0_0_alpha1.xml b/.idea/libraries/support_core_utils_26_0_0_alpha1.xml new file mode 100644 index 0000000..096fb51 --- /dev/null +++ b/.idea/libraries/support_core_utils_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_fragment_26_0_0_alpha1.xml b/.idea/libraries/support_fragment_26_0_0_alpha1.xml new file mode 100644 index 0000000..ae5f3fa --- /dev/null +++ b/.idea/libraries/support_fragment_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_26_0_0_alpha1.xml b/.idea/libraries/support_media_compat_26_0_0_alpha1.xml new file mode 100644 index 0000000..96efc47 --- /dev/null +++ b/.idea/libraries/support_media_compat_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_26_0_0_alpha1.xml b/.idea/libraries/support_v4_26_0_0_alpha1.xml new file mode 100644 index 0000000..9885c57 --- /dev/null +++ b/.idea/libraries/support_v4_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml b/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml new file mode 100644 index 0000000..d8ad87a --- /dev/null +++ b/.idea/libraries/support_vector_drawable_26_0_0_alpha1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..8306744 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index b3c8a2f..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Emmagee - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Emmagee.iml b/Emmagee.iml new file mode 100644 index 0000000..50f492e --- /dev/null +++ b/Emmagee.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VERSION b/VERSION deleted file mode 100644 index 6b4950e..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.4 diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..660114b --- /dev/null +++ b/app/app.iml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..2a3f609 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + buildToolsVersion "26.0.2" + + defaultConfig { + applicationId "com.netease.qa.emmagee" + minSdkVersion 14 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:26.+' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + testCompile 'junit:junit:4.12' +} diff --git a/libs/activation.jar b/app/libs/activation.jar similarity index 100% rename from libs/activation.jar rename to app/libs/activation.jar diff --git a/libs/additionnal.jar b/app/libs/additionnal.jar similarity index 100% rename from libs/additionnal.jar rename to app/libs/additionnal.jar diff --git a/libs/commons-io-2.5.jar b/app/libs/commons-io-2.5.jar similarity index 100% rename from libs/commons-io-2.5.jar rename to app/libs/commons-io-2.5.jar diff --git a/libs/mail.jar b/app/libs/mail.jar similarity index 100% rename from libs/mail.jar rename to app/libs/mail.jar diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..fcbacc0 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/changli.scl/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/fliggy/schedule/app/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/fliggy/schedule/app/ExampleInstrumentedTest.java new file mode 100644 index 0000000..c93b495 --- /dev/null +++ b/app/src/androidTest/java/com/fliggy/schedule/app/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.fliggy.schedule.app; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.fliggy.schedule.app", appContext.getPackageName()); + } +} diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/com/netease/qa/emmagee/activity/AboutActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/AboutActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/AboutActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/AboutActivity.java diff --git a/src/com/netease/qa/emmagee/activity/MailSettingsActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/MailSettingsActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/MailSettingsActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/MailSettingsActivity.java diff --git a/src/com/netease/qa/emmagee/activity/MainPageActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/MainPageActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/MainPageActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/MainPageActivity.java diff --git a/src/com/netease/qa/emmagee/activity/SettingsActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/SettingsActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/SettingsActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/SettingsActivity.java diff --git a/src/com/netease/qa/emmagee/activity/TestListActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/TestListActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/TestListActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/TestListActivity.java diff --git a/src/com/netease/qa/emmagee/activity/TestReportActivity.java b/app/src/main/java/com/netease/qa/emmagee/activity/TestReportActivity.java similarity index 100% rename from src/com/netease/qa/emmagee/activity/TestReportActivity.java rename to app/src/main/java/com/netease/qa/emmagee/activity/TestReportActivity.java diff --git a/src/com/netease/qa/emmagee/service/EmmageeService.java b/app/src/main/java/com/netease/qa/emmagee/service/EmmageeService.java similarity index 100% rename from src/com/netease/qa/emmagee/service/EmmageeService.java rename to app/src/main/java/com/netease/qa/emmagee/service/EmmageeService.java diff --git a/src/com/netease/qa/emmagee/utils/Constants.java b/app/src/main/java/com/netease/qa/emmagee/utils/Constants.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/Constants.java rename to app/src/main/java/com/netease/qa/emmagee/utils/Constants.java diff --git a/src/com/netease/qa/emmagee/utils/CpuInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/CpuInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/CpuInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/CpuInfo.java diff --git a/src/com/netease/qa/emmagee/utils/CurrentInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/CurrentInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/CurrentInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/CurrentInfo.java diff --git a/src/com/netease/qa/emmagee/utils/CustomizedAuthenticator.java b/app/src/main/java/com/netease/qa/emmagee/utils/CustomizedAuthenticator.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/CustomizedAuthenticator.java rename to app/src/main/java/com/netease/qa/emmagee/utils/CustomizedAuthenticator.java diff --git a/src/com/netease/qa/emmagee/utils/EncryptData.java b/app/src/main/java/com/netease/qa/emmagee/utils/EncryptData.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/EncryptData.java rename to app/src/main/java/com/netease/qa/emmagee/utils/EncryptData.java diff --git a/src/com/netease/qa/emmagee/utils/FpsInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/FpsInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/FpsInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/FpsInfo.java diff --git a/src/com/netease/qa/emmagee/utils/MailSender.java b/app/src/main/java/com/netease/qa/emmagee/utils/MailSender.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/MailSender.java rename to app/src/main/java/com/netease/qa/emmagee/utils/MailSender.java diff --git a/src/com/netease/qa/emmagee/utils/MemoryInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/MemoryInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/MemoryInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/MemoryInfo.java diff --git a/src/com/netease/qa/emmagee/utils/MyApplication.java b/app/src/main/java/com/netease/qa/emmagee/utils/MyApplication.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/MyApplication.java rename to app/src/main/java/com/netease/qa/emmagee/utils/MyApplication.java diff --git a/src/com/netease/qa/emmagee/utils/ProcessInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/ProcessInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/ProcessInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/ProcessInfo.java diff --git a/src/com/netease/qa/emmagee/utils/Programe.java b/app/src/main/java/com/netease/qa/emmagee/utils/Programe.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/Programe.java rename to app/src/main/java/com/netease/qa/emmagee/utils/Programe.java diff --git a/src/com/netease/qa/emmagee/utils/Settings.java b/app/src/main/java/com/netease/qa/emmagee/utils/Settings.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/Settings.java rename to app/src/main/java/com/netease/qa/emmagee/utils/Settings.java diff --git a/src/com/netease/qa/emmagee/utils/TrafficInfo.java b/app/src/main/java/com/netease/qa/emmagee/utils/TrafficInfo.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/TrafficInfo.java rename to app/src/main/java/com/netease/qa/emmagee/utils/TrafficInfo.java diff --git a/src/com/netease/qa/emmagee/utils/WakeLockHelper.java b/app/src/main/java/com/netease/qa/emmagee/utils/WakeLockHelper.java similarity index 100% rename from src/com/netease/qa/emmagee/utils/WakeLockHelper.java rename to app/src/main/java/com/netease/qa/emmagee/utils/WakeLockHelper.java diff --git a/res/drawable-hdpi/actionbar_bg.9.png b/app/src/main/res/drawable-hdpi/actionbar_bg.png similarity index 100% rename from res/drawable-hdpi/actionbar_bg.9.png rename to app/src/main/res/drawable-hdpi/actionbar_bg.png diff --git a/res/drawable-hdpi/bottom_bg.png b/app/src/main/res/drawable-hdpi/bottom_bg.png similarity index 100% rename from res/drawable-hdpi/bottom_bg.png rename to app/src/main/res/drawable-hdpi/bottom_bg.png diff --git a/res/drawable-hdpi/btn_back.png b/app/src/main/res/drawable-hdpi/btn_back.png similarity index 100% rename from res/drawable-hdpi/btn_back.png rename to app/src/main/res/drawable-hdpi/btn_back.png diff --git a/res/drawable-hdpi/btn_save.png b/app/src/main/res/drawable-hdpi/btn_save.png similarity index 100% rename from res/drawable-hdpi/btn_save.png rename to app/src/main/res/drawable-hdpi/btn_save.png diff --git a/res/drawable-hdpi/btn_test.png b/app/src/main/res/drawable-hdpi/btn_test.png similarity index 100% rename from res/drawable-hdpi/btn_test.png rename to app/src/main/res/drawable-hdpi/btn_test.png diff --git a/res/drawable-hdpi/btn_test_press.png b/app/src/main/res/drawable-hdpi/btn_test_press.png similarity index 100% rename from res/drawable-hdpi/btn_test_press.png rename to app/src/main/res/drawable-hdpi/btn_test_press.png diff --git a/res/drawable-hdpi/button_bg.png b/app/src/main/res/drawable-hdpi/button_bg.png similarity index 100% rename from res/drawable-hdpi/button_bg.png rename to app/src/main/res/drawable-hdpi/button_bg.png diff --git a/res/drawable-hdpi/checked_icon.png b/app/src/main/res/drawable-hdpi/checked_icon.png similarity index 100% rename from res/drawable-hdpi/checked_icon.png rename to app/src/main/res/drawable-hdpi/checked_icon.png diff --git a/res/drawable-hdpi/close.png b/app/src/main/res/drawable-hdpi/close.png similarity index 100% rename from res/drawable-hdpi/close.png rename to app/src/main/res/drawable-hdpi/close.png diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to app/src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/left_arrow.png b/app/src/main/res/drawable-hdpi/left_arrow.png similarity index 100% rename from res/drawable-hdpi/left_arrow.png rename to app/src/main/res/drawable-hdpi/left_arrow.png diff --git a/res/drawable-hdpi/meminfo.png b/app/src/main/res/drawable-hdpi/meminfo.png similarity index 100% rename from res/drawable-hdpi/meminfo.png rename to app/src/main/res/drawable-hdpi/meminfo.png diff --git a/res/drawable-hdpi/refresh.png b/app/src/main/res/drawable-hdpi/refresh.png similarity index 100% rename from res/drawable-hdpi/refresh.png rename to app/src/main/res/drawable-hdpi/refresh.png diff --git a/res/drawable-hdpi/right_arrow.png b/app/src/main/res/drawable-hdpi/right_arrow.png similarity index 100% rename from res/drawable-hdpi/right_arrow.png rename to app/src/main/res/drawable-hdpi/right_arrow.png diff --git a/res/drawable-hdpi/seekbar_thumb_normal.png b/app/src/main/res/drawable-hdpi/seekbar_thumb_normal.png similarity index 100% rename from res/drawable-hdpi/seekbar_thumb_normal.png rename to app/src/main/res/drawable-hdpi/seekbar_thumb_normal.png diff --git a/res/drawable-hdpi/seekbar_thumb_pressed.png b/app/src/main/res/drawable-hdpi/seekbar_thumb_pressed.png similarity index 100% rename from res/drawable-hdpi/seekbar_thumb_pressed.png rename to app/src/main/res/drawable-hdpi/seekbar_thumb_pressed.png diff --git a/res/drawable-hdpi/settings.png b/app/src/main/res/drawable-hdpi/settings.png similarity index 100% rename from res/drawable-hdpi/settings.png rename to app/src/main/res/drawable-hdpi/settings.png diff --git a/res/drawable-hdpi/settings_pressed.png b/app/src/main/res/drawable-hdpi/settings_pressed.png similarity index 100% rename from res/drawable-hdpi/settings_pressed.png rename to app/src/main/res/drawable-hdpi/settings_pressed.png diff --git a/res/drawable-hdpi/unchecked_icon.png b/app/src/main/res/drawable-hdpi/unchecked_icon.png similarity index 100% rename from res/drawable-hdpi/unchecked_icon.png rename to app/src/main/res/drawable-hdpi/unchecked_icon.png diff --git a/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from res/drawable-ldpi/ic_launcher.png rename to app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from res/drawable-ldpi/icon.png rename to app/src/main/res/drawable-ldpi/icon.png diff --git a/res/drawable-ldpi/meminfo.png b/app/src/main/res/drawable-ldpi/meminfo.png similarity index 100% rename from res/drawable-ldpi/meminfo.png rename to app/src/main/res/drawable-ldpi/meminfo.png diff --git a/res/drawable-mdpi/button_bg.png b/app/src/main/res/drawable-mdpi/button_bg.png similarity index 100% rename from res/drawable-mdpi/button_bg.png rename to app/src/main/res/drawable-mdpi/button_bg.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable-mdpi/icon.png rename to app/src/main/res/drawable-mdpi/icon.png diff --git a/res/drawable-mdpi/meminfo.png b/app/src/main/res/drawable-mdpi/meminfo.png similarity index 100% rename from res/drawable-mdpi/meminfo.png rename to app/src/main/res/drawable-mdpi/meminfo.png diff --git a/res/drawable/custom_checkbox.xml b/app/src/main/res/drawable/custom_checkbox.xml similarity index 100% rename from res/drawable/custom_checkbox.xml rename to app/src/main/res/drawable/custom_checkbox.xml diff --git a/res/drawable/custom_seekbar.xml b/app/src/main/res/drawable/custom_seekbar.xml similarity index 100% rename from res/drawable/custom_seekbar.xml rename to app/src/main/res/drawable/custom_seekbar.xml diff --git a/res/drawable/float_button.xml b/app/src/main/res/drawable/float_button.xml similarity index 100% rename from res/drawable/float_button.xml rename to app/src/main/res/drawable/float_button.xml diff --git a/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml similarity index 100% rename from res/drawable/seekbar_thumb.xml rename to app/src/main/res/drawable/seekbar_thumb.xml diff --git a/res/drawable/settings_button.xml b/app/src/main/res/drawable/settings_button.xml similarity index 100% rename from res/drawable/settings_button.xml rename to app/src/main/res/drawable/settings_button.xml diff --git a/res/drawable/table_border.xml b/app/src/main/res/drawable/table_border.xml similarity index 100% rename from res/drawable/table_border.xml rename to app/src/main/res/drawable/table_border.xml diff --git a/res/drawable/test_button.xml b/app/src/main/res/drawable/test_button.xml similarity index 100% rename from res/drawable/test_button.xml rename to app/src/main/res/drawable/test_button.xml diff --git a/res/layout/about.xml b/app/src/main/res/layout/about.xml similarity index 100% rename from res/layout/about.xml rename to app/src/main/res/layout/about.xml diff --git a/res/layout/floating.xml b/app/src/main/res/layout/floating.xml similarity index 100% rename from res/layout/floating.xml rename to app/src/main/res/layout/floating.xml diff --git a/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml similarity index 100% rename from res/layout/list_item.xml rename to app/src/main/res/layout/list_item.xml diff --git a/res/layout/mail_settings.xml b/app/src/main/res/layout/mail_settings.xml similarity index 100% rename from res/layout/mail_settings.xml rename to app/src/main/res/layout/mail_settings.xml diff --git a/res/layout/mainpage.xml b/app/src/main/res/layout/mainpage.xml similarity index 100% rename from res/layout/mainpage.xml rename to app/src/main/res/layout/mainpage.xml diff --git a/res/layout/navigation_bar.xml b/app/src/main/res/layout/navigation_bar.xml similarity index 100% rename from res/layout/navigation_bar.xml rename to app/src/main/res/layout/navigation_bar.xml diff --git a/res/layout/settings.xml b/app/src/main/res/layout/settings.xml similarity index 100% rename from res/layout/settings.xml rename to app/src/main/res/layout/settings.xml diff --git a/res/layout/table_row.xml b/app/src/main/res/layout/table_row.xml similarity index 100% rename from res/layout/table_row.xml rename to app/src/main/res/layout/table_row.xml diff --git a/res/layout/test_list.xml b/app/src/main/res/layout/test_list.xml similarity index 100% rename from res/layout/test_list.xml rename to app/src/main/res/layout/test_list.xml diff --git a/res/layout/test_list_item.xml b/app/src/main/res/layout/test_list_item.xml similarity index 100% rename from res/layout/test_list_item.xml rename to app/src/main/res/layout/test_list_item.xml diff --git a/res/layout/test_report.xml b/app/src/main/res/layout/test_report.xml similarity index 100% rename from res/layout/test_report.xml rename to app/src/main/res/layout/test_report.xml diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..c2eea8e --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/emmagee.xml b/emmagee.xml deleted file mode 100644 index e617f3f..0000000 --- a/emmagee.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..50e0534 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Oct 22 11:53:44 CST 2017 +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 diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100644 index 428bdbc..0000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/project.properties b/project.properties index a5578ba..0d87605 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-19 +VERSION = 2.4 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'