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 27605be269f40dc424d7a293057bb6283a9ac651..f39a8f1039f85a9e36ce59c0ef25723b75973d70 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 @@ -27,13 +27,13 @@ public class AboutFragment extends Fragment { 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); + title.setText(getString(R.string.app_name) + " for Android " + versionName); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } TextView link = (TextView) inflatedView.findViewById(R.id.web_site); - String linkText = "<a href='http://ring.cx'>" + getResources().getString(R.string.web_site) + "</a>"; + String linkText = "<a href='"+getString(R.string.app_website)+"'>" + getString(R.string.web_site) + "</a>"; link.setText(Html.fromHtml(linkText)); link.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/ring-android/app/src/main/res/drawable-hdpi/ring_logo.png b/ring-android/app/src/main/res/drawable-hdpi/ring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b43a8bb1abc67f94d3ce6d632ecd4c77039c1989 Binary files /dev/null and b/ring-android/app/src/main/res/drawable-hdpi/ring_logo.png differ diff --git a/ring-android/app/src/main/res/drawable-mdpi/ring_logo.png b/ring-android/app/src/main/res/drawable-mdpi/ring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..fbda281794136701eeeb70ecf5d340ff852b7fc2 Binary files /dev/null and b/ring-android/app/src/main/res/drawable-mdpi/ring_logo.png differ diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ring_logo.png b/ring-android/app/src/main/res/drawable-xhdpi/ring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4090b543db61a1dc30bc7726eb2c271b9086c1e9 Binary files /dev/null and b/ring-android/app/src/main/res/drawable-xhdpi/ring_logo.png differ diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo.png b/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..54090dd29f0bfd57b330b8b122e0207c89bb1623 Binary files /dev/null and b/ring-android/app/src/main/res/drawable-xxhdpi/ring_logo.png differ diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo.png b/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..355e88e8385ac8918662aa0c9bd6d256f6d60aee Binary files /dev/null and b/ring-android/app/src/main/res/drawable-xxxhdpi/ring_logo.png differ 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 6e03f8e61d7d457ae1cd086ab864d7d818bc839b..f6af291090f99038bd713413b6257e4776075348 100644 --- a/ring-android/app/src/main/res/layout/frag_about.xml +++ b/ring-android/app/src/main/res/layout/frag_about.xml @@ -2,23 +2,25 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/padding_medium" > + android:padding="@dimen/padding_medium"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical"> <ImageView - android:id="@+id/logo" - android:layout_width="match_parent" + android:id="@+id/imageView" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/logo_sfl_coul_rgb" /> + android:layout_gravity="center_horizontal" + android:contentDescription="@string/app_name" + android:src="@drawable/ring_logo" /> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/item_generic_selector" > + android:background="@drawable/item_generic_selector"> <TextView android:id="@+id/app_name" @@ -48,6 +50,16 @@ android:text="@string/copyright" android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> + + <ImageView + android:id="@+id/logo" + android:layout_width="260dp" + android:layout_height="134dp" + android:layout_gravity="center_horizontal" + android:contentDescription="@string/app_author" + android:maxWidth="250dp" + android:src="@drawable/logo_sfl_coul_rgb" /> + </LinearLayout> </ScrollView> \ No newline at end of file diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml index 5d4f89fb691518c7abebd73e1bd593afa2d653ea..091bb759b2252bcba46cbe2487ce87e24de1c2dd 100644 --- a/ring-android/app/src/main/res/values-fr/strings.xml +++ b/ring-android/app/src/main/res/values-fr/strings.xml @@ -108,7 +108,7 @@ as that of the covered work. <string name="action_call_conference">Conférence</string> <string name="action_call_hold">Attente</string> <string name="action_settings">Paramètres</string> - <string name="copyright">Copyright \u00A9 2004–2014 Savoir-Faire Linux Inc.</string> + <string name="copyright">Copyright \u00A9 2004–2015 Savoir-Faire Linux Inc.</string> <string name="web_site">Site web</string> <string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string> diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml index 93ca32103acb6db951e68933cc9dcef4d38b86ff..b2584e7bdd0e5cc17ebc1d7df6058d68452d4da4 100644 --- a/ring-android/app/src/main/res/values/strings.xml +++ b/ring-android/app/src/main/res/values/strings.xml @@ -32,6 +32,8 @@ as that of the covered work. <resources> <string name="app_name">Ring</string> + <string name="app_author">Savoir-faire Linux Inc.</string> + <string name="app_website">http://ring.cx</string> <!-- RingActivity --> <string name="close_msg">Press back again to leave</string> @@ -109,7 +111,7 @@ as that of the covered work. <string name="action_call_hold">Hold</string> <string name="action_call_hangup">Hang up</string> <string name="action_settings">Settings</string> - <string name="copyright">Copyright \u00A9 2004–2014 Savoir-Faire Linux Inc.</string> + <string name="copyright">Copyright \u00A9 2004–2015 Savoir-Faire Linux Inc.</string> <string name="web_site">Website</string> <string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string>