Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replaced Linphone's Core version by SDK version in about fragment

Browse source
This commit is contained in:
Sylvain Berfini 2018-12-04 15:27:28 +01:00
parent a196529eb2
commit c922192985
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/linphone/fragments/AboutFragment.java
View file

@ -56,11 +56,15 @@ public class AboutFragment extends Fragment implements OnClickListener {
View view = inflater.inflate(R.layout.about, container, false); View view = inflater.inflate(R.layout.about, container, false);
TextView aboutVersion = view.findViewById(R.id.about_android_version); TextView aboutVersion = view.findViewById(R.id.about_android_version);
TextView aboutLiblinphoneVersion = view.findViewById(R.id.about_liblinphone_version); TextView aboutLiblinphoneVersion = view.findViewById(R.id.about_liblinphone_sdk_version);
aboutLiblinphoneVersion.setText( aboutLiblinphoneVersion.setText(
String.format( String.format(
getString(R.string.about_liblinphone_version), getString(R.string.about_liblinphone_sdk_version),
LinphoneManager.getLc().getVersion())); getString(R.string.linphone_sdk_version)
+ " ("
+ getString(R.string.linphone_sdk_branch)
+ ")"));
// We can't access a library's BuildConfig, so we have to set it as a resource
aboutVersion.setText( aboutVersion.setText(
String.format( String.format(
getString(R.string.about_version), getString(R.string.about_version),

4
app/src/main/res/layout-land/about.xml
View file

@ -61,12 +61,12 @@
android:text="@string/about_version" /> android:text="@string/about_version" />
<TextView <TextView
android:id="@+id/about_liblinphone_version" android:id="@+id/about_liblinphone_sdk_version"
style="@style/font12" style="@style/font12"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="left"
android:text="@string/about_liblinphone_version" /> android:text="@string/about_liblinphone_sdk_version" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/about.xml
View file

@ -48,13 +48,13 @@
android:text="@string/about_version" /> android:text="@string/about_version" />
<TextView <TextView
android:id="@+id/about_liblinphone_version" android:id="@+id/about_liblinphone_sdk_version"
style="@style/font12" style="@style/font12"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:text="@string/about_liblinphone_version" /> android:text="@string/about_liblinphone_sdk_version" />
</LinearLayout> </LinearLayout>

1
app/src/main/res/values/strings.xml
View file

@ -12,6 +12,7 @@
<string name="tunnel_host"></string> <string name="tunnel_host"></string>
<string name="about_version">Linphone Android %s</string> <string name="about_version">Linphone Android %s</string>
<string name="about_liblinphone_version">Linphone Core %s</string> <string name="about_liblinphone_version">Linphone Core %s</string>
<string name="about_liblinphone_sdk_version">Linphone SDK %s</string>
<string name="about_link">www.linphone.org</string> <string name="about_link">www.linphone.org</string>
<string name="sync_account_name">linphone contacts</string> <string name="sync_account_name">linphone contacts</string>