diff --git a/icons.xcf b/icons.xcf deleted file mode 100644 index f5d05e0..0000000 Binary files a/icons.xcf and /dev/null differ diff --git a/icons/Business-Card-01-256.png b/icons/Business-Card-01-256.png new file mode 100644 index 0000000..684dd2d Binary files /dev/null and b/icons/Business-Card-01-256.png differ diff --git a/icons/Calendar-Date-256.png b/icons/Calendar-Date-256.png new file mode 100644 index 0000000..488c0d2 Binary files /dev/null and b/icons/Calendar-Date-256.png differ diff --git a/icons/Cloud-256.png b/icons/Cloud-256.png new file mode 100644 index 0000000..df52297 Binary files /dev/null and b/icons/Cloud-256.png differ diff --git a/icons/Finance-256.png b/icons/Finance-256.png new file mode 100644 index 0000000..59350a1 Binary files /dev/null and b/icons/Finance-256.png differ diff --git a/icons/Key-Access-256.png b/icons/Key-Access-256.png new file mode 100644 index 0000000..4b287b9 Binary files /dev/null and b/icons/Key-Access-256.png differ diff --git a/icons/Message-Mail-256.png b/icons/Message-Mail-256.png new file mode 100644 index 0000000..d15fab4 Binary files /dev/null and b/icons/Message-Mail-256.png differ diff --git a/icons/Tag-256.png b/icons/Tag-256.png new file mode 100644 index 0000000..d88e635 Binary files /dev/null and b/icons/Tag-256.png differ diff --git a/icons/User-Profile-256.png b/icons/User-Profile-256.png new file mode 100644 index 0000000..4942ca5 Binary files /dev/null and b/icons/User-Profile-256.png differ diff --git a/icons/Voice-Search-256.png b/icons/Voice-Search-256.png new file mode 100644 index 0000000..ca40e65 Binary files /dev/null and b/icons/Voice-Search-256.png differ diff --git a/sample/src/main/java/com/szugyi/circlemenusample/MainActivity.java b/sample/src/main/java/com/szugyi/circlemenusample/MainActivity.java index ba6c6fe..8f56fc7 100644 --- a/sample/src/main/java/com/szugyi/circlemenusample/MainActivity.java +++ b/sample/src/main/java/com/szugyi/circlemenusample/MainActivity.java @@ -1,52 +1,39 @@ package com.szugyi.circlemenusample; -import android.app.ListActivity; import android.content.Intent; +import android.support.v7.app.AppCompatActivity; import android.view.View; +import android.widget.AdapterView; import android.widget.ListView; -public class MainActivity extends ListActivity { +public class MainActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { protected void onCreate(android.os.Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + ((ListView) findViewById(android.R.id.list)).setOnItemClickListener(this); } @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - super.onListItemClick(l, v, position, id); - + public void onItemClick(AdapterView parent, View view, int position, long id) { Intent intent = new Intent(this, SampleActivity.class); switch (position) { case 0: intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample); break; case 1: - intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_fast); + intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_no_rotation); break; case 2: - intent.putExtra(SampleActivity.ARG_LAYOUT, - R.layout.sample_no_rotation); + intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_attributes); break; case 3: - intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_west); + intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_any_items); break; case 4: - intent.putExtra(SampleActivity.ARG_LAYOUT, - R.layout.sample_with_background); - break; - case 5: - intent.putExtra(SampleActivity.ARG_LAYOUT, - R.layout.sample_7_items); - break; - case 6: - intent.putExtra(SampleActivity.ARG_LAYOUT, - R.layout.sample_8_items); - break; - case 7: - intent.putExtra(SampleActivity.ARG_LAYOUT, - R.layout.sample_any_items); + intent.putExtra(SampleActivity.ARG_LAYOUT, R.layout.sample_dynamic_children); break; } diff --git a/sample/src/main/java/com/szugyi/circlemenusample/SampleActivity.java b/sample/src/main/java/com/szugyi/circlemenusample/SampleActivity.java index bbdc4ab..d30f8f7 100644 --- a/sample/src/main/java/com/szugyi/circlemenusample/SampleActivity.java +++ b/sample/src/main/java/com/szugyi/circlemenusample/SampleActivity.java @@ -16,8 +16,10 @@ * limitations under the License. */ -import android.app.Activity; import android.os.Bundle; +import android.os.Looper; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.View; import android.view.animation.Animation; import android.view.animation.RotateAnimation; @@ -31,13 +33,13 @@ import com.szugyi.circlemenu.view.CircleLayout.OnItemSelectedListener; import com.szugyi.circlemenu.view.CircleLayout.OnRotationFinishedListener; -public class SampleActivity extends Activity implements OnItemSelectedListener, +public class SampleActivity extends AppCompatActivity implements OnItemSelectedListener, OnItemClickListener, OnRotationFinishedListener, OnCenterClickListener { public static final String ARG_LAYOUT = "layout"; + private CircleLayout circleLayout; private TextView selectedTextView; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -48,16 +50,16 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(layoutId); // Set listeners - CircleLayout circleMenu = (CircleLayout) findViewById(R.id.main_circle_layout); - circleMenu.setOnItemSelectedListener(this); - circleMenu.setOnItemClickListener(this); - circleMenu.setOnRotationFinishedListener(this); - circleMenu.setOnCenterClickListener(this); + circleLayout = (CircleLayout) findViewById(R.id.circle_layout); + circleLayout.setOnItemSelectedListener(this); + circleLayout.setOnItemClickListener(this); + circleLayout.setOnRotationFinishedListener(this); + circleLayout.setOnCenterClickListener(this); - selectedTextView = (TextView) findViewById(R.id.main_selected_textView); + selectedTextView = (TextView) findViewById(R.id.selected_textView); String name = null; - View view = circleMenu.getSelectedItem(); + View view = circleLayout.getSelectedItem(); if (view instanceof CircleImageView) { name = ((CircleImageView) view).getName(); } @@ -66,12 +68,22 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onItemSelected(View view) { - String name = null; + boolean isMain = Looper.myLooper() == Looper.getMainLooper(); + Log.v("SampleActivity", "is it the main thread? " + String.valueOf(isMain)); + + final String name; if (view instanceof CircleImageView) { name = ((CircleImageView) view).getName(); + } else { + name = null; } + //selectedTextView.post(new Runnable() { + // @Override + //public void run() { selectedTextView.setText(name); + // } + //}); switch (view.getId()) { case R.id.main_calendar_image: @@ -80,12 +92,12 @@ public void onItemSelected(View view) { case R.id.main_cloud_image: // Handle cloud selection break; - case R.id.main_facebook_image: - // Handle facebook selection - break; case R.id.main_key_image: // Handle key selection break; + case R.id.main_mail_image: + // Handle facebook selection + break; case R.id.main_profile_image: // Handle profile selection break; @@ -102,9 +114,8 @@ public void onItemClick(View view) { name = ((CircleImageView) view).getName(); } - Toast.makeText(getApplicationContext(), - getResources().getString(R.string.start_app) + " " + name, - Toast.LENGTH_SHORT).show(); + String text = getResources().getString(R.string.start_app, name); + Toast.makeText(getApplicationContext(), text, Toast.LENGTH_SHORT).show(); switch (view.getId()) { case R.id.main_calendar_image: @@ -113,12 +124,12 @@ public void onItemClick(View view) { case R.id.main_cloud_image: // Handle cloud click break; - case R.id.main_facebook_image: - // Handle facebook click - break; case R.id.main_key_image: // Handle key click break; + case R.id.main_mail_image: + // Handle facebook click + break; case R.id.main_profile_image: // Handle profile click break; @@ -130,20 +141,27 @@ public void onItemClick(View view) { @Override public void onRotationFinished(View view) { - String name = null; - if (view instanceof CircleImageView) { - name = ((CircleImageView) view).getName(); - } - - Animation animation = new RotateAnimation(0, 360, view.getWidth() / 2, - view.getHeight() / 2); + Animation animation = new RotateAnimation(0, 360, view.getWidth() / 2, view.getHeight() / 2); animation.setDuration(250); view.startAnimation(animation); } @Override public void onCenterClick() { - Toast.makeText(getApplicationContext(), R.string.center_click, - Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), R.string.center_click, Toast.LENGTH_SHORT).show(); + } + + public void onAddClick(View view) { + CircleImageView newMenu = new CircleImageView(this); + newMenu.setBackgroundResource(R.drawable.circle); + newMenu.setImageResource(R.drawable.ic_voice); + newMenu.setName(getString(R.string.voice_search)); + circleLayout.addView(newMenu); + } + + public void onRemoveClick(View view) { + if (circleLayout.getChildCount() > 0) { + circleLayout.removeViewAt(circleLayout.getChildCount() - 1); + } } } diff --git a/sample/src/main/res/drawable-hdpi/ic_business_card.png b/sample/src/main/res/drawable-hdpi/ic_business_card.png new file mode 100644 index 0000000..8e00623 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_business_card.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_calendar.png b/sample/src/main/res/drawable-hdpi/ic_calendar.png new file mode 100644 index 0000000..4365ce2 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_calendar.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_cloud.png b/sample/src/main/res/drawable-hdpi/ic_cloud.png new file mode 100644 index 0000000..89f72d1 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_cloud.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_finance.png b/sample/src/main/res/drawable-hdpi/ic_finance.png new file mode 100644 index 0000000..bbe18ea Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_finance.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_key.png b/sample/src/main/res/drawable-hdpi/ic_key.png new file mode 100644 index 0000000..b39a82a Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_key.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_mail.png b/sample/src/main/res/drawable-hdpi/ic_mail.png new file mode 100644 index 0000000..79dd062 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_mail.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_profile.png b/sample/src/main/res/drawable-hdpi/ic_profile.png new file mode 100644 index 0000000..0b26878 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_profile.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_tag.png b/sample/src/main/res/drawable-hdpi/ic_tag.png new file mode 100644 index 0000000..3d71319 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_tag.png differ diff --git a/sample/src/main/res/drawable-hdpi/ic_voice.png b/sample/src/main/res/drawable-hdpi/ic_voice.png new file mode 100644 index 0000000..f85b419 Binary files /dev/null and b/sample/src/main/res/drawable-hdpi/ic_voice.png differ diff --git a/sample/src/main/res/drawable-hdpi/icon_business_card.png b/sample/src/main/res/drawable-hdpi/icon_business_card.png deleted file mode 100644 index b0e6c52..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_business_card.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_calendar.png b/sample/src/main/res/drawable-hdpi/icon_calendar.png deleted file mode 100644 index de238a5..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_calendar.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_cloud.png b/sample/src/main/res/drawable-hdpi/icon_cloud.png deleted file mode 100644 index 5cb0b4c..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_cloud.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_facebook.png b/sample/src/main/res/drawable-hdpi/icon_facebook.png deleted file mode 100644 index 5a5368e..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_facebook.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_key.png b/sample/src/main/res/drawable-hdpi/icon_key.png deleted file mode 100644 index 70a90e5..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_key.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_mail.png b/sample/src/main/res/drawable-hdpi/icon_mail.png deleted file mode 100644 index 0664fdf..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_mail.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_profile.png b/sample/src/main/res/drawable-hdpi/icon_profile.png deleted file mode 100644 index c0c0d45..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_profile.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_tag.png b/sample/src/main/res/drawable-hdpi/icon_tag.png deleted file mode 100644 index 9c0d689..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_tag.png and /dev/null differ diff --git a/sample/src/main/res/drawable-hdpi/icon_voice_search.png b/sample/src/main/res/drawable-hdpi/icon_voice_search.png deleted file mode 100644 index 3ee7ef7..0000000 Binary files a/sample/src/main/res/drawable-hdpi/icon_voice_search.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/ic_business_card.png b/sample/src/main/res/drawable-mdpi/ic_business_card.png new file mode 100644 index 0000000..7b25834 Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_business_card.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_calendar.png b/sample/src/main/res/drawable-mdpi/ic_calendar.png new file mode 100644 index 0000000..9ecdb9a Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_calendar.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_cloud.png b/sample/src/main/res/drawable-mdpi/ic_cloud.png new file mode 100644 index 0000000..e76e617 Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_cloud.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_finance.png b/sample/src/main/res/drawable-mdpi/ic_finance.png new file mode 100644 index 0000000..fe47b8e Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_finance.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_key.png b/sample/src/main/res/drawable-mdpi/ic_key.png new file mode 100644 index 0000000..4f3db2a Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_key.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_mail.png b/sample/src/main/res/drawable-mdpi/ic_mail.png new file mode 100644 index 0000000..9545389 Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_mail.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_profile.png b/sample/src/main/res/drawable-mdpi/ic_profile.png new file mode 100644 index 0000000..2247784 Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_profile.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_tag.png b/sample/src/main/res/drawable-mdpi/ic_tag.png new file mode 100644 index 0000000..a07a97d Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_tag.png differ diff --git a/sample/src/main/res/drawable-mdpi/ic_voice.png b/sample/src/main/res/drawable-mdpi/ic_voice.png new file mode 100644 index 0000000..7219a42 Binary files /dev/null and b/sample/src/main/res/drawable-mdpi/ic_voice.png differ diff --git a/sample/src/main/res/drawable-mdpi/icon_business_card.png b/sample/src/main/res/drawable-mdpi/icon_business_card.png deleted file mode 100644 index 29c5706..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_business_card.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_calendar.png b/sample/src/main/res/drawable-mdpi/icon_calendar.png deleted file mode 100644 index c977024..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_calendar.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_cloud.png b/sample/src/main/res/drawable-mdpi/icon_cloud.png deleted file mode 100644 index 067a493..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_cloud.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_facebook.png b/sample/src/main/res/drawable-mdpi/icon_facebook.png deleted file mode 100644 index 512e819..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_facebook.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_key.png b/sample/src/main/res/drawable-mdpi/icon_key.png deleted file mode 100644 index 17e5a83..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_key.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_mail.png b/sample/src/main/res/drawable-mdpi/icon_mail.png deleted file mode 100644 index 886837d..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_mail.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_profile.png b/sample/src/main/res/drawable-mdpi/icon_profile.png deleted file mode 100644 index e1b4869..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_profile.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_tag.png b/sample/src/main/res/drawable-mdpi/icon_tag.png deleted file mode 100644 index 44b2852..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_tag.png and /dev/null differ diff --git a/sample/src/main/res/drawable-mdpi/icon_voice_search.png b/sample/src/main/res/drawable-mdpi/icon_voice_search.png deleted file mode 100644 index 12a923a..0000000 Binary files a/sample/src/main/res/drawable-mdpi/icon_voice_search.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_business_card.png b/sample/src/main/res/drawable-xhdpi/ic_business_card.png new file mode 100644 index 0000000..4ed559a Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_business_card.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_calendar.png b/sample/src/main/res/drawable-xhdpi/ic_calendar.png new file mode 100644 index 0000000..3b29478 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_calendar.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_cloud.png b/sample/src/main/res/drawable-xhdpi/ic_cloud.png new file mode 100644 index 0000000..b9aa2f3 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_cloud.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_finance.png b/sample/src/main/res/drawable-xhdpi/ic_finance.png new file mode 100644 index 0000000..9c6b370 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_finance.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_key.png b/sample/src/main/res/drawable-xhdpi/ic_key.png new file mode 100644 index 0000000..a03dd72 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_key.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_mail.png b/sample/src/main/res/drawable-xhdpi/ic_mail.png new file mode 100644 index 0000000..fb52652 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_mail.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_profile.png b/sample/src/main/res/drawable-xhdpi/ic_profile.png new file mode 100644 index 0000000..7447250 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_profile.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_tag.png b/sample/src/main/res/drawable-xhdpi/ic_tag.png new file mode 100644 index 0000000..f769b6d Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_tag.png differ diff --git a/sample/src/main/res/drawable-xhdpi/ic_voice.png b/sample/src/main/res/drawable-xhdpi/ic_voice.png new file mode 100644 index 0000000..11ba3c8 Binary files /dev/null and b/sample/src/main/res/drawable-xhdpi/ic_voice.png differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_business_card.png b/sample/src/main/res/drawable-xhdpi/icon_business_card.png deleted file mode 100644 index 3fc376b..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_business_card.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_calendar.png b/sample/src/main/res/drawable-xhdpi/icon_calendar.png deleted file mode 100644 index dd3b835..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_calendar.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_cloud.png b/sample/src/main/res/drawable-xhdpi/icon_cloud.png deleted file mode 100644 index 6b25038..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_cloud.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_facebook.png b/sample/src/main/res/drawable-xhdpi/icon_facebook.png deleted file mode 100644 index 350f2da..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_facebook.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_key.png b/sample/src/main/res/drawable-xhdpi/icon_key.png deleted file mode 100644 index 89a5fae..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_key.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_mail.png b/sample/src/main/res/drawable-xhdpi/icon_mail.png deleted file mode 100644 index b73db6d..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_mail.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_profile.png b/sample/src/main/res/drawable-xhdpi/icon_profile.png deleted file mode 100644 index 2bcbf6c..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_profile.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_tag.png b/sample/src/main/res/drawable-xhdpi/icon_tag.png deleted file mode 100644 index 7e70a6c..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_tag.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xhdpi/icon_voice_search.png b/sample/src/main/res/drawable-xhdpi/icon_voice_search.png deleted file mode 100644 index 0f098ea..0000000 Binary files a/sample/src/main/res/drawable-xhdpi/icon_voice_search.png and /dev/null differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_business_card.png b/sample/src/main/res/drawable-xxhdpi/ic_business_card.png new file mode 100644 index 0000000..b3bc861 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_business_card.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_calendar.png b/sample/src/main/res/drawable-xxhdpi/ic_calendar.png new file mode 100644 index 0000000..9b58a30 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_calendar.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_cloud.png b/sample/src/main/res/drawable-xxhdpi/ic_cloud.png new file mode 100644 index 0000000..0b536ff Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_cloud.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_finance.png b/sample/src/main/res/drawable-xxhdpi/ic_finance.png new file mode 100644 index 0000000..71bedfc Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_finance.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_key.png b/sample/src/main/res/drawable-xxhdpi/ic_key.png new file mode 100644 index 0000000..e7a6654 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_key.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_mail.png b/sample/src/main/res/drawable-xxhdpi/ic_mail.png new file mode 100644 index 0000000..4db1a11 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_mail.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_profile.png b/sample/src/main/res/drawable-xxhdpi/ic_profile.png new file mode 100644 index 0000000..2b020d1 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_profile.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_tag.png b/sample/src/main/res/drawable-xxhdpi/ic_tag.png new file mode 100644 index 0000000..116fab1 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_tag.png differ diff --git a/sample/src/main/res/drawable-xxhdpi/ic_voice.png b/sample/src/main/res/drawable-xxhdpi/ic_voice.png new file mode 100644 index 0000000..9ae2f26 Binary files /dev/null and b/sample/src/main/res/drawable-xxhdpi/ic_voice.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_business_card.png b/sample/src/main/res/drawable-xxxhdpi/ic_business_card.png new file mode 100644 index 0000000..0629a10 Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_business_card.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_calendar.png b/sample/src/main/res/drawable-xxxhdpi/ic_calendar.png new file mode 100644 index 0000000..a1010ec Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_calendar.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_cloud.png b/sample/src/main/res/drawable-xxxhdpi/ic_cloud.png new file mode 100644 index 0000000..9fca0ca Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_cloud.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_finance.png b/sample/src/main/res/drawable-xxxhdpi/ic_finance.png new file mode 100644 index 0000000..17bd4c5 Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_finance.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_key.png b/sample/src/main/res/drawable-xxxhdpi/ic_key.png new file mode 100644 index 0000000..079d68e Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_key.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_mail.png b/sample/src/main/res/drawable-xxxhdpi/ic_mail.png new file mode 100644 index 0000000..6c63219 Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_mail.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_profile.png b/sample/src/main/res/drawable-xxxhdpi/ic_profile.png new file mode 100644 index 0000000..87b8eba Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_profile.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_tag.png b/sample/src/main/res/drawable-xxxhdpi/ic_tag.png new file mode 100644 index 0000000..92d3667 Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_tag.png differ diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_voice.png b/sample/src/main/res/drawable-xxxhdpi/ic_voice.png new file mode 100644 index 0000000..20bd721 Binary files /dev/null and b/sample/src/main/res/drawable-xxxhdpi/ic_voice.png differ diff --git a/sample/src/main/res/drawable/circle.xml b/sample/src/main/res/drawable/circle.xml new file mode 100644 index 0000000..82d3ff3 --- /dev/null +++ b/sample/src/main/res/drawable/circle.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/sample/src/main/res/layout/menu_items.xml b/sample/src/main/res/layout/menu_items.xml index 2f445e6..591d29d 100644 --- a/sample/src/main/res/layout/menu_items.xml +++ b/sample/src/main/res/layout/menu_items.xml @@ -2,48 +2,60 @@ + android:layout_height="match_parent"> + android:background="@drawable/circle" + android:elevation="2dp" + android:src="@drawable/ic_calendar" + circle:name="@string/calendar" /> + android:background="@drawable/circle" + android:elevation="2dp" + android:src="@drawable/ic_cloud" + circle:name="@string/cloud" /> + + android:background="@drawable/circle" + android:elevation="2dp" + android:src="@drawable/ic_mail" + circle:name="@string/mail" /> + android:background="@drawable/circle" + android:src="@drawable/ic_key" + circle:name="@string/key" /> + android:background="@drawable/circle" + android:elevation="2dp" + android:src="@drawable/ic_profile" + circle:name="@string/profile" /> + android:background="@drawable/circle" + android:elevation="2dp" + android:src="@drawable/ic_tag" + circle:name="@string/tag" /> \ No newline at end of file diff --git a/sample/src/main/res/layout/sample.xml b/sample/src/main/res/layout/sample.xml index c0a489a..cd624e7 100644 --- a/sample/src/main/res/layout/sample.xml +++ b/sample/src/main/res/layout/sample.xml @@ -21,19 +21,20 @@ tools:context=".SampleActivity" > - - - - - - - - - - - - \ No newline at end of file diff --git a/sample/src/main/res/layout/sample_8_items.xml b/sample/src/main/res/layout/sample_8_items.xml deleted file mode 100644 index 787ca19..0000000 --- a/sample/src/main/res/layout/sample_8_items.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sample/src/main/res/layout/sample_any_items.xml b/sample/src/main/res/layout/sample_any_items.xml index 54e2215..4bc4754 100644 --- a/sample/src/main/res/layout/sample_any_items.xml +++ b/sample/src/main/res/layout/sample_any_items.xml @@ -21,10 +21,10 @@ tools:context=".SampleActivity" > @@ -60,9 +60,10 @@ + tools:context=".SampleActivity"> + + circle:speed="10"> + + +