commit 8b28d19931a076562c21c1db79486127a7464e17
author Elias Naur <elias.naur@gmail.com> Thu Sep 22 17:54:17 2016 +0200
committer Elias Naur <elias.naur@gmail.com> Thu Sep 22 17:09:31 2016 +0000
tree f7dce959fb9f4e807e784e0d0ae3682a10370a1e
parent bdf873ed8fac3aa70a6f831e0e491d4a89f62ce6

example: fix Android examples

The Java methods names were recently changed to lowercase, but the
examples weren't updated. Fix that.

While we're here, comment out the GOPATH and GO settings from
the Go build.gradle file. They're confusing for the newcomer and only
needed in the rare case where GOPATH is wrong or missing or if go is
not in PATH.

Change-Id: Ib795b440a0127c402e56b70529f6bd71c6f1322b
Reviewed-on: https://go-review.googlesource.com/29594
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>

example/bind/android/app/src/main/java/org/golang/example/bind/MainActivity.java

diff --git a/example/bind/android/app/src/main/java/org/golang/example/bind/MainActivity.java b/example/bind/android/app/src/main/java/org/golang/example/bind/MainActivity.java
index 8308bb4..98d273d 100644
--- a/example/bind/android/app/src/main/java/org/golang/example/bind/MainActivity.java
+++ b/example/bind/android/app/src/main/java/org/golang/example/bind/MainActivity.java
@@ -24,7 +24,7 @@
         mTextView = (TextView) findViewById(R.id.mytextview);
 
         // Call Go function.
-        String greetings = Hello.Greetings("Android and Gopher");
+        String greetings = Hello.greetings("Android and Gopher");
         mTextView.setText(greetings);
     }
 }

example/bind/android/hello/build.gradle

diff --git a/example/bind/android/hello/build.gradle b/example/bind/android/hello/build.gradle
index c53cfd4..64f65f8 100644
--- a/example/bind/android/hello/build.gradle
+++ b/example/bind/android/hello/build.gradle
@@ -13,10 +13,10 @@
     pkg = "golang.org/x/mobile/example/bind/hello"
 
     /* GOPATH where the Go package is; check `go env` */
-    GOPATH = "/YOUR/GOPATH"
+    // GOPATH = "/YOUR/GOPATH"
 
     /* Absolute path to the go binary */
-    GO = "/PATH/TO/GO"
+    // GO = "/PATH/TO/GO"
 
     /* Optionally, set the absolute path to the gomobile binary if the
     /* gomobile binary is not located in the GOPATH's bin directory. */

example/ivy/android/app/src/main/java/org/golang/ivy/Help.java

diff --git a/example/ivy/android/app/src/main/java/org/golang/ivy/Help.java b/example/ivy/android/app/src/main/java/org/golang/ivy/Help.java
index ccdec2e..518c4fa 100644
--- a/example/ivy/android/app/src/main/java/org/golang/ivy/Help.java
+++ b/example/ivy/android/app/src/main/java/org/golang/ivy/Help.java
@@ -39,7 +39,7 @@
         webView.getSettings().setDefaultTextEncodingName("utf-8");
         // org.golang.ivy.Mobile was generated
         // using gomobile bind -javapkg=org.golang.ivy robpike.io/ivy/mobile.
-        String helpMsg = Mobile.Help();
+        String helpMsg = Mobile.help();
 
         // loadData has a rendering bug: https://code.google.com/p/android/issues/detail?id=6965
         webView.loadDataWithBaseURL("http://godoc.org/robpike.io/ivy", helpMsg, "text/html", "UTF-8", null);

example/ivy/android/app/src/main/java/org/golang/ivy/MainActivity.java

diff --git a/example/ivy/android/app/src/main/java/org/golang/ivy/MainActivity.java b/example/ivy/android/app/src/main/java/org/golang/ivy/MainActivity.java
index af26876..dbb3d4a 100644
--- a/example/ivy/android/app/src/main/java/org/golang/ivy/MainActivity.java
+++ b/example/ivy/android/app/src/main/java/org/golang/ivy/MainActivity.java
@@ -164,7 +164,7 @@
         mScroller.addView(mWebView);
 
         mEditText.setText("");
-        Mobile.Reset();
+        Mobile.reset();
         unloadDemo();
     }
 
@@ -255,7 +255,7 @@
             try {
                 // org.golang.ivy.Mobile was generated using
                 // gomobile bind -javapkg=org.golang.ivy robpike.io/ivy/mobile
-                return Mobile.Eval(expr);  // Gobind-generated method.
+                return Mobile.eval(expr);  // Gobind-generated method.
             } catch (Exception e) {
                 return "error: "+e.getMessage();
             }