From 7f817343aedd19342e851ebb9d1b5a58e176114d Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 26 Aug 2014 11:48:06 +0200
Subject: Add missing XML namespace information in showcaseview resources

This change has been submitted upstream as
https://github.com/amlcurran/ShowcaseView/pull/226
---
 showcaseview/res/layout/showcase_button.xml | 2 +-
 showcaseview/res/values/styles.xml          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/showcaseview/res/layout/showcase_button.xml b/showcaseview/res/layout/showcase_button.xml
index 1ce45cd..7abbe85 100644
--- a/showcaseview/res/layout/showcase_button.xml
+++ b/showcaseview/res/layout/showcase_button.xml
@@ -17,5 +17,5 @@
 
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/ShowcaseButton"
-    android:text="@string/ok"
+    android:text="@android:string/ok"
     android:id="@id/showcase_button" />
\ No newline at end of file
diff --git a/showcaseview/res/values/styles.xml b/showcaseview/res/values/styles.xml
index 56ea6c4..6f115b9 100644
--- a/showcaseview/res/values/styles.xml
+++ b/showcaseview/res/values/styles.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ShowcaseButton">
         <item name="android:layout_width">wrap_content</item>
@@ -30,14 +30,14 @@
         <item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
         <item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail.Light</item>
         <item name="sv_backgroundColor">#3333B5E5</item>
-        <item name="sv_buttonText">@string/ok</item>
+        <item name="sv_buttonText">@android:string/ok</item>
     </style>
 
     <style name="ShowcaseView">
         <item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
         <item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail</item>
         <item name="sv_backgroundColor">#3333B5E5</item>
-        <item name="sv_buttonText">@string/ok</item>
+        <item name="sv_buttonText">@android:string/ok</item>
     </style>
 
     <style name="TextAppearance.ShowcaseView.Title" parent="android:style/TextAppearance.Large">
-- 
cgit v1.1


From 314d19c50904bb32a56f1343fd9095f51a62ad9f Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 26 Aug 2014 11:53:42 +0200
Subject: Add missing XML namespace information

---
 main/res/values/showcaseview_styles.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/res/values/showcaseview_styles.xml b/main/res/values/showcaseview_styles.xml
index 864982f..7bbc902 100644
--- a/main/res/values/showcaseview_styles.xml
+++ b/main/res/values/showcaseview_styles.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ShowcaseButton">
         <item name="android:layout_width">wrap_content</item>
@@ -30,14 +30,14 @@
         <item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
         <item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail.Light</item>
         <item name="sv_backgroundColor">#3333B5E5</item>
-        <item name="sv_buttonText">@string/ok</item>
+        <item name="sv_buttonText">@android:string/ok</item>
     </style>
 
     <style name="ShowcaseView">
         <item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
         <item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail</item>
         <item name="sv_backgroundColor">#EE223344</item>
-        <item name="sv_buttonText">@string/ok</item>
+        <item name="sv_buttonText">@android:string/ok</item>
     </style>
 
     <style name="TextAppearance.ShowcaseView.Title" parent="android:style/TextAppearance.Large">
-- 
cgit v1.1


From f9dc2f3b2c4d9ba13eae8a23dff40aca16fe9873 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 26 Aug 2014 11:55:49 +0200
Subject: Add configuration files for showcaseview in Intellij IDEA

---
 .idea/modules.xml             |  1 +
 main/cgeo.iml                 |  1 +
 showcaseview/showcaseview.iml | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 showcaseview/showcaseview.iml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index aa26ebf..e58c500 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,6 +7,7 @@
       <module fileurl="file://$PROJECT_DIR$/cgeo-calendar/cgeo-calendar.iml" filepath="$PROJECT_DIR$/cgeo-calendar/cgeo-calendar.iml" />
       <module fileurl="file://$PROJECT_DIR$/cgeo-contacts/cgeo-contacts.iml" filepath="$PROJECT_DIR$/cgeo-contacts/cgeo-contacts.iml" />
       <module fileurl="file://$PROJECT_DIR$/mapswithme-api/mapswithme-api.iml" filepath="$PROJECT_DIR$/mapswithme-api/mapswithme-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/showcaseview/showcaseview.iml" filepath="$PROJECT_DIR$/showcaseview/showcaseview.iml" />
       <module fileurl="file://$PROJECT_DIR$/tests/tests.iml" filepath="$PROJECT_DIR$/tests/tests.iml" />
     </modules>
   </component>
diff --git a/main/cgeo.iml b/main/cgeo.iml
index c662ceb..6ada13b 100644
--- a/main/cgeo.iml
+++ b/main/cgeo.iml
@@ -55,6 +55,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="mapswithme-api" exported="" />
+    <orderEntry type="module" module-name="showcaseview" exported="" />
     <orderEntry type="module" module-name="android-support-v7-appcompat" exported="" />
   </component>
 </module>
diff --git a/showcaseview/showcaseview.iml b/showcaseview/showcaseview.iml
new file mode 100644
index 0000000..e47f7c6
--- /dev/null
+++ b/showcaseview/showcaseview.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
-- 
cgit v1.1