Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-01-27 09:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed betterpickers library

Browse Source 
Not compatible to new support library
This commit is contained in:
daniel oeh 2014-10-24 20:56:39 +02:00
parent cc052e91ad
commit 17feaa72ad
4 changed files with 11 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -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'

41
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -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());
TimeDialog td = new TimeDialog(this,
R.string.set_sleeptimer_label,
R.string.set_sleeptimer_label) {
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();
@Override
public void onTimeEntered(long millis) {
controller.setSleepTimer(millis);
}
};
td.show();
}
break;
}

3
core/build.gradle
View File

@ -32,9 +32,6 @@ dependencies {
compile 'commons-io:commons-io:2.4'
compile 'com.nineoldandroids:library:2.4.0'
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'

25
core/src/main/res/values/styles.xml
View File

@ -146,29 +146,4 @@
<item name="android:text">@string/new_label</item>
</style>
<style name="AntennaPodBetterPickerThemeLight">
<item name="bpDialogBackground">@drawable/dialog_full_holo_light</item>
<item name="bpTitleColor">@color/dialog_text_color_holo_light</item>
<item name="bpTextColor">@color/dialog_text_color_holo_light</item>
<item name="bpDeleteIcon">@drawable/ic_backspace_light</item>
<item name="bpCheckIcon">@drawable/ic_check_light</item>
<item name="bpKeyBackground">@drawable/borderless_button</item>
<item name="bpButtonBackground">@drawable/borderless_button</item>
<item name="bpTitleDividerColor">@color/default_keyboard_indicator_color_dark</item>
<item name="bpDividerColor">@color/default_divider_color_light</item>
<item name="bpKeyboardIndicatorColor">@color/selection_background_color_light</item>
</style>
<style name="AntennaPodBetterPickerThemeDark">
<item name="bpDialogBackground">@drawable/dialog_full_holo_dark</item>
<item name="bpTitleColor">@color/dialog_text_color_holo_dark</item>
<item name="bpTextColor">@color/dialog_text_color_holo_dark</item>
<item name="bpDeleteIcon">@drawable/ic_backspace_dark</item>
<item name="bpCheckIcon">@drawable/ic_check_dark</item>
<item name="bpKeyBackground">@drawable/borderless_button_dark</item>
<item name="bpButtonBackground">@drawable/borderless_button_dark</item>
<item name="bpTitleDividerColor">@color/default_keyboard_indicator_color_dark</item>
<item name="bpDividerColor">@color/default_divider_color_dark</item>
<item name="bpKeyboardIndicatorColor">@color/selection_background_color_dark</item>
</style>
</resources>