From 2bf99545c25130d02219d1dc381722579438628e Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Mon, 18 Feb 2013 12:36:10 +0100 Subject: Added dragsort-listview-library --- .gitmodules | 3 + pom.xml | 460 +++++++++++++++++++++++++++-------------------------- project.properties | 1 + submodules/dslv | 1 + 4 files changed, 238 insertions(+), 227 deletions(-) create mode 160000 submodules/dslv diff --git a/.gitmodules b/.gitmodules index 54b674f60..cd43a243e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "submodules/ViewPagerIndicator"] path = submodules/ViewPagerIndicator url = git://github.com/JakeWharton/Android-ViewPagerIndicator.git +[submodule "submodules/dslv"] + path = submodules/dslv + url = git://github.com/bauerca/drag-sort-listview.git diff --git a/pom.xml b/pom.xml index b0d24fe13..52c7cf6d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,235 +1,241 @@ - - 4.0.0 - de.danoeh - antennapod - apk - 0.9.6.4 - AntennaPod + + 4.0.0 + de.danoeh + antennapod + apk + 0.9.6.4 + AntennaPod - - - org.apache.commons - commons-lang3 - 3.1 - - - org.shredzone.flattr4j - flattr4j-core - 2.4 - compile - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - org.json - json - - - - - com.google.android - android - provided - 4.1.1.4 - - - com.actionbarsherlock - library - 4.1.0 - apklib - - - com.viewpagerindicator - library - 2.3.1 - apklib - - - com.google.android - annotations - 4.1.1.4 - - - commons-io - commons-io - 2.4 - + + + org.apache.commons + commons-lang3 + 3.1 + + + org.shredzone.flattr4j + flattr4j-core + 2.4 + compile + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + org.json + json + + + + + com.google.android + android + provided + 4.1.1.4 + + + com.actionbarsherlock + library + 4.1.0 + apklib + + + com.viewpagerindicator + library + 2.3.1 + apklib + + + com.google.android + annotations + 4.1.1.4 + + + commons-io + commons-io + 2.4 + + + com.mobeta.android.dslv + drag-sort-listview + 0.6.1-SNAPSHOT + apklib + + - + + src + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.5.0 + + + ${env.ANDROID_HOME} + 17 + + + true + + + true + + + alignApk + package + + zipalign + + + + + + - - src - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.5.0 - - - ${env.ANDROID_HOME} - 17 - - - true - - - true - - - alignApk - package - - zipalign - - - - - - - - - - development - - - - environment - !production - - - - In Development - - - - production - - In Production - - - - release - - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-jarsigner-plugin - - - signing - - sign - verify - - package - true - - true - - - ${project.build.directory}/${project.artifactId}-${project.version}.apk - - ${sign.keystore} - ${sign.alias} - ${sign.storepass} - ${sign.keypass} - true - - - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - true - - - false - - - false - true - ${project.build.directory}/${project.artifactId}-${project.version}.apk - ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk - - - - false - true - - - true - - - - - alignApk - package - - zipalign - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - - ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk - apk - signed-aligned - - - ${project.build.directory}/proguard/mapping.txt - map - release - - - - - - attach-signed-aligned - package - - attach-artifact - - - - - - - - + + + development + + + + environment + !production + + + + In Development + + + + production + + In Production + + + + release + + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-jarsigner-plugin + + + signing + + sign + verify + + package + true + + true + + + ${project.build.directory}/${project.artifactId}-${project.version}.apk + + ${sign.keystore} + ${sign.alias} + ${sign.storepass} + ${sign.keypass} + true + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + + false + + + false + true + ${project.build.directory}/${project.artifactId}-${project.version}.apk + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + + + + false + true + + + true + + + + + alignApk + package + + zipalign + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + apk + signed-aligned + + + ${project.build.directory}/proguard/mapping.txt + map + release + + + + + + attach-signed-aligned + package + + attach-artifact + + + + + + + + diff --git a/project.properties b/project.properties index d1eaa98a8..2706f89b9 100644 --- a/project.properties +++ b/project.properties @@ -12,3 +12,4 @@ proguard.config=proguard.cfg target=android-17 android.library.reference.1=submodules/ActionBarSherlock/library android.library.reference.2=submodules/ViewPagerIndicator/library +android.library.reference.3=submodules/dslv/library diff --git a/submodules/dslv b/submodules/dslv new file mode 160000 index 000000000..c5f07d473 --- /dev/null +++ b/submodules/dslv @@ -0,0 +1 @@ +Subproject commit c5f07d473a48325d0f12994025fce525c3027e20 -- cgit v1.2.3 From d2649ce4b8eb03393382f30f458bcae0dd09e507 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Mon, 18 Feb 2013 12:49:16 +0100 Subject: Created OrganizeQueueActivity --- AndroidManifest.xml | 1 + res/values/ids.xml | 11 ++--- res/values/strings.xml | 3 +- .../antennapod/activity/OrganizeQueueActivity.java | 51 ++++++++++++++++++++++ .../antennapod/fragment/EpisodesFragment.java | 9 +++- 5 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index abf8675d8..d20a1f91d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -228,6 +228,7 @@ + \ No newline at end of file diff --git a/res/values/ids.xml b/res/values/ids.xml index 2b107e7dd..c29674052 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -2,12 +2,13 @@ - - - - + + + + - + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 1d7fffc6c..62d60c5ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -112,9 +112,8 @@ Show player - Move up - Move down Clear queue + Organize queue Flattr sign-in diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java new file mode 100644 index 000000000..b77921241 --- /dev/null +++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java @@ -0,0 +1,51 @@ +package de.danoeh.antennapod.activity; + +import android.content.res.TypedArray; +import android.os.Bundle; + +import com.actionbarsherlock.app.SherlockListActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; + +import de.danoeh.antennapod.PodcastApp; +import de.danoeh.antennapod.R; + +public class OrganizeQueueActivity extends SherlockListActivity { + private static final String TAG = "OrganizeQueueActivity"; + + private static final int MENU_ID_ACCEPT = 2; + + @Override + protected void onCreate(Bundle savedInstanceState) { + setTheme(PodcastApp.getThemeResourceId()); + super.onCreate(savedInstanceState); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + TypedArray drawables = obtainStyledAttributes(new int[] { R.attr.navigation_accept }); + menu.add(Menu.NONE, MENU_ID_ACCEPT, Menu.NONE, R.string.confirm_label) + .setIcon(drawables.getDrawable(0)) + .setShowAsAction( + MenuItem.SHOW_AS_ACTION_IF_ROOM + | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + return true; + case MENU_ID_ACCEPT: + finish(); + return true; + default: + return false; + } + } + +} diff --git a/src/de/danoeh/antennapod/fragment/EpisodesFragment.java b/src/de/danoeh/antennapod/fragment/EpisodesFragment.java index 1ea0011ef..967cfd2bc 100644 --- a/src/de/danoeh/antennapod/fragment/EpisodesFragment.java +++ b/src/de/danoeh/antennapod/fragment/EpisodesFragment.java @@ -21,6 +21,7 @@ import com.actionbarsherlock.view.Menu; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.ItemviewActivity; +import de.danoeh.antennapod.activity.OrganizeQueueActivity; import de.danoeh.antennapod.adapter.ActionButtonCallback; import de.danoeh.antennapod.adapter.ExternalEpisodesListAdapter; import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator; @@ -60,7 +61,7 @@ public class EpisodesFragment extends SherlockFragment { filter.addAction(FeedManager.ACTION_QUEUE_UPDATE); filter.addAction(FeedManager.ACTION_UNREAD_ITEMS_UPDATE); filter.addAction(FeedManager.ACTION_FEED_LIST_UPDATE); - + getActivity().registerReceiver(contentUpdate, filter); } @@ -158,6 +159,8 @@ public class EpisodesFragment extends SherlockFragment { }, selectedItem, false); } else if (selectedGroupId == ExternalEpisodesListAdapter.GROUP_POS_QUEUE) { + menu.add(Menu.NONE, R.id.organize_queue_item, Menu.NONE, + R.string.organize_queue_label); menu.add(Menu.NONE, R.id.clear_queue_item, Menu.NONE, getActivity() .getString(R.string.clear_queue_label)); menu.add(Menu.NONE, R.id.download_all_item, Menu.NONE, @@ -187,6 +190,10 @@ public class EpisodesFragment extends SherlockFragment { } else if (selectedGroupId == ExternalEpisodesListAdapter.GROUP_POS_QUEUE) { handled = true; switch (item.getItemId()) { + case R.id.organize_queue_item: + startActivity(new Intent(getActivity(), + OrganizeQueueActivity.class)); + break; case R.id.clear_queue_item: manager.clearQueue(getActivity()); break; -- cgit v1.2.3 From 89d4bdc9c6c000632d42fe548f1dedaa4c6dbd05 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Mon, 18 Feb 2013 13:37:53 +0100 Subject: Created list layout for OrganizeActivity --- res/drawable/dragview_background.xml | 54 +++++++++++++++ res/drawable/dragview_background_dark.xml | 54 +++++++++++++++ res/layout/organize_queue_listitem.xml | 56 ++++++++++++++++ res/values/attrs.xml | 1 + res/values/dimens.xml | 1 + res/values/styles.xml | 4 +- .../antennapod/activity/OrganizeQueueActivity.java | 77 ++++++++++++++++++++-- 7 files changed, 241 insertions(+), 6 deletions(-) create mode 100644 res/drawable/dragview_background.xml create mode 100644 res/drawable/dragview_background_dark.xml create mode 100644 res/layout/organize_queue_listitem.xml diff --git a/res/drawable/dragview_background.xml b/res/drawable/dragview_background.xml new file mode 100644 index 000000000..32cfa88b6 --- /dev/null +++ b/res/drawable/dragview_background.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/dragview_background_dark.xml b/res/drawable/dragview_background_dark.xml new file mode 100644 index 000000000..577077d9a --- /dev/null +++ b/res/drawable/dragview_background_dark.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/organize_queue_listitem.xml b/res/layout/organize_queue_listitem.xml new file mode 100644 index 000000000..e74fffbe0 --- /dev/null +++ b/res/layout/organize_queue_listitem.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 940e2c556..4f0ac0067 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -30,6 +30,7 @@ + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 7cb9ebe3f..d5bbe1e6f 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -3,6 +3,7 @@ 8dp 70dp + 54dp 55dp 20dp 12sp diff --git a/res/values/styles.xml b/res/values/styles.xml index e79979e48..23299020e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -34,11 +34,10 @@ @color/overlay_light @drawable/spinner_button @drawable/overlay_drawable + @drawable/dragview_background