Skip to content

Commit d62b26e

Browse files
matpagmatpag
committed
FEAT : Cleaned and updated the sample
1 parent 3e88c49 commit d62b26e

2 files changed

Lines changed: 28 additions & 81 deletions

File tree

‎app/src/main/java/com/matpag/sample/MainActivity.java‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@
99

1010
import com.matpag.clickdrawabletextview.ClickDrawableAutoCompleteTextView;
1111
import com.matpag.clickdrawabletextview.ClickDrawableEditText;
12-
import com.matpag.clickdrawabletextview.ClickDrawableTextView;
1312
import com.matpag.clickdrawabletextview.CsDrawable;
1413
import com.matpag.clickdrawabletextview.DrawablePosition;
1514
import com.matpag.clickdrawabletextview.interfaces.OnDrawableClickListener;
1615

17-
16+
/**
17+
* Showcase activity
18+
*/
1819
public class MainActivity extends AppCompatActivity {
1920

20-
private ClickDrawableAutoCompleteTextView mCdAutoComplete;
21-
22-
private ClickDrawableTextView mCdTextView;
23-
24-
private ClickDrawableEditText mCdEditText, mCdEditText2;
25-
2621
@Override
2722
protected void onCreate(Bundle savedInstanceState) {
2823
super.onCreate(savedInstanceState);
@@ -31,47 +26,22 @@ protected void onCreate(Bundle savedInstanceState) {
3126
//####### ClickDrawableEditText example ########
3227
//In this example we got the view from the XML, so go watch R.layout.activity_main to
3328
//understand more on how the properties were configured
34-
mCdEditText = (ClickDrawableEditText)
29+
final ClickDrawableEditText mCdEditText = (ClickDrawableEditText)
3530
findViewById(R.id.click_drawable_edit_text);
3631
mCdEditText.setOnDrawableClickListener(new OnDrawableClickListener() {
3732
@Override
3833
public void onClick(View view, DrawablePosition position) {
3934
Toast.makeText(MainActivity.this, position.name(), Toast.LENGTH_SHORT).show();
40-
}
41-
});
42-
43-
mCdEditText2 = (ClickDrawableEditText)
44-
findViewById(R.id.click_drawable_edit_text2);
45-
mCdEditText2.setOnDrawableClickListener(new OnDrawableClickListener() {
46-
@Override
47-
public void onClick(View view, DrawablePosition position) {
48-
Toast.makeText(MainActivity.this, position.name(), Toast.LENGTH_SHORT).show();
49-
}
50-
});
51-
52-
//####### ClickDrawableTextView example ########
53-
//In this example we got the view from the XML, so go watch R.layout.activity_main to
54-
//understand more on how the properties were configured
55-
mCdTextView = (ClickDrawableTextView)
56-
findViewById(R.id.click_drawable_text_view);
57-
mCdTextView.setOnDrawableClickListener(new OnDrawableClickListener() {
58-
@Override
59-
public void onClick(View view, DrawablePosition position) {
60-
Toast.makeText(MainActivity.this, position.name(), Toast.LENGTH_SHORT).show();
35+
//close the keyboard if opened
36+
mCdEditText.closeKeyboard();
6137
}
6238
});
6339

6440

6541
//######## ClickDrawableAutoCompleteTextView example ############
66-
mCdAutoComplete = (ClickDrawableAutoCompleteTextView)
67-
findViewById(R.id.click_drawable_auto_text_view);
68-
setUpClickDrawableAutoCompleteTextView();
69-
}
42+
final ClickDrawableAutoCompleteTextView mCdAutoComplete =
43+
(ClickDrawableAutoCompleteTextView) findViewById(R.id.click_drawable_auto_text_view);
7044

71-
/**
72-
* An advanced sample on how to use a {@link ClickDrawableAutoCompleteTextView}
73-
*/
74-
private void setUpClickDrawableAutoCompleteTextView(){
7545
//build a CsDrawable object with a PGN drawable
7646
CsDrawable csDrawable1 = new CsDrawable.Builder(this, R.drawable.ic_close_red_24dp)
7747
.setDrawableDpSize(30, 30)
@@ -91,7 +61,9 @@ private void setUpClickDrawableAutoCompleteTextView(){
9161
mCdAutoComplete.setOnItemClickListener(new AdapterView.OnItemClickListener() {
9262
@Override
9363
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
64+
//show the cancel drawable
9465
mCdAutoComplete.showEndCsDrawable(true);
66+
//prevent user to change the value without prior clicking on the cancel drawable
9567
mCdAutoComplete.disableFocusOnText(true, true);
9668
}
9769
});
@@ -103,13 +75,15 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
10375
public void onClick(View view, DrawablePosition position) {
10476
switch (position){
10577
case END: //if we touched the END drawable
78+
//hide the close drawable
10679
mCdAutoComplete.showEndCsDrawable(false);
80+
//get focus on input (opening the keyboard)
10781
mCdAutoComplete.enableFocusOnText(true);
82+
//reset text
10883
mCdAutoComplete.setText("");
10984
break;
11085
}
11186
}
11287
});
113-
11488
}
11589
}

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
android:id="@+id/parent_panel"
99
tools:context="com.matpag.sample.MainActivity">
1010

