From c4fb74a880323c9af924fb7e4ffa2451a5a24b07 Mon Sep 17 00:00:00 2001 From: Yaroslav Berezanskyi Date: Thu, 13 Aug 2015 18:15:29 +0300 Subject: [PATCH] Different background for each profile. Redundant styles removed. --- .../java/io/syng/activity/BaseActivity.java | 10 +- .../io/syng/adapter/DAppDrawerAdapter.java | 4 - .../io/syng/adapter/ProfileDrawerAdapter.java | 3 - app/src/main/java/io/syng/util/PrefsUtil.java | 19 +- app/src/main/res/drawable/search.png | Bin 3403 -> 0 bytes app/src/main/res/drawable/track_bg.png | Bin 14936 -> 0 bytes app/src/main/res/values/style-test.xml | 249 ------------------ 7 files changed, 24 insertions(+), 261 deletions(-) delete mode 100644 app/src/main/res/drawable/search.png delete mode 100644 app/src/main/res/drawable/track_bg.png diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java index 99d659e..6125c1c 100644 --- a/app/src/main/java/io/syng/activity/BaseActivity.java +++ b/app/src/main/java/io/syng/activity/BaseActivity.java @@ -153,7 +153,8 @@ public abstract class BaseActivity extends AppCompatActivity implements initDApps(); mHeaderImageView = (ImageView) findViewById(R.id.iv_header); - Glide.with(this).load(R.drawable.bg0).into(mHeaderImageView); + String currentProfileId = SyngApplication.sCurrentProfile.getId(); + Glide.with(this).load(PrefsUtil.getBackgroundResourceId(currentProfileId)).into(mHeaderImageView); GeneralUtil.showWarningDialogIfNeed(this); } @@ -206,6 +207,7 @@ public abstract class BaseActivity extends AppCompatActivity implements updateCurrentProfileName(profile.getName()); SyngApplication.changeProfile(profile); initDApps(); + Glide.with(this).load(PrefsUtil.getBackgroundResourceId(profile.getId())).into(mHeaderImageView); } protected void updateCurrentProfileName(String name) { @@ -348,6 +350,7 @@ public abstract class BaseActivity extends AppCompatActivity implements } + @SuppressWarnings("ConstantConditions") private void showAccountCreateDialog() { MaterialDialog dialog = new MaterialDialog.Builder(this) .title("New account") @@ -513,6 +516,7 @@ public abstract class BaseActivity extends AppCompatActivity implements dialog.show(); } + @SuppressWarnings("ConstantConditions") @Override public void onProfilePress(final Profile profile) { MaterialDialog dialog = new MaterialDialog.Builder(this) @@ -610,7 +614,9 @@ public abstract class BaseActivity extends AppCompatActivity implements @Override public void onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text) { BackgroundArrayAdapter adapter = (BackgroundArrayAdapter) dialog.getListView().getAdapter(); - Glide.with(BaseActivity.this).load(adapter.getImageResourceIdByPosition(which)).into(mHeaderImageView); + int imageResourceId = adapter.getImageResourceIdByPosition(which); + Glide.with(BaseActivity.this).load(imageResourceId).into(mHeaderImageView); + PrefsUtil.setBackgroundResourceId(SyngApplication.sCurrentProfile.getId(), imageResourceId); dialog.dismiss(); } }) diff --git a/app/src/main/java/io/syng/adapter/DAppDrawerAdapter.java b/app/src/main/java/io/syng/adapter/DAppDrawerAdapter.java index 1e4c2f4..fdc9f07 100644 --- a/app/src/main/java/io/syng/adapter/DAppDrawerAdapter.java +++ b/app/src/main/java/io/syng/adapter/DAppDrawerAdapter.java @@ -22,11 +22,8 @@ public class DAppDrawerAdapter extends RecyclerView.Adapter getProfiles() { ArrayList profiles = new ArrayList<>(); try { - profiles = (ArrayList) ObjectSerializer.deserialize(getPrefs().getString(PROFILES_KEY, ObjectSerializer.serialize(profiles))); + profiles = (ArrayList) ObjectSerializer.deserialize( + getPrefs().getString(PROFILES_KEY, ObjectSerializer.serialize(profiles))); } catch (Exception e) { e.printStackTrace(); } @@ -69,7 +73,7 @@ public final class PrefsUtil { public static void updateProfile(Profile profile) { ArrayList profiles = getProfiles(); - for (Profile item: profiles) { + for (Profile item : profiles) { if (item.getId().equals(profile.getId())) { int index = profiles.indexOf(item); profiles.set(index, profile); @@ -82,7 +86,7 @@ public final class PrefsUtil { public static boolean saveProfile(Profile profile) { ArrayList profiles = PrefsUtil.getProfiles(); - for (Profile item: profiles) { + for (Profile item : profiles) { if (item.getName().equals(profile.getName())) { return false; } @@ -101,4 +105,13 @@ public final class PrefsUtil { return getPrefs().getBoolean(FIRST_LAUNCH_KEY, true); } + + public static void setBackgroundResourceId(String profileId, @DrawableRes int resourceId) { + getEditor().putInt(profileId, resourceId).commit(); + } + + public static int getBackgroundResourceId(String profileId) { + return getPrefs().getInt(profileId, R.drawable.bg0_resized); + } + } diff --git a/app/src/main/res/drawable/search.png b/app/src/main/res/drawable/search.png deleted file mode 100644 index 6b378fd63d654b41611ff03e378c9afd52795497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3403 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 diff --git a/app/src/main/res/drawable/track_bg.png b/app/src/main/res/drawable/track_bg.png deleted file mode 100644 index c005ec19ccee0b6fe3bd83491fa3de18c02ef531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14936 zcmeI3Pl)4G9LJw1GLEhXU2xe|2wfCqZIiT3|Ae%|Oxtk=w!7m@m!0wAq{(X=rcGj! zPCEm_;vQT2=ygtn_ts*-Uxeqg|@%G_x*ie z-sk<^YcBa@=f*o1Rxht2gf47vRd>nv8{~a)ehF(hCmg+*? zuHcTbb?V@~(;E%#^hhh}iM8^oGL(ry4|^&%>~&379+nb;uS{aUnNM(m#5*b_*8Ksw z{rV19u^h}vDJiK5VwTGnQ=%kh3*y^cS`ah5km1ElQcTN2Q5Gd`{7RHpNu)S>OWv(+ zj)x<^N{No=*)q=$27}Zfld_yPFBXeMUP$xlbdo5N?uqHC!=&k64NWFKRqSexVS9#U za=x$HwEA8tk?;qazQ*(F+0%hccg&7Z*?+Md_nhKX%A%!eg9ISel)3B^=IV{(m$<=d} z3isx1!_=*T`3XWE;q7Xf%spioI@z3syrj0YWHw)vl2SgK zNj9?@PKvly5Y(oGaV{N9ayEU=x@u{CzlO%vIM!yhOVELhX?mG4~o z@-YS-Y{s_x%vKGp0@ZR8*J^nK)xqm+vLh&mP-r-tvD{hfsAe1MWqtx}(hyHkcz@Np z#_Xbnt+Q)6slWNPS9DEoSx!&&%0^FZW8OB~3LiB_V=B{s0J&myEr%RtxSUb=Ma>|~ zKl}aCCY02m9z=zoYm4jm{f*!42l{+kATM6@KgX%CJDz%Qb}H;|7FwTj0EKEFz64L}oFj$ZX zI>w1%DS+Fjpi;tCa&t!R3;F4d;cO92x8)NKq8UA5V`#?)fi$Qw!$m~|1q>IYL5&$M zDk3OgxF8K`%y3Z=K>@=BX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr z6%iCLT#yDeX1J(`pn&0mG^jDdMMVS!3>Tz9jTtT~A}C8Ps4>Gu zMFa&57o z+uE%obox3%ckUwe&xm~giBMla=^|zjXhO_-*6wQRm+Mmzoc5{rb(L&DU~|zkB!NU;HOT(P;EEy8PkF UHRHW2Kl{J8Yd5M7Hx57g4@E5^=l}o! diff --git a/app/src/main/res/values/style-test.xml b/app/src/main/res/values/style-test.xml index f6db3f9..29066da 100644 --- a/app/src/main/res/values/style-test.xml +++ b/app/src/main/res/values/style-test.xml @@ -1,23 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file