Merge remote-tracking branch 'origin/master'

fr3ts0n · Nov 21, 2015 · e8a524f · e8a524f
2 parents 6f6c1e2 + a6e48f5
commit e8a524f
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 13 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest
     package="com.fr3ts0n.ecu.gui.androbd"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="10306"
+    android:versionCode="10307"
     android:versionName="@string/app_version">
 
     <uses-sdk

diff --git a/README.md b/README.md
@@ -3,7 +3,16 @@ Android OBD diagnostics with any ELM327 adapter
 
 [![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=AndrOBD&fdid=com.fr3ts0n.ecu.gui.androbd)
 
-[![Translation status](https://hosted.weblate.org/widgets/androbd/-/shields-badge.svg)](https://hosted.weblate.org/engage/androbd/?utm_source=widget)
+[![en](https://hosted.weblate.org/widgets/androbd/en/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/en/)
+[![de](https://hosted.weblate.org/widgets/androbd/de/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/de/)
+[![fr](https://hosted.weblate.org/widgets/androbd/fr/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/fr/)
+[![es](https://hosted.weblate.org/widgets/androbd/es/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/es/)
+[![ru](https://hosted.weblate.org/widgets/androbd/ru/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/ru/)
+[![ja](https://hosted.weblate.org/widgets/androbd/ja/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/ja/)
+[![cs](https://hosted.weblate.org/widgets/androbd/cs/shields-badge.svg)](https://hosted.weblate.org/projects/androbd/strings/cs/)
+
+You are invited to contribute a translation into your favourite language. 
+(Special thanks to [Michal Čihař](https://github.com/nijel) for hosting translations on [weblate.org](http://weblate.org/).)
 
 #OBD Features
 * Read fault codes

diff --git a/res/layout/startup_layout.xml b/res/layout/startup_layout.xml
@@ -22,29 +22,51 @@
         android:layout_height="wrap_content">
 
         <TextView
-            android:id="@+id/textView3"
+            android:id="@+id/tvAppName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"/>
+            android:textStyle="bold"
+            android:contentDescription="@string/url_app_mainpage"
+            android:onClick="clickHandler"
+            android:clickable="true"
+            />
 
         <TextView
-            android:id="@+id/TextView01"
+            android:id="@+id/tvVersion"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/app_version"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:enabled="true"
+            android:contentDescription="@string/url_app_releases"
+            android:onClick="clickHandler"
+            android:clickable="true"
+            />
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/tvCopyright"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/copyright_fr3ts0n"
-            android:textAppearance="?android:attr/textAppearanceSmall"/>
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            />
+
+        <TextView
+            android:id="@+id/tvTranslation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/translation_credits"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:contentDescription="@string/url_app_translation"
+            android:onClick="clickHandler"
+            android:clickable="true"
+            />
     </LinearLayout>
 
     <ListView

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -127,4 +127,5 @@
     <string name="elm_options">ELM Einstellungen</string>
     <string name="elm_custom_init">ELM Initialisierung</string>
     <string name="elm_custom_init_descr">eigene ELM Befehle zur Initialisierung</string>
+    <string name="translation_credits">Übersetzung von fr3ts0n</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!--  AndrOBD -->
     <string name="app_name" translatable="false">AndrOBD</string>
-    <string name="app_version" translatable="false">V1.3.6</string>
+    <string name="app_version" translatable="false">V1.3.7</string>
     <string name="copyright_fr3ts0n" translatable="false">&#169; 2015 fr3ts0n</string>
+    <string name="translation_credits">Translation by fr3ts0n</string>
     <string name="app_description">Android OBD vehicle diagnostics app for ELM327 bluetooth adapter</string>
+    <string name="url_app_mainpage" translatable="false">https://github.com/fr3ts0n/AndrOBD/</string>
+    <string name="url_app_releases" translatable="false">https://github.com/fr3ts0n/AndrOBD/releases/</string>
+    <string name="url_app_translation" translatable="false">https://hosted.weblate.org/projects/androbd/strings/</string>
     <string name="send">Send</string>
     <string name="not_connected">You are not connected to a device</string>
     <string name="title_connecting">Connecting&#8230;</string>
@@ -39,7 +42,7 @@ information, including:\n
  - Distance travelled since DTCs cleared\n
  - Engine run time while MIL activated\n
  - Time since DTCs cleared\n\n
-Other manufacturer-specific clearing/resetting actions may occur.\n
+Other manufacturer specific clearing/resetting actions may occur.\n
 The loss of data may cause the vehicle to run poorly for a short \n
 period of time while the ECU recalibrates itself.
      </string>
@@ -66,6 +69,7 @@ period of time while the ECU recalibrates itself.
     <string name="saved_data">Saved Data</string>
     <string name="loaded">loaded</string>
     <string name="saved">saved</string>
+
     <string name="connected_to">"Connected to "</string>
     <string name="demo">Demo…</string>
     <string name="saving_data">Saving data …</string>
@@ -222,5 +226,4 @@ period of time while the ECU recalibrates itself.
         <item>@string/RXERROR</item>
         <item>@string/ERROR</item>
     </string-array>
-
 </resources>
diff --git a/src/com/fr3ts0n/ecu/gui/androbd/MainActivity.java b/src/com/fr3ts0n/ecu/gui/androbd/MainActivity.java
@@ -443,7 +443,7 @@ protected void selectEcu(final Set<Integer> ecuAdresses)
 		// if more than one ECUs available ...
 		if(ecuAdresses.size() > 1)
 		{
-			int preferredAddress = prefs.getInt(PRESELECT.LAST_ECU_ADDRESS.toString(),0);
+			int preferredAddress = prefs.getInt(PRESELECT.LAST_ECU_ADDRESS.toString(), 0);
 			// check if last preferred address matches any of the reported addresses
 			if(istRestoreWanted(PRESELECT.LAST_ECU_ADDRESS)
 			   && ecuAdresses.contains(preferredAddress))
@@ -657,6 +657,16 @@ protected void onCreate(Bundle savedInstanceState)
 		}
 	}
 
+	/**
+	 * OnClick handler - Browse URL from content description
+	 * @param view view source of click event
+	 */
+	public void clickHandler(View view)
+	{
+		String url = view.getContentDescription().toString();
+		startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url)));
+	}
+
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences prefs, String key)
 	{