From 3fbb32f262df3b99ee70c81a5a515d789323d498 Mon Sep 17 00:00:00 2001 From: Yaroslav Berezanskyi Date: Thu, 13 Aug 2015 13:43:54 +0300 Subject: [PATCH] Profile name in drawer bug fixed. Display title in WebView fixed. Changed some names from account to profile --- .../java/io/syng/activity/BaseActivity.java | 53 +++++++++---------- .../java/io/syng/activity/MainActivity.java | 2 + ...Adapter.java => ProfileDrawerAdapter.java} | 8 +-- .../io/syng/fragment/ConsoleFragment.java | 3 -- .../io/syng/fragment/WebViewFragment.java | 3 +- app/src/main/res/layout/drawer_header.xml | 1 - ...st_add.xml => profile_drawer_list_add.xml} | 0 ..._item.xml => profile_drawer_list_item.xml} | 0 8 files changed, 33 insertions(+), 37 deletions(-) rename app/src/main/java/io/syng/adapter/{AccountDrawerAdapter.java => ProfileDrawerAdapter.java} (94%) rename app/src/main/res/layout/{account_drawer_list_add.xml => profile_drawer_list_add.xml} (100%) rename app/src/main/res/layout/{account_drawer_list_item.xml => profile_drawer_list_item.xml} (100%) diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java index 0a767b7..e01d392 100644 --- a/app/src/main/java/io/syng/activity/BaseActivity.java +++ b/app/src/main/java/io/syng/activity/BaseActivity.java @@ -47,10 +47,10 @@ import java.util.ArrayList; import java.util.List; import io.syng.R; -import io.syng.adapter.AccountDrawerAdapter; -import io.syng.adapter.AccountDrawerAdapter.OnProfileClickListener; import io.syng.adapter.DAppDrawerAdapter; import io.syng.adapter.DAppDrawerAdapter.OnDAppClickListener; +import io.syng.adapter.ProfileDrawerAdapter; +import io.syng.adapter.ProfileDrawerAdapter.OnProfileClickListener; import io.syng.app.SyngApplication; import io.syng.entity.Dapp; import io.syng.entity.Profile; @@ -75,11 +75,11 @@ public abstract class BaseActivity extends AppCompatActivity implements private EditText mSearchTextView; private RecyclerView mDAppsRecyclerView; - private RecyclerView mAccountsRecyclerView; + private RecyclerView mProfilesRecyclerView; private DrawerLayout mDrawerLayout; private DAppDrawerAdapter mDAppsDrawerAdapter; - private AccountDrawerAdapter mAccountDrawerAdapter; + private ProfileDrawerAdapter mProfileDrawerAdapter; private View mFrontView; private View mBackView; @@ -103,7 +103,10 @@ public abstract class BaseActivity extends AppCompatActivity implements public void setContentView(final int layoutResID) { LayoutInflater inflater = getLayoutInflater(); mDrawerLayout = (DrawerLayout) inflater.inflate(R.layout.drawer, null, false); - FrameLayout content = (FrameLayout) mDrawerLayout.findViewById(R.id.content); + + super.setContentView(mDrawerLayout); + + FrameLayout content = (FrameLayout) findViewById(R.id.content); Toolbar toolbar = (Toolbar) inflater.inflate(layoutResID, content, true).findViewById(R.id.myToolbar); if (toolbar != null) { @@ -125,32 +128,31 @@ public abstract class BaseActivity extends AppCompatActivity implements mDrawerLayout.setDrawerListener(mDrawerToggle); - mSearchTextView = (EditText) mDrawerLayout.findViewById(R.id.search); + mSearchTextView = (EditText) findViewById(R.id.search); initSearch(); - mDrawerLayout.findViewById(R.id.ll_import_wallet).setOnClickListener(this); - mDrawerLayout.findViewById(R.id.ll_settings).setOnClickListener(this); - mDrawerLayout.findViewById(R.id.ll_contribute).setOnClickListener(this); - mDrawerLayout.findViewById(R.id.drawer_header).setOnClickListener(this); + findViewById(R.id.ll_import_wallet).setOnClickListener(this); + findViewById(R.id.ll_settings).setOnClickListener(this); + findViewById(R.id.ll_contribute).setOnClickListener(this); + findViewById(R.id.drawer_header).setOnClickListener(this); - mFrontView = mDrawerLayout.findViewById(R.id.ll_front_view); - mBackView = mDrawerLayout.findViewById(R.id.ll_back_view); + mFrontView = findViewById(R.id.ll_front_view); + mBackView = findViewById(R.id.ll_back_view); - mAccountsRecyclerView = (RecyclerView) mBackView.findViewById(R.id.accounts_drawer_recycler_view); + mProfilesRecyclerView = (RecyclerView) findViewById(R.id.accounts_drawer_recycler_view); RecyclerView.LayoutManager layoutManager2 = new LinearLayoutManager(this); - mAccountsRecyclerView.setLayoutManager(layoutManager2); + mProfilesRecyclerView.setLayoutManager(layoutManager2); initProfiles(); - mDAppsRecyclerView = (RecyclerView) mDrawerLayout.findViewById(R.id.dapd_drawer_recycler_view); + mDAppsRecyclerView = (RecyclerView) findViewById(R.id.dapd_drawer_recycler_view); mDAppsRecyclerView.setHasFixedSize(true); RecyclerView.LayoutManager layoutManager1 = new LinearLayoutManager(this); mDAppsRecyclerView.setLayoutManager(layoutManager1); initDApps(); - ImageView header = (ImageView) mDrawerLayout.findViewById(R.id.iv_header); - Glide.with(this).load(R.drawable.two).into(header); + ImageView header = (ImageView) findViewById(R.id.iv_header); + Glide.with(this).load(R.drawable.drawer).into(header); - super.setContentView(mDrawerLayout); GeneralUtil.showWarningDialogIfNeed(this); } @@ -172,12 +174,12 @@ public abstract class BaseActivity extends AppCompatActivity implements PrefsUtil.saveProfile(profile); mProfiles.add(profile); } - mAccountDrawerAdapter = new AccountDrawerAdapter(this, mProfiles, this); - mAccountsRecyclerView.setAdapter(mAccountDrawerAdapter); + mProfileDrawerAdapter = new ProfileDrawerAdapter(this, mProfiles, this); + mProfilesRecyclerView.setAdapter(mProfileDrawerAdapter); if (SyngApplication.sCurrentProfile == null) { SyngApplication.changeProfile(mProfiles.get(0)); - updateCurrentProfileName(mProfiles.get(0).getName()); } + updateCurrentProfileName(SyngApplication.sCurrentProfile.getName()); } @@ -199,7 +201,6 @@ public abstract class BaseActivity extends AppCompatActivity implements } protected void changeProfile(Profile profile) { - updateCurrentProfileName(profile.getName()); SyngApplication.changeProfile(profile); initDApps(); @@ -207,9 +208,7 @@ public abstract class BaseActivity extends AppCompatActivity implements protected void updateCurrentProfileName(String name) { TextView textView = (TextView) findViewById(R.id.tv_name); - if (textView != null) { - textView.setText(name); - } + textView.setText(name); } protected void requestChangeProfile(final Profile profile) { @@ -359,7 +358,7 @@ public abstract class BaseActivity extends AppCompatActivity implements profile.setName(input.toString()); mProfiles.add(profile); PrefsUtil.saveProfile(profile); - mAccountDrawerAdapter.notifyDataSetChanged(); + mProfileDrawerAdapter.notifyDataSetChanged(); } }).show(); dialog.getInputEditText().setSingleLine(); @@ -530,7 +529,7 @@ public abstract class BaseActivity extends AppCompatActivity implements break; } } - mAccountDrawerAdapter.notifyDataSetChanged(); + mProfileDrawerAdapter.notifyDataSetChanged(); if (SyngApplication.sCurrentProfile.getId().equals(profile.getId())) { updateCurrentProfileName(profile.getName()); } diff --git a/app/src/main/java/io/syng/activity/MainActivity.java b/app/src/main/java/io/syng/activity/MainActivity.java index 5bf5ae4..165d511 100644 --- a/app/src/main/java/io/syng/activity/MainActivity.java +++ b/app/src/main/java/io/syng/activity/MainActivity.java @@ -45,6 +45,7 @@ public class MainActivity extends BaseActivity { switch (dapp.getUrl()) { case "": replaceFragment(new ConsoleFragment()); + getSupportActionBar().setTitle(R.string.app_name); break; default: WebViewFragment wvF = new WebViewFragment(); @@ -52,6 +53,7 @@ public class MainActivity extends BaseActivity { args.putString("url", dapp.getUrl()); wvF.setArguments(args); replaceFragment(wvF); + getSupportActionBar().setTitle(dapp.getName()); break; } } diff --git a/app/src/main/java/io/syng/adapter/AccountDrawerAdapter.java b/app/src/main/java/io/syng/adapter/ProfileDrawerAdapter.java similarity index 94% rename from app/src/main/java/io/syng/adapter/AccountDrawerAdapter.java rename to app/src/main/java/io/syng/adapter/ProfileDrawerAdapter.java index c18a770..da7eba1 100644 --- a/app/src/main/java/io/syng/adapter/AccountDrawerAdapter.java +++ b/app/src/main/java/io/syng/adapter/ProfileDrawerAdapter.java @@ -16,7 +16,7 @@ import java.util.List; import io.syng.R; import io.syng.entity.Profile; -public class AccountDrawerAdapter extends RecyclerView.Adapter { +public class ProfileDrawerAdapter extends RecyclerView.Adapter { private static final int TYPE_HEADER = 10; private static final int TYPE_SIMPLE_ITEM = 20; @@ -35,7 +35,7 @@ public class AccountDrawerAdapter extends RecyclerView.Adapter mDataSet; - public AccountDrawerAdapter(Context context, List data, OnProfileClickListener listener) { + public ProfileDrawerAdapter(Context context, List data, OnProfileClickListener listener) { this.mDataSet = data; mContext = context; mListener = listener; @@ -45,11 +45,11 @@ public class AccountDrawerAdapter extends RecyclerView.Adapter