From 9020608a07aba743cb4cd31975c285fcd2f5adc8 Mon Sep 17 00:00:00 2001 From: dtvv Date: Fri, 12 Oct 2018 04:22:28 -0500 Subject: [PATCH] -Change the buttons style to the buttons to material one in the fragment_general_crypto_net_account_settings.xml and java source -Add the new buttons push animation to the buttons in the fragment_general_crypto_net_account_settings.xml and java source --- .../crystalwallet/activities/AccountsActivity.java | 14 ++++++++++++++ .../GeneralCryptoNetAccountSettingsFragment.java | 14 ++++++++++++++ ...ragment_general_crypto_net_account_settings.xml | 4 ++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java index 855cd3d..0196bba 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java @@ -18,10 +18,12 @@ import android.provider.MediaStore; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; +import android.view.View; import android.widget.TextView; import com.esafirm.imagepicker.features.ImagePicker; import com.esafirm.imagepicker.model.Image; +import com.thekhaeng.pushdownanim.PushDownAnim; //import com.nicdahlquist.pngquant.LibPngQuant; import java.io.File; @@ -74,6 +76,18 @@ public class AccountsActivity extends AppCompatActivity { setContentView(R.layout.activity_accounts); ButterKnife.bind(this); + /* + * Integration of library with button efects + * */ + PushDownAnim.setPushDownAnimTo(fabAddAccount) + .setOnClickListener( new View.OnClickListener(){ + @Override + public void onClick( View view ){ + goToAddAccount(); + } + + } ); + CryptoNetAccountListViewModel crytpoNetAccountListViewModel = ViewModelProviders.of(this).get(CryptoNetAccountListViewModel.class); LiveData> accountData = crytpoNetAccountListViewModel.getCryptoNetAccounts(); vAccountList.setData(null); diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralCryptoNetAccountSettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralCryptoNetAccountSettingsFragment.java index d51e3e5..f7fad03 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralCryptoNetAccountSettingsFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralCryptoNetAccountSettingsFragment.java @@ -14,6 +14,8 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; +import com.thekhaeng.pushdownanim.PushDownAnim; + import java.util.List; import butterknife.BindView; @@ -85,6 +87,18 @@ public class GeneralCryptoNetAccountSettingsFragment extends Fragment { View v = inflater.inflate(R.layout.fragment_general_crypto_net_account_settings, container, false); ButterKnife.bind(this, v); + /* + * Integration of library with button efects + * */ + PushDownAnim.setPushDownAnimTo(btnCopy) + .setOnClickListener( new View.OnClickListener(){ + @Override + public void onClick( View view ){ + btnCopyClick(); + } + + } ); + initAlreadyLtm(); return v; diff --git a/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml b/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml index fde0910..97af11d 100644 --- a/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml +++ b/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml @@ -57,10 +57,10 @@ android:layout_height="wrap_content" android:layout_below="@+id/linearlayout1" android:layout_marginTop="25dp" + android:theme="@style/BlueButton" android:layout_alignParentRight="true" android:text="@string/window_seed_copy" - android:textColor="#0099ff" - android:background="?android:attr/selectableItemBackground"/> + android:textColor="@color/white"/>