From ea56075d0ce3a5790a62a4d867f1fabe915dbaae Mon Sep 17 00:00:00 2001 From: Ye He Date: Fri, 22 Jan 2016 14:43:43 +1100 Subject: [PATCH 1/7] Expose fields for subclass. --- .../java/com/unnamed/b/atv/view/AndroidTreeView.java | 10 +++++++++- .../com/unnamed/b/atv/view/TreeNodeWrapperView.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index 7234208..d56241a 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -26,7 +26,7 @@ public class AndroidTreeView { private static final String NODES_PATH_SEPARATOR = ";"; - private TreeNode mRoot; + protected TreeNode mRoot; private Context mContext; private boolean applyForRoot; private int containerStyle = 0; @@ -37,6 +37,14 @@ public class AndroidTreeView { private boolean mUseDefaultAnimation = false; private boolean use2dScroll = false; + public AndroidTreeView(Context context) { + mContext = context; + } + + public void setRoot(TreeNode mRoot) { + this.mRoot = mRoot; + } + public AndroidTreeView(Context context, TreeNode root) { mRoot = root; mContext = context; diff --git a/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java b/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java index 21f7362..b660563 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java @@ -46,4 +46,7 @@ public void insertNodeView(View nodeView) { nodeContainer.addView(nodeView); } + public ViewGroup getNodeContainer() { + return nodeContainer; + } } From e0fd5bc741ec8b8a57c566182269b3b908242f58 Mon Sep 17 00:00:00 2001 From: SzigetiPeter Date: Tue, 2 Feb 2016 11:44:39 +0200 Subject: [PATCH 2/7] Added disable for auto tree node toggle, and test use case --- .../b/atv/sample/activity/MainActivity.java | 2 + .../TwoDScrollingArrowExpandFragment.java | 82 +++++++++++++++++++ .../ArrowExpandSelectableHeaderHolder.java | 74 +++++++++++++++++ .../unnamed/b/atv/view/AndroidTreeView.java | 18 +++- 4 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/unnamed/b/atv/sample/fragment/TwoDScrollingArrowExpandFragment.java create mode 100644 app/src/main/java/com/unnamed/b/atv/sample/holder/ArrowExpandSelectableHeaderHolder.java diff --git a/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java b/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java index 4029a26..f74bea2 100644 --- a/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java +++ b/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java @@ -13,6 +13,7 @@ import com.unnamed.b.atv.sample.fragment.CustomViewHolderFragment; import com.unnamed.b.atv.sample.fragment.FolderStructureFragment; import com.unnamed.b.atv.sample.fragment.SelectableTreeFragment; +import com.unnamed.b.atv.sample.fragment.TwoDScrollingArrowExpandFragment; import com.unnamed.b.atv.sample.fragment.TwoDScrollingFragment; import java.util.ArrayList; @@ -34,6 +35,7 @@ protected void onCreate(Bundle savedInstanceState) { listItems.put("Custom Holder Example", CustomViewHolderFragment.class); listItems.put("Selectable Nodes", SelectableTreeFragment.class); listItems.put("2d scrolling", TwoDScrollingFragment.class); + listItems.put("Expand with arrow only", TwoDScrollingArrowExpandFragment.class); final List list = new ArrayList(listItems.keySet()); diff --git a/app/src/main/java/com/unnamed/b/atv/sample/fragment/TwoDScrollingArrowExpandFragment.java b/app/src/main/java/com/unnamed/b/atv/sample/fragment/TwoDScrollingArrowExpandFragment.java new file mode 100644 index 0000000..bc64194 --- /dev/null +++ b/app/src/main/java/com/unnamed/b/atv/sample/fragment/TwoDScrollingArrowExpandFragment.java @@ -0,0 +1,82 @@ +package com.unnamed.b.atv.sample.fragment; + +import android.app.Fragment; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.sample.R; +import com.unnamed.b.atv.sample.holder.ArrowExpandSelectableHeaderHolder; +import com.unnamed.b.atv.sample.holder.IconTreeItemHolder; +import com.unnamed.b.atv.view.AndroidTreeView; + +/** + * Created by Bogdan Melnychuk on 2/12/15 modified by Szigeti Peter 2/2/16. + */ +public class TwoDScrollingArrowExpandFragment extends Fragment implements TreeNode.TreeNodeClickListener{ + private static final String NAME = "Very long name for folder"; + private AndroidTreeView tView; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_selectable_nodes, null, false); + rootView.findViewById(R.id.status).setVisibility(View.GONE); + ViewGroup containerView = (ViewGroup) rootView.findViewById(R.id.container); + + TreeNode root = TreeNode.root(); + + TreeNode s1 = new TreeNode(new IconTreeItemHolder.IconTreeItem(R.string.ic_folder, "Folder with very long name ")).setViewHolder( + new ArrowExpandSelectableHeaderHolder(getActivity())); + TreeNode s2 = new TreeNode(new IconTreeItemHolder.IconTreeItem(R.string.ic_folder, "Another folder with very long name")).setViewHolder( + new ArrowExpandSelectableHeaderHolder(getActivity())); + + fillFolder(s1); + fillFolder(s2); + + root.addChildren(s1, s2); + + tView = new AndroidTreeView(getActivity(), root); + tView.setDefaultAnimation(true); + tView.setUse2dScroll(true); + tView.setDefaultContainerStyle(R.style.TreeNodeStyleCustom); + tView.setDefaultNodeClickListener(TwoDScrollingArrowExpandFragment.this); + tView.setDefaultViewHolder(ArrowExpandSelectableHeaderHolder.class); + containerView.addView(tView.getView()); + tView.setUseAutoToggle(false); + + tView.expandAll(); + + if (savedInstanceState != null) { + String state = savedInstanceState.getString("tState"); + if (!TextUtils.isEmpty(state)) { + tView.restoreState(state); + } + } + return rootView; + } + + private void fillFolder(TreeNode folder) { + TreeNode currentNode = folder; + for (int i = 0; i < 4; i++) { + TreeNode file = new TreeNode(new IconTreeItemHolder.IconTreeItem(R.string.ic_folder, NAME + " " + i)); + currentNode.addChild(file); + currentNode = file; + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString("tState", tView.getSaveState()); + } + + @Override + public void onClick(TreeNode node, Object value) { + Toast toast = Toast.makeText(getActivity(), ((IconTreeItemHolder.IconTreeItem)value).text, Toast.LENGTH_SHORT); + toast.show(); + } +} diff --git a/app/src/main/java/com/unnamed/b/atv/sample/holder/ArrowExpandSelectableHeaderHolder.java b/app/src/main/java/com/unnamed/b/atv/sample/holder/ArrowExpandSelectableHeaderHolder.java new file mode 100644 index 0000000..c58d084 --- /dev/null +++ b/app/src/main/java/com/unnamed/b/atv/sample/holder/ArrowExpandSelectableHeaderHolder.java @@ -0,0 +1,74 @@ +package com.unnamed.b.atv.sample.holder; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.TextView; + +import com.github.johnkil.print.PrintView; +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.sample.R; + +/** + * Created by Bogdan Melnychuk on 2/15/15, modified by Szigeti Peter 2/2/16. + */ +public class ArrowExpandSelectableHeaderHolder extends TreeNode.BaseNodeViewHolder { + private TextView tvValue; + private PrintView arrowView; + private CheckBox nodeSelector; + + public ArrowExpandSelectableHeaderHolder(Context context) { + super(context); + } + + @Override + public View createNodeView(final TreeNode node, IconTreeItemHolder.IconTreeItem value) { + final LayoutInflater inflater = LayoutInflater.from(context); + final View view = inflater.inflate(R.layout.layout_selectable_header, null, false); + + tvValue = (TextView) view.findViewById(R.id.node_value); + tvValue.setText(value.text); + + final PrintView iconView = (PrintView) view.findViewById(R.id.icon); + iconView.setIconText(context.getResources().getString(value.icon)); + + arrowView = (PrintView) view.findViewById(R.id.arrow_icon); + arrowView.setPadding(20,10,10,10); + if (node.isLeaf()) { + arrowView.setVisibility(View.GONE); + } + arrowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + tView.toggleNode(node); + } + }); + + nodeSelector = (CheckBox) view.findViewById(R.id.node_selector); + nodeSelector.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + node.setSelected(isChecked); + for (TreeNode n : node.getChildren()) { + getTreeView().selectNode(n, isChecked); + } + } + }); + nodeSelector.setChecked(node.isSelected()); + + return view; + } + + @Override + public void toggle(boolean active) { + arrowView.setIconText(context.getResources().getString(active ? R.string.ic_keyboard_arrow_down : R.string.ic_keyboard_arrow_right)); + } + + @Override + public void toggleSelectionMode(boolean editModeEnabled) { + nodeSelector.setVisibility(editModeEnabled ? View.VISIBLE : View.GONE); + nodeSelector.setChecked(mNode.isSelected()); + } +} diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index d56241a..222a43a 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -36,6 +36,7 @@ public class AndroidTreeView { private boolean mSelectionModeEnabled; private boolean mUseDefaultAnimation = false; private boolean use2dScroll = false; + private boolean enableAutoToggle = true; public AndroidTreeView(Context context) { mContext = context; @@ -71,6 +72,14 @@ public boolean is2dScrollEnabled() { return use2dScroll; } + public void setUseAutoToggle(boolean enableAutoToggle) { + this.enableAutoToggle = enableAutoToggle; + } + + public boolean isAutoToggleEnabled() { + return enableAutoToggle; + } + public void setDefaultViewHolder(Class viewHolder) { defaultViewHolderClass = viewHolder; } @@ -194,7 +203,7 @@ private void getSaveState(TreeNode root, StringBuilder sBuilder) { } } - private void toggleNode(TreeNode node) { + public void toggleNode(TreeNode node) { if (node.isExpanded()) { collapseNode(node, false); } else { @@ -260,7 +269,9 @@ public void onClick(View v) { } else if (nodeClickListener != null) { nodeClickListener.onClick(n, n.getValue()); } - toggleNode(n); + if (enableAutoToggle) { + toggleNode(n); + } } }); @@ -272,6 +283,9 @@ public boolean onLongClick(View view) { } else if (nodeLongClickListener != null) { return nodeLongClickListener.onLongClick(n, n.getValue()); } + if (enableAutoToggle) { + toggleNode(n); + } return false; } }); From 44fff00b2a15e33d9bb1f61f6ad947ea1f0609c9 Mon Sep 17 00:00:00 2001 From: Bogdan Melnychuk Date: Fri, 12 Feb 2016 10:51:07 +0200 Subject: [PATCH 3/7] Update README.md Google play image updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eac8970..e95a170 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Tree view implementation for android ### Demo -[![AndroidTreeView Demo on Google Play Store](http://developer.android.com/images/brand/en_generic_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=com.unnamed.b.atv.demo) +[![AndroidTreeView Demo on Google Play Store](http://style.anu.edu.au/_anu/images/icons/icon-google-play-small.png)](https://play.google.com/store/apps/details?id=com.unnamed.b.atv.demo) ### Features From 5a015a1281ad995184ab310bf1dfdc260b974e12 Mon Sep 17 00:00:00 2001 From: Bogdan Melnychuk Date: Fri, 12 Feb 2016 11:07:02 +0200 Subject: [PATCH 4/7] Update README.md --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index e95a170..89074e2 100644 --- a/README.md +++ b/README.md @@ -105,12 +105,6 @@ AndroidTreeView.setDefaultNodeClickListener For more details use sample application as example -### Upcoming changes - -**1)** Horizontal scroll issue - -**2)** Add wiki? - Let me know if i missed something, appreciate your support, thanks! ### Projects using this library From 654856509eb4e12ad241fd43cd4f3edd600c2f07 Mon Sep 17 00:00:00 2001 From: Bogdan Melnychuk Date: Mon, 25 Apr 2016 17:12:50 +0200 Subject: [PATCH 5/7] version updated --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 87aebb0..3cff844 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=1.2.7 -VERSION_CODE=9 +VERSION_NAME=1.2.8 +VERSION_CODE=10 ANDROID_BUILD_MIN_SDK_VERSION=11 From d051ce75f5c9bd5206481808f6133b51f581c8f1 Mon Sep 17 00:00:00 2001 From: Bogdan Melnychuk Date: Tue, 3 May 2016 09:31:03 +0200 Subject: [PATCH 6/7] Update gradle.properties --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3cff844..ddb8205 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=1.2.8 -VERSION_CODE=10 +VERSION_NAME=1.2.9 +VERSION_CODE=11 ANDROID_BUILD_MIN_SDK_VERSION=11 @@ -36,4 +36,4 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=unnamed_b -POM_DEVELOPER_NAME=Bogdan Melnychuk \ No newline at end of file +POM_DEVELOPER_NAME=Bogdan Melnychuk From 5850dc8252b94e3ce9c5f2a375dea57683b326a1 Mon Sep 17 00:00:00 2001 From: Bogdan Melnychuk Date: Wed, 9 Feb 2022 08:25:31 +0100 Subject: [PATCH 7/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 89074e2..d18ece8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +## This project is deprecated. You can still use it as it. Let me know if someone is interested in supporting it. + AndroidTreeView ====================