From 008a855c97964e4094af240bee6d68577d8d9ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Santos?= <andrefilipebrazsantos@gmail.com>
Date: Fri, 17 Oct 2014 17:44:50 +0100
Subject: [PATCH] Added exchanges BTC100 and BtcTrade. Modified
 ExchangeListPreference on AlarmCreation to select OKCoin as default.

---
 ReleaseNotes                                  |   4 +
 pom.xml                                       |  10 +-
 src/main/AndroidManifest.xml                  |   4 +-
 .../mobi/boilr/boilr/utils/Languager.java     |   1 +
 .../fragments/AlarmCreationFragment.java      |   3 +
 src/main/res/values-pt/strings.xml            | 112 ++++++++++++++++++
 src/main/res/values/strings.xml               |   8 +-
 7 files changed, 133 insertions(+), 9 deletions(-)
 create mode 100755 src/main/res/values-pt/strings.xml

diff --git a/ReleaseNotes b/ReleaseNotes
index 09d421e..900cebd 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,7 @@
+Version 0.4.0
++ Added exchanges: BTC100 and BtcTrade.
++ Added OKCoin futures.
+
 Version 0.3.0
 + Added exchanges: Atomic Trade, BitBay, Bitcurex, BitMarket.pl, C-CEX, CCEDK, CoinMkt, Coins-E, Crypto-Trade, Cryptonit, Justcoin, Paymium and Vircurex.
 + Added Czech translation.
diff --git a/pom.xml b/pom.xml
index dfe1ff3..e8c4e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>mobi.boilr.boilr</groupId>
 	<artifactId>boilr</artifactId>
-	<version>0.3.0</version>
+	<version>0.4.0</version>
 	<packaging>apk</packaging>
 	<description>Android application which triggers an alarm when price of a cryptocurrency or bullion changes or reaches target value on a given exchange.</description>
 	<inceptionYear>2014</inceptionYear>
@@ -21,13 +21,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdk.version>1.6</jdk.version>
-		<libdynticker.version>0.3.0</libdynticker.version>
+		<libdynticker.version>0.4.0</libdynticker.version>
 		<libpricealarm.version>0.1.0</libpricealarm.version>
 		<release.description>
-			\+ Added exchanges: Atomic Trade, BitBay, Bitcurex, BitMarket.pl, C-CEX, CCEDK, CoinMkt, Coins-E, Crypto-Trade, Cryptonit, Justcoin, Paymium and Vircurex.
-			\+ Added Czech translation.
-			\* Price Change alarms now retry to get last value after failing due to unavailable internet connection.
-			\- Removed Mintpal exchange (currently offline).
+			\+ Added exchanges: BTC100 and BtcTrade.
+			\+ Added OKcoin futures.
 		</release.description>
 	</properties>
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index da895fb..fdce49b 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mobi.boilr.boilr"
-    android:versionCode="5"
-    android:versionName="0.3.0">
+    android:versionCode="6"
+    android:versionName="0.4.0">
 
     <uses-sdk
         android:minSdkVersion="11"
