Merge branch 'master' of https://github.com/gilokimu/WooDroid

 Conflicts:

	.idea/gradle.xml

.idea/gradle.xml

@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -60,6 +60,16 @@ Generate API credentials (Consumer Key & Consumer Secret) following this instruc
 
 Check out the WooCommerce API endpoints and data that can be manipulated in <https://woocommerce.github.io/woocommerce-rest-api-docs/>.
 
+## Demo
+I have left consumer key and secret within the app, for you to test the app without an installation of wordpress. To use my installation of wordpress, here are the credentials: 
+
+username: demo
+password: demo2019
+https://gilo.me/store/wp-admin
+
+PS/ Do no harm
+
+
 ## Setup
 
 Setup for the new WP REST API integration (WooCommerce 2.6 or later):

app/src/main/res/layout/single_order_item.xml

@@ -10,7 +10,7 @@
   android:layout_marginTop="16dp"
   >
 
-  <LinearLayout
+  <LinearLayou
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:gravity="top"
@@ -129,7 +129,7 @@
 	</LinearLayout>
 
 
-  </LinearLayout>
+  </LinearLayou>
 
   <View
 	android:layout_width="match_parent"

woodroid/src/test/java/me/gilo/woodroid/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package me.gilo.woodroid;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

woodroid/src/test/java/me/gilo/woodroid/ExampleUnitTest.kt

@@ -0,0 +1,18 @@
+package me.gilo.woodroid
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, (2 + 2).toLong())
+    }
+}
+