From e02f53e6980a5115af0089c204009a7589df972b Mon Sep 17 00:00:00 2001 From: rebus007 Date: Sun, 5 Feb 2017 16:25:17 +0100 Subject: [PATCH] version 2.0.0-BETA-5 - update support libs - remove XML profile from profile chooser --- build.gradle | 4 +-- .../rebus/header/view/ProfileChooser.java | 29 ++++++++++--------- .../header/view/ProfileChooserFragment.java | 29 ++++++++++--------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 0d42bfd..a4bade7 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,8 @@ buildscript { buildTools: "25.0.2", minSdk : 11, targetSdk : 25, - version : "2.0.0-BETA-4", - supportLib: "25.1.0" + version : "2.0.0-BETA-5", + supportLib: "25.1.1" ] } diff --git a/library/src/main/java/rebus/header/view/ProfileChooser.java b/library/src/main/java/rebus/header/view/ProfileChooser.java index af8195b..0cf579b 100644 --- a/library/src/main/java/rebus/header/view/ProfileChooser.java +++ b/library/src/main/java/rebus/header/view/ProfileChooser.java @@ -75,21 +75,24 @@ public void onClick(View v) { } }); for (int i = 0; i < profileSparseArray.size(); i++) { - RowProfileView profileView = new RowProfileView(context); - profileView.setProfile(profileSparseArray.valueAt(i), i == 0); - profileView.setAccent(accent); - profileView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - RowProfileView rowProfileView = (RowProfileView) v; - if (callback != null) { - if (callback.onSelect(rowProfileView.getProfile().getId(), rowProfileView.isActive())) { - dismiss(); + Profile profile = profileSparseArray.valueAt(i); + if (profile.getId() != 1) { + RowProfileView profileView = new RowProfileView(context); + profileView.setProfile(profile, i == 0); + profileView.setAccent(accent); + profileView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + RowProfileView rowProfileView = (RowProfileView) v; + if (callback != null) { + if (callback.onSelect(rowProfileView.getProfile().getId(), rowProfileView.isActive())) { + dismiss(); + } } } - } - }); - linearLayout.addView(profileView); + }); + linearLayout.addView(profileView); + } } int padding = context.getResources().getDimensionPixelSize(R.dimen.hv_item_padding); ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); diff --git a/library/src/main/java/rebus/header/view/ProfileChooserFragment.java b/library/src/main/java/rebus/header/view/ProfileChooserFragment.java index 15dc6b6..e27a719 100644 --- a/library/src/main/java/rebus/header/view/ProfileChooserFragment.java +++ b/library/src/main/java/rebus/header/view/ProfileChooserFragment.java @@ -112,21 +112,24 @@ public void onClick(View v) { }); if (profileSparseArray != null) { for (int i = 0; i < profileSparseArray.size(); i++) { - RowProfileView profileView = new RowProfileView(getActivity()); - profileView.setProfile(profileSparseArray.valueAt(i), i == 0); - profileView.setAccent(accent); - profileView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - RowProfileView rowProfileView = (RowProfileView) v; - if (callback != null) { - if (callback.onSelect(rowProfileView.getProfile().getId(), rowProfileView.isActive())) { - dismiss(); + Profile profile = profileSparseArray.valueAt(i); + if (profile.getId() != 1) { + RowProfileView profileView = new RowProfileView(getActivity()); + profileView.setProfile(profile, i == 0); + profileView.setAccent(accent); + profileView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + RowProfileView rowProfileView = (RowProfileView) v; + if (callback != null) { + if (callback.onSelect(rowProfileView.getProfile().getId(), rowProfileView.isActive())) { + dismiss(); + } } } - } - }); - linearLayout.addView(profileView); + }); + linearLayout.addView(profileView); + } } } if (items != null) {