Basic update of resources in ownCloud sample client for oc_framework

diff --git a/oc_framework/sample_client/.classpath b/oc_framework/sample_client/.classpath
index ed9fc35..7bc01d9 100644 (file)
--- a/oc_framework/sample_client/.classpath
+++ b/oc_framework/sample_client/.classpath
@@ -5,5 +5,5 @@
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="bin/classes"/>

 </classpath>
 </classpath>

diff --git a/oc_framework/sample_client/.project b/oc_framework/sample_client/.project
index 3ba6a91..d1b8743 100644 (file)
--- a/oc_framework/sample_client/.project
+++ b/oc_framework/sample_client/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>

-       <name>MainActivity</name>
+       <name>ownCloud Sample Client</name>

        <comment></comment>
        <projects>
        </projects>
        <comment></comment>
        <projects>
        </projects>

diff --git a/oc_framework/sample_client/AndroidManifest.xml b/oc_framework/sample_client/AndroidManifest.xml
index 949e709..0bb3be7 100644 (file)
--- a/oc_framework/sample_client/AndroidManifest.xml
+++ b/oc_framework/sample_client/AndroidManifest.xml
@@ -3,6 +3,9 @@
       package="com.owncloud.android.oc_framework.sampleclient"
       android:versionCode="1"
       android:versionName="1.0">
       package="com.owncloud.android.oc_framework.sampleclient"
       android:versionCode="1"
       android:versionName="1.0">

+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />

     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="MainActivity"
                   android:label="@string/app_name">
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="MainActivity"
                   android:label="@string/app_name">

diff --git a/oc_framework/sample_client/res/drawable-hdpi/ic_launcher.png b/oc_framework/sample_client/res/drawable-hdpi/ic_launcher.png
index 96a442e..6fe153b 100644 (file)
Binary files a/oc_framework/sample_client/res/drawable-hdpi/ic_launcher.png and b/oc_framework/sample_client/res/drawable-hdpi/ic_launcher.png differ

diff --git a/oc_framework/sample_client/res/drawable-ldpi/ic_launcher.png b/oc_framework/sample_client/res/drawable-ldpi/ic_launcher.png
index 9923872..1bc470b 100644 (file)
Binary files a/oc_framework/sample_client/res/drawable-ldpi/ic_launcher.png and b/oc_framework/sample_client/res/drawable-ldpi/ic_launcher.png differ

diff --git a/oc_framework/sample_client/res/drawable-mdpi/ic_launcher.png b/oc_framework/sample_client/res/drawable-mdpi/ic_launcher.png
index 359047d..9008b9d 100644 (file)
Binary files a/oc_framework/sample_client/res/drawable-mdpi/ic_launcher.png and b/oc_framework/sample_client/res/drawable-mdpi/ic_launcher.png differ

diff --git a/oc_framework/sample_client/res/drawable-xhdpi/ic_launcher.png b/oc_framework/sample_client/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644 (file)
index 71c6d76..0000000
Binary files a/oc_framework/sample_client/res/drawable-xhdpi/ic_launcher.png and /dev/null differ

diff --git a/oc_framework/sample_client/res/layout/main.xml b/oc_framework/sample_client/res/layout/main.xml
index e745f63..fe9b7ab 100644 (file)
--- a/oc_framework/sample_client/res/layout/main.xml
+++ b/oc_framework/sample_client/res/layout/main.xml
@@ -7,7 +7,7 @@
 <TextView
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
 <TextView
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"

-    android:text="Hello World, MainActivity"
+    android:text="@string/hello_word"

     />
 </LinearLayout>
 
     />
 </LinearLayout>
 

diff --git a/oc_framework/sample_client/res/values/strings.xml b/oc_framework/sample_client/res/values/strings.xml
index 0be1647..c6d9c69 100644 (file)
--- a/oc_framework/sample_client/res/values/strings.xml
+++ b/oc_framework/sample_client/res/values/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <string name="app_name">MainActivity</string>
+    <string name="app_name">ownCloud Sample Client</string>
+    <string name="hello_word">Hello World. This is the ownCloud sample client app before doing nothing ownCloud-related.</string>

 </resources>
 </resources>