diff --git a/.gitignore b/.gitignore index 9b753ff..d13f439 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ java/**/build/ android/build/ build/ common/build/ +.idea/ +local.properties diff --git a/android/README.md b/android/README.md index 43a6666..702d361 100644 --- a/android/README.md +++ b/android/README.md @@ -14,7 +14,7 @@ Android Studio: https://developer.android.com/sdk/index.html (recommended) - Check Tools > SDK Manager. Android SDK Tools: https://developer.android.com/sdk/index.html#Other -- Set the ANDROID_HOME environment variable to the root of the SDK. + - Set the ANDROID_HOME environment variable to the root of the SDK. Ensure the following packages are installed: - Tools/Android SDK Platform-tools (Rev. 35.0.1) @@ -53,19 +53,19 @@ The test runner logs to the system log, which can be viewed using logcat: 4. Copy the widget and the common libraries: - `cp android/build/outputs/aar/android-release.aar path/to/project/app/libs/` + `cp android/build/outputs/aar/android-release.aar path/to/project/app/libs/` - `cp common/build/libs/common.jar path/to/project/app/libs/` + `cp common/build/libs/common.jar path/to/project/app/libs/` - Note: Be sure top replace 'path/to/project' with the name of your project. + Note: Be sure top replace 'path/to/project' with the name of your project. 5. Import both modules into your app. - Note: If you use Android Studio, check out the [user guide](https://developer.android.com/studio/projects/android-library.html#AddDependency) and follow the instructions under 'Add your library as a dependency'. Be sure to add *both* modules as dependencies of the app. + Note: If you use Android Studio, check out the [user guide](https://developer.android.com/studio/projects/android-library.html#AddDependency) and follow the instructions under 'Add your library as a dependency'. Be sure to add *both* modules as dependencies of the app. 6. Add the widget to your app. Note: This Assumes a default empty project configuration: - i. In activity_main.xml add: + i. In activity_main.xml add: ```xml ``` - ii. In MainActivity.java add the following import statements: + ii. In MainActivity.java add the following import statements: ```java import android.view.ViewGroup; @@ -128,4 +128,4 @@ public class MainActivity extends AppCompatActivity { this.addressWidget = new AddressWidget(this, viewGroup, defaultFormOptions, cacheManager); } } -``` +``` \ No newline at end of file diff --git a/build.gradle b/build.gradle index fd8bd27..46ddee0 100644 --- a/build.gradle +++ b/build.gradle @@ -34,4 +34,4 @@ allprojects { mavenLocal() google() } -} +} \ 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..033e24c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 6e5d00d..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -124,6 +124,7 @@ if [ -n "$JAVA_HOME" ] ; then 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 @@ -132,6 +133,7 @@ else if ! command -v java >/dev/null 2>&1 then 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