From dae42a11b4100d4849ae3cdc234afe0274f6d36f Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 10 Dec 2013 13:41:47 +0100 Subject: [PATCH] Added seasonal icon for winter holidays --- res/drawable-hdpi/winter_holidays_icon.png | Bin 0 -> 4143 bytes res/drawable-ldpi/winter_holidays_icon.png | Bin 0 -> 1892 bytes res/drawable-mdpi/winter_holidays_icon.png | Bin 0 -> 2192 bytes .../files/managers/OCNotificationManager.java | 5 +++-- .../android/files/services/FileDownloader.java | 7 +++--- .../android/files/services/FileUploader.java | 7 +++--- .../android/syncadapter/FileSyncAdapter.java | 9 ++++---- .../android/ui/activity/AccountSelectActivity.java | 9 ++++---- .../ui/activity/ConflictsResolveActivity.java | 6 ++++- .../android/ui/activity/FileDisplayActivity.java | 25 +++++++-------------- .../ui/activity/GenericExplanationActivity.java | 5 +++++ .../android/ui/activity/LogHistoryActivity.java | 2 ++ .../android/ui/activity/PinCodeActivity.java | 5 ++++- .../owncloud/android/ui/activity/Preferences.java | 10 ++------- .../android/ui/activity/UploadFilesActivity.java | 2 ++ .../android/ui/dialog/ChangelogDialog.java | 3 ++- .../android/ui/dialog/ConflictsResolveDialog.java | 13 ++++++----- .../android/ui/preview/PreviewImageActivity.java | 2 ++ src/com/owncloud/android/utils/DisplayUtils.java | 11 ++++++++- 19 files changed, 70 insertions(+), 51 deletions(-) create mode 100644 res/drawable-hdpi/winter_holidays_icon.png create mode 100644 res/drawable-ldpi/winter_holidays_icon.png create mode 100644 res/drawable-mdpi/winter_holidays_icon.png diff --git a/res/drawable-hdpi/winter_holidays_icon.png b/res/drawable-hdpi/winter_holidays_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c1764b6d097444a1dce21469740a714f91fcd1d4 GIT binary patch literal 4143 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%0ArKOgCJig5a?Y--6~4wV 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 S5i3Oi0000 explicit failure notification mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker); - Notification finalNotification = new Notification(R.drawable.icon, + Notification finalNotification = new Notification(DisplayUtils.getSeasonalIconId(), getString(R.string.uploader_upload_failed_ticker), System.currentTimeMillis()); finalNotification.flags |= Notification.FLAG_AUTO_CANCEL; String content = null; diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index f0bc8709..e7867e2d 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -36,6 +36,7 @@ import com.owncloud.android.operations.SynchronizeFolderOperation; import com.owncloud.android.operations.UpdateOCVersionOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; @@ -368,7 +369,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { * Notifies the user about a failed synchronization through the status notification bar */ private void notifyFailedSynchronization() { - Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis()); + Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis()); notification.flags |= Notification.FLAG_AUTO_CANCEL; boolean needsToUpdateCredentials = (mLastFailedResult != null && ( mLastFailedResult.getCode() == ResultCode.UNAUTHORIZED || @@ -410,7 +411,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { */ private void notifyFailsInFavourites() { if (mFailedResultsCounter > 0) { - Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_in_favourites_ticker), System.currentTimeMillis()); + Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_fail_in_favourites_ticker), System.currentTimeMillis()); notification.flags |= Notification.FLAG_AUTO_CANCEL; // TODO put something smart in the contentIntent below notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0); @@ -421,7 +422,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_fail_in_favourites_ticker, notification); } else { - Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_conflicts_in_favourites_ticker), System.currentTimeMillis()); + Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_conflicts_in_favourites_ticker), System.currentTimeMillis()); notification.flags |= Notification.FLAG_AUTO_CANCEL; // TODO put something smart in the contentIntent below notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0); @@ -443,7 +444,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { * We won't consider a synchronization as failed when foreign files can not be copied to the ownCloud local directory. */ private void notifyForgottenLocalFiles() { - Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_foreign_files_forgotten_ticker), System.currentTimeMillis()); + Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_foreign_files_forgotten_ticker), System.currentTimeMillis()); notification.flags |= Notification.FLAG_AUTO_CANCEL; /// includes a pending intent in the notification showing a more detailed explanation diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index b1ff8453..3632b5e4 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -27,7 +27,6 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; import android.accounts.AccountManagerFuture; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -50,6 +49,7 @@ import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.oc_framework.accounts.OwnCloudAccount; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; @@ -75,9 +75,10 @@ public class AccountSelectActivity extends SherlockListActivity implements mPreviousAccount = AccountUtils.getCurrentOwnCloudAccount(this); } - ActionBar action_bar = getSupportActionBar(); - action_bar.setDisplayShowTitleEnabled(true); - action_bar.setDisplayHomeAsUpEnabled(false); + ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(false); } @Override diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java index 2d13a66b..5b22c341 100644 --- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java +++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java @@ -18,12 +18,14 @@ package com.owncloud.android.ui.activity; +import com.actionbarsherlock.app.ActionBar; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.ui.dialog.ConflictsResolveDialog; import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision; import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; import android.content.Intent; @@ -43,10 +45,12 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); } @Override - public void ConflictDecisionMade(Decision decision) { + public void conflictDecisionMade(Decision decision) { Intent i = new Intent(getApplicationContext(), FileUploader.class); switch (decision) { diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 0bf82075..aec61859 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -88,6 +88,7 @@ import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewVideoActivity; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; @@ -192,13 +193,16 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa // Action bar setup mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation - setSupportProgressBarIndeterminateVisibility(mSyncInProgress); // always AFTER setContentView(...) ; to work around bug in its implementation - - + setSupportProgressBarIndeterminateVisibility(mSyncInProgress); // always AFTER setContentView(...) ; to work around bug in its implementation Log_OC.d(TAG, "onCreate() end"); } - + + @Override + protected void onStart() { + super.onStart(); + getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId()); + } @Override protected void onDestroy() { @@ -1151,19 +1155,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa } -// private void updateDisplayHomeAtSync(){ -// ActionBar actionBar = getSupportActionBar(); -// OCFile currentDir = getCurrentDir(); -// if (currentDir.getParentId() != DataStorageManager.ROOT_PARENT_ID) { -// actionBar.setHomeButtonEnabled(!mSyncInProgress); -// actionBar.setDisplayHomeAsUpEnabled(!mSyncInProgress); -// } -// else { -// actionBar.setHomeButtonEnabled(true); -// actionBar.setDisplayHomeAsUpEnabled(false); -// } -// } -// /** * {@inheritDoc} */ diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java index b971c40c..901434e2 100644 --- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java +++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java @@ -30,8 +30,10 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; +import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; /** @@ -74,6 +76,9 @@ public class GenericExplanationActivity extends SherlockFragmentActivity { } else { listView.setVisibility(View.GONE); } + + ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); } public class ExplanationListAdapterView extends ArrayAdapter { diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index e879cc7e..ca454d41 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -34,6 +34,7 @@ import com.actionbarsherlock.app.SherlockPreferenceActivity; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.R; import com.owncloud.android.ui.adapter.LogListAdapter; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.FileStorageUtils; @@ -50,6 +51,7 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On setContentView(R.layout.log_send_file); setTitle("Log History"); ActionBar actionBar = getSherlock().getActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setDisplayHomeAsUpEnabled(true); ListView listView = (ListView) findViewById(android.R.id.list); Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton); diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java index c962fb2f..83e3f644 100644 --- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java @@ -18,8 +18,10 @@ package com.owncloud.android.ui.activity; import java.util.Arrays; +import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; import android.app.AlertDialog; import android.content.DialogInterface; @@ -121,7 +123,8 @@ public class PinCodeActivity extends SherlockFragmentActivity { } setTextListeners(); - + ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); } diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 678dad6d..05a631d0 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -17,8 +17,6 @@ */ package com.owncloud.android.ui.activity; -import java.util.Vector; - import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageInfo; @@ -38,8 +36,8 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.R; import com.owncloud.android.db.DbHandler; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; -import com.owncloud.android.utils.OwnCloudSession; /** @@ -51,15 +49,11 @@ import com.owncloud.android.utils.OwnCloudSession; public class Preferences extends SherlockPreferenceActivity { private static final String TAG = "OwnCloudPreferences"; - private final int mNewSession = 47; - private final int mEditSession = 48; private DbHandler mDbHandler; - private Vector mSessions; private CheckBoxPreference pCode; //private CheckBoxPreference pLogging; //private Preference pLoggingHistory; private Preference pAboutApp; - private int mSelectedMenuItem; @SuppressWarnings("deprecation") @@ -67,10 +61,10 @@ public class Preferences extends SherlockPreferenceActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mDbHandler = new DbHandler(getBaseContext()); - mSessions = new Vector(); addPreferencesFromResource(R.xml.preferences); //populateAccountList(); ActionBar actionBar = getSherlock().getActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setDisplayHomeAsUpEnabled(true); Preference p = findPreference("manage_account"); diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index 7c941e8e..7eff9b45 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -40,6 +40,7 @@ import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.LocalFileListFragment; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; @@ -111,6 +112,7 @@ public class UploadFilesActivity extends FileActivity implements // Action bar setup ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null); actionBar.setDisplayShowTitleEnabled(false); diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java index 676bea57..eef9d09b 100644 --- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java +++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java @@ -25,6 +25,7 @@ import android.webkit.WebView; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; /** @@ -63,7 +64,7 @@ public class ChangelogDialog extends SherlockDialogFragment { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); Dialog dialog = builder.setView(webview) - .setIcon(R.drawable.icon) + .setIcon(DisplayUtils.getSeasonalIconId()) //.setTitle(R.string.whats_new) .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 1998fcb8..91cfbfde 100644 --- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -28,6 +28,7 @@ import android.support.v4.app.FragmentTransaction; import com.actionbarsherlock.app.SherlockDialogFragment; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; /** @@ -59,7 +60,7 @@ public class ConflictsResolveDialog extends SherlockDialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { String remotepath = getArguments().getString("remotepath"); return new AlertDialog.Builder(getSherlockActivity()) - .setIcon(R.drawable.icon) + .setIcon(DisplayUtils.getSeasonalIconId()) .setTitle(R.string.conflict_title) .setMessage(String.format(getString(R.string.conflict_message), remotepath)) .setPositiveButton(R.string.conflict_overwrite, @@ -68,7 +69,7 @@ public class ConflictsResolveDialog extends SherlockDialogFragment { @Override public void onClick(DialogInterface dialog, int which) { if (mListener != null) - mListener.ConflictDecisionMade(Decision.OVERWRITE); + mListener.conflictDecisionMade(Decision.OVERWRITE); } }) .setNeutralButton(R.string.conflict_keep_both, @@ -76,7 +77,7 @@ public class ConflictsResolveDialog extends SherlockDialogFragment { @Override public void onClick(DialogInterface dialog, int which) { if (mListener != null) - mListener.ConflictDecisionMade(Decision.KEEP_BOTH); + mListener.conflictDecisionMade(Decision.KEEP_BOTH); } }) .setNegativeButton(R.string.conflict_dont_upload, @@ -84,7 +85,7 @@ public class ConflictsResolveDialog extends SherlockDialogFragment { @Override public void onClick(DialogInterface dialog, int which) { if (mListener != null) - mListener.ConflictDecisionMade(Decision.CANCEL); + mListener.conflictDecisionMade(Decision.CANCEL); } }) .create(); @@ -112,10 +113,10 @@ public class ConflictsResolveDialog extends SherlockDialogFragment { @Override public void onCancel(DialogInterface dialog) { - mListener.ConflictDecisionMade(Decision.CANCEL); + mListener.conflictDecisionMade(Decision.CANCEL); } public interface OnConflictDecisionMadeListener { - public void ConflictDecisionMade(Decision decision); + public void conflictDecisionMade(Decision decision); } } diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index fde70df0..0c9152e0 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -47,6 +47,7 @@ import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.dialog.LoadingDialog; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; @@ -90,6 +91,7 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C setContentView(R.layout.preview_image_activity); ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.hide(); diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java index e4bdd999..680107b8 100644 --- a/src/com/owncloud/android/utils/DisplayUtils.java +++ b/src/com/owncloud/android/utils/DisplayUtils.java @@ -19,13 +19,13 @@ package com.owncloud.android.utils; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Set; import com.owncloud.android.R; -import com.owncloud.android.R.drawable; /** * A helper class for some string operations. @@ -190,4 +190,13 @@ public class DisplayUtils { Date date = new Date(milliseconds); return date.toLocaleString(); } + + + public static int getSeasonalIconId() { + if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) { + return R.drawable.winter_holidays_icon; + } else { + return R.drawable.icon; + } + } } -- 2.11.0