Skip to content

Commit a1305ce

Browse files
kemallettekemallette
committed
Merge pull request #5 from kemallette/attrs
Attrs - Choice modes are all working and attrs implemented. Have not tested setting xml attrs and checkChildrenWithGroup yet, but any bugs will be minor.
2 parents 493dbfe + 7015052 commit a1305ce

11 files changed

Lines changed: 992 additions & 377 deletions

File tree

‎res/layout/main_activity.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,64 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical" >
66

7+
<LinearLayout
8+
android:layout_width="match_parent"
9+
android:layout_height="wrap_content"
10+
android:background="#CCC"
11+
android:gravity="center_horizontal"
12+
android:orientation="horizontal" >
13+
14+
<TextView
15+
android:layout_width="105dp"
16+
android:layout_height="wrap_content"
17+
android:gravity="center_horizontal"
18+
android:text="@string/group" />
19+
20+
<TextView
21+
android:layout_width="105dp"
22+
android:layout_height="wrap_content"
23+
android:gravity="center_horizontal"
24+
android:paddingLeft="5dp"
25+
android:paddingRight="5dp"
26+
android:text="@string/child" />
27+
28+
<TextView
29+
android:layout_width="105dp"
30+
android:layout_height="wrap_content"
31+
android:gravity="center_horizontal"
32+
android:text="@string/only_one_item" />
33+
</LinearLayout>
34+
35+
<LinearLayout
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:background="#CCC"
39+
android:gravity="center_horizontal"
40+
android:orientation="horizontal" >
41+
42+
<Spinner
43+
android:id="@+id/groupChoiceModes"
44+
android:layout_width="105dp"
45+
android:layout_height="wrap_content"
46+
android:entries="@array/group_choice_modes"
47+
android:prompt="@string/group_choice_modes_label" />
48+
49+
<Spinner
50+
android:id="@+id/childChoiceModes"
51+
android:layout_width="105dp"
52+
android:layout_height="wrap_content"
53+
android:entries="@array/child_choice_modes"
54+
android:paddingLeft="5dp"
55+
android:paddingRight="5dp"
56+
android:prompt="@string/child_choice_modes" />
57+
58+
<ToggleButton
59+
android:id="@+id/onlyOneItem"
60+
android:layout_width="105dp"
61+
android:layout_height="wrap_content"
62+
android:text="@string/only_one_item" />
63+
</LinearLayout>
64+
765
<com.kemallette.MultiChoiceExpandableList.MultiChoiceExpandableListView
866
android:id="@+id/list"
967
android:layout_width="match_parent"

‎res/values/attrs.xml‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,18 @@
22
<resources>
33

44
<declare-styleable name="MultiChoiceExpandableListView">
5-
<attr name="testType">
6-
<enum name="regexp" value="0" />
7-
<enum name="numeric" value="1" />
8-
<enum name="alpha" value="2" />
9-
<enum name="alphaNumeric" value="3" />
10-
<enum name="email" value="4" />
11-
<enum name="creditCard" value="5" />
12-
<enum name="phone" value="6" />
13-
<enum name="domainName" value="7" />
14-
<enum name="ipAddress" value="8" />
15-
<enum name="webUrl" value="9" />
16-
<enum name="nocheck" value="10" />
17-
<enum name="custom" value="11" />
5+
<attr name="groupChoiceMode">
6+
<enum name="multi" value="2" />
7+
<enum name="one" value="1" />
8+
<enum name="none" value="0" />
189
</attr>
19-
<attr name="testErrorString" format="string" />
20-
<attr name="emptyErrorString" format="string" />
21-
<attr name="customRegexp" format="string" />
22-
<attr name="emptyAllowed" format="boolean" />
23-
<attr name="classType" format="string" />
24-
<attr name="fontName" format="string" />
25-
<attr name="showClearButton" format="boolean" />
26-
<attr name="showFormattingOptions" format="boolean" />
10+
<attr name="childChoiceMode">
11+
<enum name="multi" value="2" />
12+
<enum name="onePerGroup" value="14" />
13+
<enum name="one" value="1" />
14+
<enum name="none" value="0" />
15+
</attr>
16+
<attr name="oneItemChoice" format="boolean" />
2717
<attr name="checkChildrenWithGroup" format="boolean" />
2818
</declare-styleable>
2919

‎res/values/ids.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<resources>
33

44
<item name="view_holder_key" type="id"/>
5+
<item name="checkable_tag_key" type="id"/>
56

67
</resources>

‎res/values/strings.xml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
<resources>
22

33
<string name="app_name">MultiChoiceExpandableList</string>
4+
<string name="only_one_item">Only One Item</string>
5+
<string name="group_choice_modes_label">Group Choice Modes</string>
6+
<string name="child_choice_modes">Child Choice Modes</string>
47

5-
</resources>
8+
<string-array name="group_choice_modes">
9+
<item>Multi</item>
10+
<item>One</item>
11+
<item>None</item>
12+
</string-array>
13+
<string-array name="child_choice_modes">
14+
<item>Multi</item>
15+
<item>One Per Group</item>
16+
<item>One</item>
17+
<item>None</item>
18+
</string-array>
19+
20+
<string name="group">Group Mode</string>
21+
<string name="child">Child Mode</string>
22+
23+
</resources>

0 commit comments

Comments
 (0)