Skip to content
Snippets Groups Projects
Commit 07a69791 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

Add versionName in About fragment

Also bump version to 1.4.0 for next beta release

Refs: #52438
parent 906a2fad
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ as that of the covered work. ...@@ -34,7 +34,7 @@ as that of the covered work.
package="org.sflphone" package="org.sflphone"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="13" android:versionCode="13"
android:versionName="1.3.0.2" > android:versionName="1.4.0" >
<supports-screens <supports-screens
android:anyDensity="true" android:anyDensity="true"
......
sflphone @ d8f4adaf
Subproject commit 646f4be90fdde382c85ab000d2751ade78ea6f39 Subproject commit d8f4adafbf95f1af01cb16a7cbe873b59ef2b95b
...@@ -36,8 +36,8 @@ cd jni/ ...@@ -36,8 +36,8 @@ cd jni/
ndk-build -j4 ndk-build -j4
cd .. cd ..
$ANT_HOME clean ant clean
$ANT_HOME debug ant debug
adb install -r bin/SFLphone-debug.apk adb install -r bin/SFLphone-debug.apk
......
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-17 target=android-19
package org.sflphone.fragments; package org.sflphone.fragments;
import android.support.v4.app.Fragment; import android.content.pm.PackageManager;
import org.sflphone.R;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.text.Html; import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import org.sflphone.R;
public class AboutFragment extends Fragment { public class AboutFragment extends Fragment {
...@@ -23,6 +23,14 @@ public class AboutFragment extends Fragment { ...@@ -23,6 +23,14 @@ public class AboutFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
View inflatedView = inflater.inflate(R.layout.frag_about, parent, false); View inflatedView = inflater.inflate(R.layout.frag_about, parent, false);
TextView title = (TextView) inflatedView.findViewById(R.id.app_name);
try {
String versionName = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName;
title.setText(getString(R.string.app_name) + " - " + versionName);
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
TextView link = (TextView) inflatedView.findViewById(R.id.web_site); TextView link = (TextView) inflatedView.findViewById(R.id.web_site);
String linkText = "<a href='http://sflphone.org/'>" + getResources().getString(R.string.web_site) + "</a>"; String linkText = "<a href='http://sflphone.org/'>" + getResources().getString(R.string.web_site) + "</a>";
link.setText(Html.fromHtml(linkText)); link.setText(Html.fromHtml(linkText));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment