therbron/Moodl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix

Browse Source 
Fix keys preview
Fix no balance loading error
This commit is contained in:
Tanguy Herbron 2018-02-27 23:54:05 +01:00
parent 3bbfdbb4d2
commit 04f997c675
5 changed files with 82 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
View File

@ -181,6 +181,7 @@ public class HomeActivity extends AppCompatActivity {
public void onClick(View view) {
Intent settingIntent = new Intent(HomeActivity.this, SettingsActivity.class);
startActivity(settingIntent);
//overridePendingTransition(R.anim.activity_enter, R.anim.activity_exit);
}
});
@ -428,15 +429,15 @@ public class HomeActivity extends AppCompatActivity {
if(balanceManager.getTotalBalance() != null)
{
if(iconCounter == balanceManager.getTotalBalance().size() - offset)
if(balanceManager.getTotalBalance().size() == 0)
{
if(balanceManager.getTotalBalance().size() == 0)
updateNoBalance();
}
else
{
if(iconCounter == balanceManager.getTotalBalance().size() - offset)
{
updateNoBalance();
}
else
{
Log.d("coinfolio", "Loading heavy");
Log.d(getResources().getString(R.string.debug), "Loading heavy");
UiHeavyLoadCalculator uiHeavyLoadCalculator = new UiHeavyLoadCalculator();
uiHeavyLoadCalculator.execute();
@ -504,6 +505,8 @@ public class HomeActivity extends AppCompatActivity {
{
if(balanceManager.getTotalBalance().size() == 0)
{
Log.d("coinfolio", "Empty");
countIcons();
}
}

3
app/src/main/java/com/nauk/coinfolio/Activities/SettingsActivity.java
View File

@ -215,6 +215,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
bindPreferenceSummaryToValue(findPreference("hitbtc_publickey"));
bindPreferenceSummaryToValue(findPreference("hitbtc_privatekey"));
bindPreferenceSummaryToValue(findPreference("binance_publickey"));
bindPreferenceSummaryToValue(findPreference("binance_privatekey"));
}
@Override

11
app/src/main/res/anim/activity_enter.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
<translate
android:duration="500"
android:fromXDelta="100%"
android:fromYDelta="0%"
android:toXDelta="0%"
android:toYDelta="0%" />
</set>

11
app/src/main/res/anim/activity_exit.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
<translate
android:duration="500"
android:fromXDelta="0%"
android:fromYDelta="0%"
android:toXDelta="-100%"
android:toYDelta="0%" />
</set>

92
app/src/main/res/xml/pref_exchange.xml
View File

@ -28,6 +28,53 @@
android:title="@string/pref_title_hitbtc_privatekey" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_exchange_binance">
<SwitchPreference
android:key="enable_binance"
android:title="@string/pref_title_enable_synchronization_binance" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_publickey" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_privatekey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_privatekey" />
<!--<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_publickey" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_privatekey" />-->
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_exchange_gdax"
android:enabled="false">
@ -57,51 +104,6 @@
android:title="@string/pref_title_gdax_privatekey" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_exchange_binance"
android:enabled="true">
<SwitchPreference
android:defaultValue="false"
android:key="enable_binance"
android:title="@string/pref_title_enable_synchronization_binance" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:selectAllOnFocus="true"
android:title="@string/pref_title_binance_publickey" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_privatekey"
android:selectAllOnFocus="true"
android:title="@string/pref_title_binance_privatekey" />
<!--<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_publickey" />
<EditTextPreference
android:capitalize="words"
android:dependency="enable_binance"
android:inputType="text"
android:key="binance_publickey"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_binance_privatekey" />-->
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_exchange_poloniex"
android:enabled="false">