From 1a73bbb2b084808ad45608f20a34f4c9e9d113fc Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 7 Feb 2015 17:30:38 +0100
Subject: [PATCH] String & style fixes

---
 res/drawable/standard_button.xml              | 26 ++++++++
 .../fragment_mainactivity_thanks_note.xml     | 59 +++++++++----------
 res/values-v14/styles.xml                     | 32 ++++++++--
 res/values/strings.xml                        | 10 ++--
 res/values/styles.xml                         | 36 +++++++----
 5 files changed, 113 insertions(+), 50 deletions(-)

diff --git a/res/drawable/standard_button.xml b/res/drawable/standard_button.xml
index ffd75f4..b8fd39b 100644
--- a/res/drawable/standard_button.xml
+++ b/res/drawable/standard_button.xml
@@ -1,4 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+ /*
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
     	<shape>
diff --git a/res/layout/fragment_mainactivity_thanks_note.xml b/res/layout/fragment_mainactivity_thanks_note.xml
index 774659a..c1b7f80 100644
--- a/res/layout/fragment_mainactivity_thanks_note.xml
+++ b/res/layout/fragment_mainactivity_thanks_note.xml
@@ -35,22 +35,8 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="fr.unix_experience.owncloud_sms.MainActivity$PlaceholderFragment" >
 
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/textView1"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="22dp"
-        android:minHeight="36dp"
-        android:text="@string/ma_button_rate_us"
-        android:onClick="openGooglePlayStore"
-        android:background="@drawable/standard_button"
-        style="@style/StandardButton"
-        android:textAlignment="center" />
-
     <TextView
-        android:id="@+id/TextView01"
+        android:id="@+id/tv_title_thanksto"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
@@ -60,35 +46,48 @@
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
     <TextView
-        android:id="@+id/tv_rateUs"
+        android:id="@+id/tv_thankspeople"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@+id/TextView01"
-        android:layout_marginTop="14dp"
-        android:text="ownCloud developpers"
+        android:layout_below="@+id/tv_title_thanksto"
+        android:layout_marginTop="15dp"
+        android:text="@string/ma_thanksto_people"
         android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/textView1"
+    
+    <Button
+        android:id="@+id/button_rateus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/ma_title_rateus"
-        android:layout_alignStart="@+id/ma_title_rateus"
-        android:layout_centerVertical="true"
-        android:text="@string/ma_content_rate_us"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:layout_below="@+id/tv_rateUs"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="15dp"
+        android:minHeight="36dp"
+        android:text="@string/ma_button_rate_us"
+        android:onClick="openGooglePlayStore"
+        android:background="@drawable/standard_button"
+        style="@style/StandardButton"
+        android:textAlignment="center" />
 
     <TextView
         android:id="@+id/ma_title_rateus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/textView1"
-        android:layout_alignLeft="@+id/tv_rateUs"
+        android:layout_alignLeft="@+id/tv_thankspeople"
         android:layout_alignStart="@+id/tv_rateUs"
-        android:layout_marginBottom="18dp"
+        android:layout_below="@+id/tv_thankspeople"
+        android:layout_marginTop="25dp"
         android:text="@string/ma_title_rate_us"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
+    <TextView
+        android:id="@+id/tv_rateUs"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_below="@+id/ma_title_rateus"
+        android:text="@string/ma_content_rate_us"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 637bd54..55c190b 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,10 +1,30 @@
 <resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
+<!--
+ /*
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
     <style name="OcSmsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/OcSmsActionBar</item>
 	</style>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3948c72..6276418 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  /*
- * Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@
 <resources>
 
     <!-- Translation version, reference for translators -->
-    <string name="translation_version">3</string>
+    <string name="translation_version">4</string>
 
     <!-- System strings, do not translate -->
     <string name="app_name">ownCloud-SMS</string>
@@ -126,7 +126,9 @@
     <string name="ma_title_change_settings">Change app settings</string>
     <string name="ma_button_goto_settings">Go to Settings</string>
     <string name="ma_title_welcome">Welcome</string>
-    <string name="ma_content_welcome">Welcome to ownCloud SMS application. This application let you synchronise your SMS to your ownCloud instance using SMS app.</string>
+    <string name="ma_content_welcome">Welcome to ownCloud SMS application. This application let you synchronize your SMS to your ownCloud instance using SMS app.</string>
+    <string name="ma_thanksto_people">ownCloud developers\n\
+Contributors and issue\'s reporters</string>
 
     <!-- Notifications -->
     <string name="sync_title">Sync process</string>
@@ -138,7 +140,7 @@
     <string name="err_sync_craft_http_request">Error #2: Error while crafting HTTP request</string>
     <string name="err_sync_push_request">Error #3: Push request failed</string>
     <string name="err_sync_push_request_resp">Error #4: Invalid datas received from server when pushing datas</string>
-    <string name="err_sync_create_json_null_smslist">Error #5: NULL Sms List</string>
+    <string name="err_sync_create_json_null_smslist">Error #5: NULL SMS List</string>
     <string name="err_sync_create_json_put_smslist">Error #6: Error while crafting push request</string>
     <string name="err_sync_create_json_request_encoding">Error #7: Unsupported encoding when generating request</string>
     <string name="err_sync_auth_failed">Error #8: Authentication failed</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6e0b631..42a0a8b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,15 +1,31 @@
 <resources>
-
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->   
+<!--
+ /*
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
     <style name="AppBaseTheme" parent="@android:style/Theme.Holo.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
     </style>
 
     <!-- Application theme. -->