diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:56:39 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:56:39 +0200 |
commit | 17feaa72adfee3e0ceb66a8fb20a262f702e0cc0 (patch) | |
tree | 75de4bf7d272f12dcdd27be8198387032d086975 /app | |
parent | cc052e91ad8a87b00b93649ec0f6a06bcae6267a (diff) | |
download | AntennaPod-17feaa72adfee3e0ceb66a8fb20a262f702e0cc0.zip |
Removed betterpickers library
Not compatible to new support library
Diffstat (limited to 'app')
-rw-r--r-- | app/build.gradle | 3 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 45 |
2 files changed, 13 insertions, 35 deletions
diff --git a/app/build.gradle b/app/build.gradle index d780ed9dd..b717ad70d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,9 +16,6 @@ dependencies { compile 'com.nineoldandroids:library:2.4.0' compile project('dslv:library') compile 'com.jayway.android.robotium:robotium-solo:5.2.1' - compile('com.doomonafireball.betterpickers:library:1.5.2') { - exclude group: 'com.android.support', module: 'support-v4' - } compile 'org.jsoup:jsoup:1.7.3' compile 'com.squareup.picasso:picasso:2.3.4' compile 'com.squareup.okhttp:okhttp:2.0.0' diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index 14cb2727f..f16b287f6 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.PixelFormat; import android.media.AudioManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; import android.util.Log; @@ -18,11 +17,9 @@ import android.widget.ImageButton; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import com.doomonafireball.betterpickers.hmspicker.HmsPickerBuilder; -import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment; + import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.dialog.TimeDialog; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.preferences.UserPreferences; @@ -34,6 +31,7 @@ import de.danoeh.antennapod.core.util.StorageUtils; import de.danoeh.antennapod.core.util.playback.MediaPlayerError; import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.PlaybackController; +import de.danoeh.antennapod.dialog.TimeDialog; /** * Provides general features which are both needed for playing audio and video @@ -320,34 +318,17 @@ public abstract class MediaplayerActivity extends ActionBarActivity break; case R.id.set_sleeptimer_item: if (controller.serviceAvailable()) { - int pickerStyle = (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Light) ? - R.style.AntennaPodBetterPickerThemeLight : R.style.AntennaPodBetterPickerThemeDark; - if (Build.VERSION.SDK_INT > 10) { // TODO remove this as soon as dialog is shown correctly on 2.3 - HmsPickerBuilder hpb = new HmsPickerBuilder() - .setStyleResId(pickerStyle) - .setFragmentManager(getSupportFragmentManager()); - - hpb.addHmsPickerDialogHandler(new HmsPickerDialogFragment.HmsPickerDialogHandler() { - @Override - public void onDialogHmsSet(int ref, int hours, int minutes, int seconds) { - if (controller != null && controller.serviceAvailable()) { - controller.setSleepTimer((hours * 3600 + minutes * 60 + seconds) * 1000); - } - } - }); - hpb.show(); - } else { - TimeDialog td = new TimeDialog(this, - R.string.set_sleeptimer_label, - R.string.set_sleeptimer_label) { - - @Override - public void onTimeEntered(long millis) { - controller.setSleepTimer(millis); - } - }; - td.show(); - } + TimeDialog td = new TimeDialog(this, + R.string.set_sleeptimer_label, + R.string.set_sleeptimer_label) { + + @Override + public void onTimeEntered(long millis) { + controller.setSleepTimer(millis); + } + }; + td.show(); + break; } |