bump version to Louis-Joseph Papineau
Tuleap: #469
Change-Id: Ife396e52b6108cfcbbc547f1e1bf8cc9c07012b0
diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml
index f40e529..09e0775 100644
--- a/ring-android/app/src/main/AndroidManifest.xml
+++ b/ring-android/app/src/main/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cx.ring"
android:installLocation="auto"
- android:versionCode="31"
- android:versionName="2.0.012b">
+ android:versionCode="34"
+ android:versionName="20160315">
<uses-sdk
android:minSdkVersion="16"
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java
index d07842d..c1b1160 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AboutFragment.java
@@ -45,12 +45,10 @@
View inflatedView = inflater.inflate(R.layout.frag_about, parent, false);
TextView title = (TextView) inflatedView.findViewById(R.id.app_name);
- title.setText(getString(R.string.app_name) + " for Android " + BuildConfig.VERSION_NAME);
+ title.setText(getString(R.string.app_name) + " for Android ");
- TextView link = (TextView) inflatedView.findViewById(R.id.web_site);
- String linkText = "<a href='"+getString(R.string.app_website)+"'>" + getString(R.string.web_site) + "</a>";
- link.setText(Html.fromHtml(linkText));
- link.setMovementMethod(LinkMovementMethod.getInstance());
+ TextView release = (TextView) inflatedView.findViewById(R.id.app_release);
+ release.setText(getString(R.string.app_release, BuildConfig.VERSION_NAME));
TextView licence = (TextView) inflatedView.findViewById(R.id.licence);
licence.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index 23013ab..c5d8c1d 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -50,14 +50,24 @@
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
+ android:id="@+id/app_release"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/app_release"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="16sp" />
+
+ <TextView
android:id="@+id/web_site"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
android:gravity="center"
- android:text="@string/web_site"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:text="@string/app_website"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:autoLink="web" />
<TextView
android:id="@+id/copyright"
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index bff090b..ba55dbc 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -22,7 +22,8 @@
<string name="app_name" translatable="false">Ring</string>
<string name="app_author" translatable="false" >Savoir-faire Linux Inc.</string>
- <string name="app_website" translatable="false">http://ring.cx</string>
+ <string name="app_release" translatable="false">Louis-Joseph Papineau - %1$s</string>
+ <string name="app_website" translatable="false">https://ring.cx</string>
<string name="copyright" translatable="false">Copyright © 2004–2016 Savoir-faire Linux Inc.</string>
<string name="licence" translatable="false">This software is provided "as is", without warranty of any kind. For details, see\n
<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License version 3 or later</a></string>