Bug fix
Fix keys preview Fix no balance loading error
This commit is contained in:
parent
3bbfdbb4d2
commit
04f997c675
@ -181,6 +181,7 @@ public class HomeActivity extends AppCompatActivity {
|
|||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
Intent settingIntent = new Intent(HomeActivity.this, SettingsActivity.class);
|
Intent settingIntent = new Intent(HomeActivity.this, SettingsActivity.class);
|
||||||
startActivity(settingIntent);
|
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(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();
|
Log.d(getResources().getString(R.string.debug), "Loading heavy");
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.d("coinfolio", "Loading heavy");
|
|
||||||
|
|
||||||
UiHeavyLoadCalculator uiHeavyLoadCalculator = new UiHeavyLoadCalculator();
|
UiHeavyLoadCalculator uiHeavyLoadCalculator = new UiHeavyLoadCalculator();
|
||||||
uiHeavyLoadCalculator.execute();
|
uiHeavyLoadCalculator.execute();
|
||||||
@ -504,6 +505,8 @@ public class HomeActivity extends AppCompatActivity {
|
|||||||
{
|
{
|
||||||
if(balanceManager.getTotalBalance().size() == 0)
|
if(balanceManager.getTotalBalance().size() == 0)
|
||||||
{
|
{
|
||||||
|
Log.d("coinfolio", "Empty");
|
||||||
|
|
||||||
countIcons();
|
countIcons();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -215,6 +215,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|||||||
|
|
||||||
bindPreferenceSummaryToValue(findPreference("hitbtc_publickey"));
|
bindPreferenceSummaryToValue(findPreference("hitbtc_publickey"));
|
||||||
bindPreferenceSummaryToValue(findPreference("hitbtc_privatekey"));
|
bindPreferenceSummaryToValue(findPreference("hitbtc_privatekey"));
|
||||||
|
|
||||||
|
bindPreferenceSummaryToValue(findPreference("binance_publickey"));
|
||||||
|
bindPreferenceSummaryToValue(findPreference("binance_privatekey"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
11
app/src/main/res/anim/activity_enter.xml
Normal file
11
app/src/main/res/anim/activity_enter.xml
Normal 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
11
app/src/main/res/anim/activity_exit.xml
Normal 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>
|
@ -28,6 +28,53 @@
|
|||||||
android:title="@string/pref_title_hitbtc_privatekey" />
|
android:title="@string/pref_title_hitbtc_privatekey" />
|
||||||
</PreferenceCategory>
|
</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
|
<PreferenceCategory
|
||||||
android:title="@string/pref_title_exchange_gdax"
|
android:title="@string/pref_title_exchange_gdax"
|
||||||
android:enabled="false">
|
android:enabled="false">
|
||||||
@ -57,51 +104,6 @@
|
|||||||
android:title="@string/pref_title_gdax_privatekey" />
|
android:title="@string/pref_title_gdax_privatekey" />
|
||||||
</PreferenceCategory>
|
</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
|
<PreferenceCategory
|
||||||
android:title="@string/pref_title_exchange_poloniex"
|
android:title="@string/pref_title_exchange_poloniex"
|
||||||
android:enabled="false">
|
android:enabled="false">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user