diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 44de849..e76d248 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:name="cy.agorise.crystalwallet.application.CrystalApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" + android:label="" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java index e22ee36..83ea5ff 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java @@ -2,7 +2,10 @@ package cy.agorise.crystalwallet.activities; import android.content.Intent; import android.content.res.Resources; +import android.graphics.drawable.AnimationDrawable; +import android.media.MediaPlayer; import android.os.Bundle; +import android.support.design.widget.AppBarLayout; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; @@ -13,6 +16,9 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.util.Log; +import android.view.SurfaceHolder; +import android.view.SurfaceView; import android.view.View; import android.view.animation.LinearInterpolator; import android.widget.ImageButton; @@ -36,8 +42,8 @@ public class BoardActivity extends AppCompatActivity { @BindView(R.id.pager) public ViewPager mPager; - @BindView(R.id.btnGeneralSettings) - public ImageButton btnGeneralSettings; + //@BindView(R.id.btnGeneralSettings) + //public ImageButton btnGeneralSettings; @BindView(R.id.fabSend) public FloatingActionButton fabSend; @@ -56,6 +62,8 @@ public class BoardActivity extends AppCompatActivity { */ long cryptoNetAccountId; + private SurfaceView mSurfaceView; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -68,6 +76,29 @@ public class BoardActivity extends AppCompatActivity { Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); + // Appbar animation + mSurfaceView = findViewById(R.id.surface_view); + mSurfaceView.getHolder().addCallback(new SurfaceHolder.Callback() { + @Override + public void surfaceCreated(SurfaceHolder surfaceHolder) { + //Log.d(TAG,"surfaceCreated"); + MediaPlayer mediaPlayer = MediaPlayer.create(BoardActivity.this, R.raw.appbar_background); + mediaPlayer.setDisplay(mSurfaceView.getHolder()); + mediaPlayer.setLooping(true); + mediaPlayer.start(); + } + + @Override + public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) { + //Log.d(TAG,"surfaceChanged"); + } + + @Override + public void surfaceDestroyed(SurfaceHolder surfaceHolder) { + //Log.d(TAG,"surfaceDestroyed"); + } + }); + boardAdapter = new BoardPagerAdapter(getSupportFragmentManager()); mPager.setAdapter(boardAdapter); @@ -167,7 +198,7 @@ public class BoardActivity extends AppCompatActivity { newFragment.show(ft, "SendDialog"); } - @OnClick(R.id.btnGeneralSettings) + //@OnClick(R.id.btnGeneralSettings) public void onBtnGeneralSettingsClick(){ Intent intent = new Intent(this, GeneralSettingsActivity.class); startActivity(intent); diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml index fc37be7..f941079 100644 --- a/app/src/main/res/layout/board.xml +++ b/app/src/main/res/layout/board.xml @@ -2,75 +2,105 @@ + tools:context=".activities.BoardActivity"> - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + app:contentScrim="@color/transparent" + app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:toolbarId="@+id/toolbar"> - + - + - + - + + + + + + + app:layout_collapseMode="pin" + android:animateLayoutChanges="true"> - + - + + + + + + + - + + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml index c847c93..c982fd9 100644 --- a/app/src/main/res/layout/fragment_transactions.xml +++ b/app/src/main/res/layout/fragment_transactions.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/raw/appbar_background.mp4 b/app/src/main/res/raw/appbar_background.mp4 new file mode 100644 index 0000000..db5535e Binary files /dev/null and b/app/src/main/res/raw/appbar_background.mp4 differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 40c5a21..c3aa5bd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,6 +8,7 @@ #ffffff #f0006b #00ffffff + #330099d6 #147b00 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 87a60b1..b81577a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,7 +6,7 @@ 16dp 14sp 72dp - 70sp + 140sp 16dp 16dp 35sp