diff --git a/app/src/main/java/com/aurora/store/activity/AuroraActivity.java b/app/src/main/java/com/aurora/store/activity/AuroraActivity.java
index 8d2e0a373..bbdc159bf 100644
--- a/app/src/main/java/com/aurora/store/activity/AuroraActivity.java
+++ b/app/src/main/java/com/aurora/store/activity/AuroraActivity.java
@@ -87,6 +87,7 @@ public class AuroraActivity extends AppCompatActivity {
onNewIntent(getIntent());
if (!PrefUtil.getBoolean(this, Constants.PREFERENCE_DO_NOT_SHOW_INTRO)) {
+ PrefUtil.putBoolean(this, Constants.PREFERENCE_DO_NOT_SHOW_INTRO, true);
startActivity(new Intent(this, IntroActivity.class));
finish();
} else {
diff --git a/app/src/main/java/com/aurora/store/activity/IntroActivity.java b/app/src/main/java/com/aurora/store/activity/IntroActivity.java
index 9bc9f642a..06d7c7caf 100644
--- a/app/src/main/java/com/aurora/store/activity/IntroActivity.java
+++ b/app/src/main/java/com/aurora/store/activity/IntroActivity.java
@@ -20,15 +20,21 @@
package com.aurora.store.activity;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import com.aurora.store.R;
import com.aurora.store.adapter.ViewPagerAdapter;
import com.aurora.store.fragment.AccountsFragment;
import com.aurora.store.fragment.intro.PermissionFragment;
import com.aurora.store.fragment.intro.WelcomeFragment;
+import com.aurora.store.utility.Accountant;
import com.aurora.store.utility.ThemeUtil;
import com.aurora.store.view.CustomViewPager;
@@ -39,8 +45,10 @@ public class IntroActivity extends AppCompatActivity {
@BindView(R.id.viewpager)
CustomViewPager viewPager;
+ @BindView(R.id.toolbar)
+ Toolbar toolbar;
-
+ private ActionBar actionBar;
private ThemeUtil themeUtil = new ThemeUtil();
@Override
@@ -49,16 +57,47 @@ public class IntroActivity extends AppCompatActivity {
themeUtil.onCreate(this);
setContentView(R.layout.activity_intro);
ButterKnife.bind(this);
- init();
+ setupActionbar();
+ setupViewPager();
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(final Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_intro, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(final MenuItem menuItem) {
+ switch (menuItem.getItemId()) {
+ case R.id.action_setting:
+ startActivity(new Intent(this, SettingsActivity.class));
+ return true;
+ }
+ return super.onOptionsItemSelected(menuItem);
+ }
+
+ private void setupActionbar() {
+ setSupportActionBar(toolbar);
+ actionBar = getSupportActionBar();
+ if (actionBar != null) {
+ actionBar.setDisplayShowCustomEnabled(true);
+ actionBar.setDisplayShowTitleEnabled(false);
+ actionBar.setElevation(0f);
+ }
}
@Override
protected void onResume() {
super.onResume();
themeUtil.onResume(this);
+ if (Accountant.isLoggedIn(this)) {
+ startActivity(new Intent(this, AuroraActivity.class));
+ finish();
+ }
}
- private void init() {
+ private void setupViewPager() {
ViewPagerAdapter viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
viewPagerAdapter.addFragment(0, new WelcomeFragment());
viewPagerAdapter.addFragment(1, new PermissionFragment());
diff --git a/app/src/main/java/com/aurora/store/fragment/AccountsFragment.java b/app/src/main/java/com/aurora/store/fragment/AccountsFragment.java
index 23d030aa3..8d6ddf88a 100644
--- a/app/src/main/java/com/aurora/store/fragment/AccountsFragment.java
+++ b/app/src/main/java/com/aurora/store/fragment/AccountsFragment.java
@@ -375,7 +375,6 @@ public class AccountsFragment extends Fragment {
private void finishIntro() {
if (getActivity() instanceof IntroActivity) {
- PrefUtil.putBoolean(context, Constants.PREFERENCE_DO_NOT_SHOW_INTRO, true);
getActivity().startActivity(new Intent(context, AuroraActivity.class));
getActivity().finish();
}
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index f274f165d..b8a8df4bc 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -18,16 +18,18 @@
~
-->
-
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 094670921..d814e3523 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -25,20 +25,11 @@
android:layout_height="match_parent"
tools:context=".activity.AccountsActivity">
-
-
-
-
+ android:layout_height="match_parent">
-
+
+
+
+
+
+
+ android:layout_above="@id/action"
+ android:layout_below="@+id/perm_desc"
+ android:layout_margin="@dimen/margin_normal"
+ android:background="@drawable/generic_padded_bg">
-
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+ android:maxLines="1"
+ android:text="@string/action_next" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_intro_welcome.xml b/app/src/main/res/layout/fragment_intro_welcome.xml
index 06d5c522b..1d4afdbb2 100644
--- a/app/src/main/res/layout/fragment_intro_welcome.xml
+++ b/app/src/main/res/layout/fragment_intro_welcome.xml
@@ -18,71 +18,62 @@
~
-->
-
+ android:layout_height="match_parent">
-
+
+
+
+
-
-
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/action"
+ android:layout_below="@+id/app_name"
+ android:layout_margin="@dimen/margin_normal"
+ android:background="@drawable/generic_padded_bg"
+ android:overScrollMode="never">
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+ android:maxLines="1"
+ android:text="@string/action_next" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_intro.xml b/app/src/main/res/menu/menu_intro.xml
new file mode 100644
index 000000000..8e8033117
--- /dev/null
+++ b/app/src/main/res/menu/menu_intro.xml
@@ -0,0 +1,29 @@
+
+
+
\ No newline at end of file