diff --git a/src/main/java/mobi/boilr/boilr/utils/Languager.java b/src/main/java/mobi/boilr/boilr/utils/Languager.java
index b09dd07..b66ecaa 100644
--- a/src/main/java/mobi/boilr/boilr/utils/Languager.java
+++ b/src/main/java/mobi/boilr/boilr/utils/Languager.java
@@ -18,6 +18,7 @@ public static void setLanguage(Context context){
 			locale = new Locale(language);
 		}else{
 			language = Locale.getDefault().getLanguage();
+			Log.d("SOLanguage " + language);
 			String [] knownLanguages = context.getResources().getStringArray(R.array.pref_values_language);
 			int size = knownLanguages.length;
 			for(int i = 0 ; i<size;i++ ){
diff --git a/src/main/java/mobi/boilr/boilr/views/fragments/AlarmCreationFragment.java b/src/main/java/mobi/boilr/boilr/views/fragments/AlarmCreationFragment.java
index 800b508..c348353 100755
--- a/src/main/java/mobi/boilr/boilr/views/fragments/AlarmCreationFragment.java
+++ b/src/main/java/mobi/boilr/boilr/views/fragments/AlarmCreationFragment.java
@@ -127,6 +127,9 @@ public void onCreate(Bundle savedInstanceState) {
 				vibrate = args.getBoolean("vibrate");
 				defaultDef = args.getBoolean("defaultVibrateDef");
 			}
+			else {
+				exchangeIndex = exchangeListPref.findIndexOfValue(enclosingActivity.getString(R.string.pref_exchange_default));
+			}
 			alarmAlertTypePref.setValue(alertType);
 			if(alertType == null) {
 				alertType = sharedPrefs.getString(SettingsFragment.PREF_KEY_DEFAULT_ALERT_TYPE, "");
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
new file mode 100755
index 0000000..e356b30
--- /dev/null
+++ b/src/main/res/values-pt/strings.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="action_search">Procurar</string>
+    <string name="action_settings">Definições</string>
+    <string name="action_about">Sobre</string>
+    <string name="alarm_settings">Definições de alarme</string>
+    <string name="add_alarm">Adicionar alarme</string>
+    <string name="on">ON</string>
+    <string name="off">OFF</string>
+    <string name="boilr_settings">Definições Boilr</string>
+    <string name="about_title">Sobre Boilr</string>
+    <string name="about_website_button">Website</string>
+    <string name="ok">OK</string>
+    <string name="about_license">Released under GNU GPLv3+ license.</string>
+    <string name="about_website">Website: </string>
+    <string name="about_version">Versão: </string>
+    <string name="about_developers">Programadores: </string>
+    <string name="about_concept">Conceito e Desenho: </string>
+    <string name="about_donations">Doações:</string>
+    <string name="pref_title_alerts">Alertas</string>
+    <string name="pref_title_default_alert_type">Tipo por omissão</string>
+
+    <string-array name="pref_entries_alert_type">
+        <item>Alarme</item>
+        <item>Notificação</item>
+        <item>Toque</item>
+    </string-array>
+
+    <string name="pref_title_default_alert_sound">Som por omissão</string>
+    <string name="pref_title_vibrate_default">Vibrar por omissão</string>
+    <string name="pref_title_appearance">Aparência</string>
+    <string name="pref_title_theme">Tema</string>
+
+    <string-array name="pref_entries_theme">
+        <item>Escuro</item>
+        <item>Claro</item>
+    </string-array>
+
+    <string name="pref_title_network_usage">Network usage</string>
+    <string name="pref_title_mobile_data">Dados moveís</string>
+    <string name="pref_title_default_update_interval_hit">Hit alarm default update interval</string>
+    <string name="pref_summary_default_update_interval_hit">In seconds. Defines how often a price hit alarm gets data from the exchange. You can set another interval for a particular alarm on its settings.</string>
+    <string name="pref_title_default_update_interval_change">Change alarm default time frame</string>
+    <string name="pref_summary_default_update_interval_change">In minutes. Defines the default time frame for price change alarms. You can set another time frame for a particular alarm on its settings.</string>
+    <string name="pref_title_check_pairs_interval">Procurar novos pares</string>
+
+    <string-array name="pref_entries_check_pairs_interval">
+        <item>Hora a hora</item>
+        <item>Duas vezes por dia</item>
+        <item>Diáriamente</item>
+        <item>De dois em dois dias</item>
+        <item>Semanal</item>
+        <item>Quinzenal</item>
+    </string-array>
+
+    <string name="pref_type_title">Tipo de alarme</string>
+
+    <string-array name="pref_type_entries">
+        <item>Preço limite</item>
+        <item>Variação de preço</item>
+    </string-array>
+
+    <string name="pref_exchange_title">Exchange</string>
+    <string name="pref_pair_title">Par</string>
+    <string name="action_send_now">Salvar</string>
+    <string name="pref_title_alarm_alert_type">Tipo de Alerta</string>
+    <string name="pref_title_alarm_alert_sound">Som</string>
+    <string name="pref_title_alarm_vibrate">Vibrar</string>
+    <string name="pref_title_generic">Genérico</string>
+    <string name="pref_title_specific">Específico</string>
+    <string name="pref_title_upper_limit">Limite superior</string>
+    <string name="pref_title_lower_limit">Limite inferior</string>
+    <string name="pref_title_change_in_percentage">Variação percentual</string>
+    <string name="pref_title_change_value">Variação</string>
+    <string name="pref_title_update_interval">Intervalo de actualização</string>
+    <string name="pref_title_time_frame">Time frame</string>
+    <string name="pref_title_last_value">Último valor</string>
+    <string name="pref_summary_update_interval_hit">In seconds. Defines how often the hit alarm gets data from the exchange.</string>
+    <string name="pref_summary_update_interval_change">In minutes. Defines the time frame for the price change alarm.</string>
+    <string name="boilr_alarm">Alarme Boilr</string>
+    <string name="turn_off">Desligar</string>
+    <string name="keep_monitoring">Continuar a monitorizar</string>
+    <string name="no_internet">Boilr não tem internet</string>
+    <string name="no_updates">Your alarms cannot be updated.</string>
+    <string name="couldnt_retrieve_pairs">Could not retrieve pairs for %1$s.</string>
+    <string name="couldnt_retrieve_last_value">Could not retrieve last value for %1$s with pair %2$s.</string>
+    <string name="failed_create_alarm">Failed to create alarm.</string>
+    <string name="cannot_set_limit">Cannot set limit.</string>
+    <string name="check_connection">Please check your internet connection.</string>
+    <string name="not_bound">%1$s not bound to StorageAndControlService.</string>
+    <string name="pair_search_description">Pair Search</string>
+    <string name="silent">Silencioso</string>
+
+    <string-array name="pref_entries_language">
+        <item>English</item>
+        <item>Čeština</item>
+    </string-array>
+    <string-array name="pref_values_language">
+        <item>en</item>
+        <item>cs</item>
+    </string-array>
+
+    <string name="pref_default_language">English</string>
+    <string name="pref_default_languange_code">en</string>
+    <string name="pref_title_language">Idioma</string>
+    <string name="in">tem</string>
+    <string name="had">tinha</string>
+    <string name="change">variou</string>
+    <string name="during">durante</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3553e78..3ef0f96 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -97,6 +97,7 @@
     <string name="pref_exchange_title">Exchange</string>
 
     <string-array name="pref_exchange_entries">
+<!--         <item>1Bse</item> -->
         <item>796 Exchange</item>
         <item>Allcoin</item>
         <item>ANX</item>
@@ -109,10 +110,12 @@
         <item>Bitstamp</item>
         <item>Bittrex</item>
         <item>BleuTrade</item>
+        <item>BTC100</item>
         <item>BTC38</item>
         <item>BTC China</item>
         <item>BTC Markets</item>
         <item>BTC-E</item>
+        <item>BtcTrade</item>
         <item>BTER</item>
         <item>BullionVault</item>
         <item>CampBX</item>
@@ -144,6 +147,7 @@
         <item>VoS</item>
     </string-array>
     <string-array name="pref_exchange_entries_values">
+<!--         <item>mobi.boilr.libdynticker.exchanges.OneBseExchange</item> -->
         <item>mobi.boilr.libdynticker.exchanges.E796Exchange</item>
         <item>mobi.boilr.libdynticker.exchanges.AllcoinExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.ANXExchange</item>
@@ -156,10 +160,12 @@
         <item>mobi.boilr.libdynticker.exchanges.BitstampExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BittrexExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BleuTradeExchange</item>
+        <item>mobi.boilr.libdynticker.exchanges.BTC100Exchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BTC38Exchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BTCChinaExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BTCMarketsExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BTCEExchange</item>
+        <item>mobi.boilr.libdynticker.exchanges.BtcTradeExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BTERExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.BullionVaultExchange</item>
         <item>mobi.boilr.libdynticker.exchanges.CampBXExchange</item>
@@ -191,7 +197,7 @@
         <item>mobi.boilr.libdynticker.exchanges.VoSExchange</item>
     </string-array>
 
-    <string name="pref_exchange_default">mobi.boilr.libdynticker.allcoin.E796Exchange</string>
+    <string name="pref_exchange_default">mobi.boilr.libdynticker.exchanges.OKCoinExchange</string>
     <string name="pref_pair_title">Pair</string>
     <string name="action_send_now">Save</string>
     <string name="pref_title_alarm_alert_type">Alert type</string>