Moved non-gui classes to 'core' package

7 files changed, 14 insertions, 246 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
index d1ed795dc..1585f9b86 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import org.apache.commons.lang3.Validate;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * Creates a new AlertDialog that displays preferences for auto-flattring to the user.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java
deleted file mode 100644
index df71fff77..000000000
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package de.danoeh.antennapod.dialog;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.util.Log;
-import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.R;
-
-/**
- * Creates an AlertDialog which asks the user to confirm something. Other
- * classes can handle events like confirmation or cancellation.
- */
-public abstract class ConfirmationDialog {
-	private static final String TAG = "ConfirmationDialog";
-
-	Context context;
-	int titleId;
-	int messageId;
-
-	public ConfirmationDialog(Context context, int titleId, int messageId) {
-		this.context = context;
-		this.titleId = titleId;
-		this.messageId = messageId;
-	}
-
-	public void onCancelButtonPressed(DialogInterface dialog) {
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Dialog was cancelled");
-		dialog.dismiss();
-	}
-
-	public abstract void onConfirmButtonPressed(DialogInterface dialog);
-
-	public final AlertDialog createNewDialog() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(context);
-		builder.setTitle(titleId);
-		builder.setMessage(messageId);
-		builder.setPositiveButton(R.string.confirm_label,
-				new DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						onConfirmButtonPressed(dialog);
-					}
-				});
-		builder.setNegativeButton(R.string.cancel_label,
-				new DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						onCancelButtonPressed(dialog);
-					}
-				});
-		builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-
-			@Override
-			public void onCancel(DialogInterface dialog) {
-				onCancelButtonPressed(dialog);
-			}
-		});
-		return builder.create();
-	}
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
deleted file mode 100644
index e363a6911..000000000
--- a/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package de.danoeh.antennapod.dialog;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import de.danoeh.antennapod.R;
-
-/** Creates Alert Dialogs if a DownloadRequestException has happened. */
-public class DownloadRequestErrorDialogCreator {
-	private DownloadRequestErrorDialogCreator() {
-	}
-
-	public static void newRequestErrorDialog(Context context,
-			String errorMessage) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(context);
-		builder.setNeutralButton(android.R.string.ok,
-				new DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						dialog.dismiss();
-					}
-				})
-				.setTitle(R.string.download_error_request_error)
-				.setMessage(
-						context.getString(R.string.download_request_error_dialog_message_prefix)
-								+ errorMessage);
-		builder.create().show();
-	}
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
index 7384463de..e62daa08b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
@@ -33,16 +33,16 @@ import java.util.concurrent.Callable;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DBWriter;
-import de.danoeh.antennapod.storage.DownloadRequestException;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.ShownotesProvider;
-import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
+import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequestException;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.ShownotesProvider;
+import de.danoeh.antennapod.core.util.menuhandler.FeedItemMenuHandler;
 
 /**
  * Shows information about a specific FeedItem and provides actions like playing, downloading, etc.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
index a9c596d2e..16fb77f2a 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
@@ -10,8 +10,8 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.gpoddernet.GpodnetService;
-import de.danoeh.antennapod.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 
 /**
  * Creates a dialog that lets the user change the hostname for the gpodder.net service.
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java
deleted file mode 100644
index bbd514640..000000000
--- a/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package de.danoeh.antennapod.dialog;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.view.Window;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
-import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.R;
-
-import java.util.concurrent.TimeUnit;
-
-public abstract class TimeDialog extends Dialog {
-    private static final String TAG = "TimeDialog";
-
-    private static final int DEFAULT_SPINNER_POSITION = 1;
-
-    private Context context;
-
-    private EditText etxtTime;
-    private Spinner spTimeUnit;
-    private Button butConfirm;
-    private Button butCancel;
-
-    private TimeUnit[] units = {TimeUnit.SECONDS, TimeUnit.MINUTES,
-            TimeUnit.HOURS};
-
-    public TimeDialog(Context context, int titleTextId, int leftButtonTextId) {
-        super(context);
-        this.context = context;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        String[] spinnerContent = new String[]{context.getString(R.string.time_unit_seconds),
-                context.getString(R.string.time_unit_minutes),
-                context.getString(R.string.time_unit_hours)};
-
-        setContentView(R.layout.time_dialog);
-        etxtTime = (EditText) findViewById(R.id.etxtTime);
-        spTimeUnit = (Spinner) findViewById(R.id.spTimeUnit);
-        butConfirm = (Button) findViewById(R.id.butConfirm);
-        butCancel = (Button) findViewById(R.id.butCancel);
-
-        butConfirm.setText(R.string.set_sleeptimer_label);
-        butCancel.setText(R.string.cancel_label);
-        setTitle(R.string.set_sleeptimer_label);
-        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(
-                this.getContext(), android.R.layout.simple_spinner_item,
-                spinnerContent);
-        spinnerAdapter
-                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spTimeUnit.setAdapter(spinnerAdapter);
-        spTimeUnit.setSelection(DEFAULT_SPINNER_POSITION);
-        butCancel.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                dismiss();
-            }
-        });
-        butConfirm.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                try {
-                    long input = readTimeMillis();
-                    onTimeEntered(input);
-                    dismiss();
-                } catch (NumberFormatException e) {
-                    e.printStackTrace();
-                    Toast toast = Toast.makeText(context,
-                            R.string.time_dialog_invalid_input,
-                            Toast.LENGTH_LONG);
-                    toast.show();
-                }
-            }
-        });
-        etxtTime.addTextChangedListener(new TextWatcher() {
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                checkInputLength(s.length());
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count,
-                                          int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before,
-                                      int count) {
-
-            }
-        });
-        checkInputLength(etxtTime.getText().length());
-        etxtTime.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(etxtTime, InputMethodManager.SHOW_IMPLICIT);
-            }
-        }, 100);
-
-
-
-    }
-
-    private void checkInputLength(int length) {
-        if (length > 0) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Length is larger than 0, enabling confirm button");
-            butConfirm.setEnabled(true);
-        } else {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Length is smaller than 0, disabling confirm button");
-            butConfirm.setEnabled(false);
-        }
-    }
-
-    public abstract void onTimeEntered(long millis);
-
-    private long readTimeMillis() {
-        TimeUnit selectedUnit = units[spTimeUnit.getSelectedItemPosition()];
-        long value = Long.valueOf(etxtTime.getText().toString());
-        return selectedUnit.toMillis(value);
-    }
-
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index b009e76a7..8eba51540 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -7,7 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.util.Arrays;
 import java.util.List;