diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d41da1472..1e4bc74eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ android:theme="@style/AppTheme"> diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index af38fd09a..5013ef134 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/com/example/marat/wal/views/AccountListActivity.java b/app/src/main/java/com/example/marat/wal/views/AccountListActivity.java index cdde7d534..bb0a3c4ad 100644 --- a/app/src/main/java/com/example/marat/wal/views/AccountListActivity.java +++ b/app/src/main/java/com/example/marat/wal/views/AccountListActivity.java @@ -2,6 +2,7 @@ package com.example.marat.wal.views; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; @@ -45,6 +46,11 @@ public class AccountListActivity extends AppCompatActivity implements DeleteAcco setSupportActionBar(toolbar); toolbar.setTitle(getTitle()); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + mController = Controller.get(); mRecyclerView = findViewById(R.id.account_list); diff --git a/app/src/main/java/com/example/marat/wal/views/IntroActivity.java b/app/src/main/java/com/example/marat/wal/views/IntroActivity.java index 6827b6f98..586cfa948 100644 --- a/app/src/main/java/com/example/marat/wal/views/IntroActivity.java +++ b/app/src/main/java/com/example/marat/wal/views/IntroActivity.java @@ -18,9 +18,9 @@ public class IntroActivity extends AppIntro { // Instead of fragments, you can also use our default slide // Just set a title, description, background and image. AppIntro will do the rest. - addSlide(AppIntroFragment.newInstance("Private & Secure", "Private keys never leave your device.", R.mipmap.onboarding_lock, Color.WHITE)); - addSlide(AppIntroFragment.newInstance("Fast", "Fast", R.mipmap.onboarding_rocket, Color.WHITE)); - addSlide(AppIntroFragment.newInstance("Open source", "Open source", R.mipmap.onboarding_open_source, Color.WHITE)); + addSlide(AppIntroFragment.newInstance("Private & Secure", null, "Private keys never leave your device.", null, R.mipmap.onboarding_lock, Color.WHITE, Color.BLACK, Color.BLACK)); + addSlide(AppIntroFragment.newInstance("Fast", null, "Fast", null, R.mipmap.onboarding_rocket, Color.WHITE, Color.BLACK, Color.BLACK)); + addSlide(AppIntroFragment.newInstance("Open source", null, "Open source", null, R.mipmap.onboarding_open_source, Color.WHITE, Color.BLACK, Color.BLACK)); // OPTIONAL METHODS // Override bar/separator color. diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bccc..29ffaf76a 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0cbd..d17f09a5e 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0e7..070573d24 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72cdd..fa3dba935 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e138..765ea4e57 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 91ee6b533..a6f65ecc4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -144,6 +144,10 @@ Network: Intro + + Hello blank fragment + Trust +