From 4bf1c14bb84b0f5cb67949e8adc4792744e8331d Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 29 Nov 2018 21:06:36 -0600 Subject: [PATCH] Temporarily remove AnimatedTabLayout library. --- app/build.gradle | 2 -- .../agorise/crystalwallet/activities/SettingsActivity.java | 7 ++----- app/src/main/res/layout/activity_settings.xml | 3 +-- app/src/main/res/layout/board.xml | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4277357..392e327 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,8 +87,6 @@ dependencies { implementation 'com.github.bilthon:graphenej:0.4.6' implementation 'me.dm7.barcodescanner:zxing:1.9.8' - implementation 'com.github.sjaramillo10:AnimatedTabLayout:1.0.3' - implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0' implementation 'de.hdodenhof:circleimageview:2.2.0' diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java index 1c0e253..bb357e9 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java @@ -1,22 +1,19 @@ package cy.agorise.crystalwallet.activities; import android.content.Intent; -import android.media.MediaPlayer; import android.os.Bundle; +import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.view.SurfaceHolder; -import android.view.SurfaceView; import android.widget.ImageView; import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.sjaramillo10.animatedtablayout.AnimatedTabLayout; import butterknife.BindView; import butterknife.ButterKnife; @@ -37,7 +34,7 @@ public class SettingsActivity extends AppCompatActivity{ public ImageView ivGoBack; @BindView(R.id.tabLayout) - public AnimatedTabLayout tabLayout; + public TabLayout tabLayout; @BindView(R.id.pager) public ViewPager mPager; diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 2f064c9..658a1b4 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -79,13 +79,12 @@ - diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml index aeaebed..33c7c94 100644 --- a/app/src/main/res/layout/board.xml +++ b/app/src/main/res/layout/board.xml @@ -96,7 +96,7 @@ -