11+
<TextView
12+
android:layout_width="match_parent"
13+
android:layout_height="wrap_content"
14+
android:text="ClickDrawableEditText"
15+
android:textSize="15sp"
16+
android:gravity="center_horizontal"
17+
android:textColor="@android:color/darker_gray"/>
18+
1119
<com.matpag.clickdrawabletextview.ClickDrawableEditText
1220
android:id="@+id/click_drawable_edit_text"
1321
android:layout_width="match_parent"
@@ -29,54 +37,19 @@
2937
android:drawablePadding="10dp"
3038
/>
3139

32-
<com.matpag.clickdrawabletextview.ClickDrawableEditText
33-
android:id="@+id/click_drawable_edit_text2"
40+
<TextView
3441
android:layout_width="match_parent"
3542
android:layout_height="wrap_content"
36-
android:layout_marginStart="10dp"
37-
android:paddingTop="20dp"
38-
app:csStartDrawable="@drawable/gray_circle"
39-
app:csStartDrawableHeight="30dp"
40-
app:csStartDrawableWidth="30dp"
41-
android:drawablePadding="10dp"
42-
/>
43-
44-
<!--
45-
This is a HorizontalScrollView to show that the library takes into account
46-
the X offset scroll parameter to get the correct position of the drawable
47-
-->
48-
<HorizontalScrollView
49-
android:layout_width="match_parent"
50-
android:layout_height="30dp">
51-
<LinearLayout
52-
android:layout_width="wrap_content"
53-
android:layout_height="wrap_content"
54-
android:orientation="horizontal">
55-
56-
<View
57-
android:background="#000000"
58-
android:layout_width="300dp"
59-
android:layout_height="100dp" />
60-
61-
<View
62-
android:background="#f00500"
63-
android:layout_width="300dp"
64-
android:layout_height="100dp" />
65-
66-
<com.matpag.clickdrawabletextview.ClickDrawableTextView
67-
android:id="@+id/click_drawable_text_view"
68-
android:layout_width="wrap_content"
69-
android:layout_height="wrap_content"
70-
app:csStartDrawable="@drawable/close_blue"
71-
app:csStartDrawableHeight="30dp"
72-
app:csStartDrawableWidth="30dp"/>
73-
74-
</LinearLayout>
75-
</HorizontalScrollView>
43+
android:layout_marginTop="50dp"
44+
android:text="ClickDrawableAutoCompleteTextView"
45+
android:textSize="15sp"
46+
android:gravity="center_horizontal"
47+
android:textColor="@android:color/darker_gray"/>
7648

7749
<com.matpag.clickdrawabletextview.ClickDrawableAutoCompleteTextView
7850
android:id="@+id/click_drawable_auto_text_view"
7951
android:layout_width="match_parent"
52+
android:padding="20dp"
8053
android:layout_height="wrap_content"
8154
android:completionThreshold="1"/>
8255

0 commit comments

Comments
 (0)