*/
public class EventsPreviewDetailFragment extends SupportFragment
@@ -66,9 +66,15 @@ public class EventsPreviewDetailFragment extends SupportFragment
private String mTitle;
+ public EventsPreviewDetailFragment()
+ {
+ // Required empty public constructor
+ }
+
+
/**
* Create a new {@link EventsPreviewDetailFragment} for the given {@link Event}, calendar name, icon and page title.
- *
+ *
* @param event
* The {@link Event}.
* @param calendarName
@@ -92,12 +98,6 @@ public static EventsPreviewDetailFragment newInstance(Event event, String calend
}
- public EventsPreviewDetailFragment()
- {
- // Required empty public constructor
- }
-
-
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
diff --git a/UI/src/org/dmfs/webcal/fragments/GenericListFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/GenericListFragment.java
similarity index 95%
rename from UI/src/org/dmfs/webcal/fragments/GenericListFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/GenericListFragment.java
index 4fd7dd9..b88f71e 100644
--- a/UI/src/org/dmfs/webcal/fragments/GenericListFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/GenericListFragment.java
@@ -21,11 +21,11 @@
import org.dmfs.android.calendarcontent.provider.CalendarContentContract.ContentItem;
import org.dmfs.android.calendarcontent.provider.CalendarContentContract.SubscribedCalendars;
import org.dmfs.android.retentionmagic.annotations.Parameter;
+import org.dmfs.webcal.ActionBarActivity;
import org.dmfs.webcal.R;
import org.dmfs.webcal.adapters.MixedNavigationAdapter;
import org.dmfs.webcal.fragments.CategoriesListFragment.CategoryNavigator;
-import android.app.ActionBar;
import android.app.Activity;
import android.database.Cursor;
import android.net.Uri;
@@ -34,6 +34,7 @@
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
+import android.support.v7.app.ActionBar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -49,25 +50,22 @@
*
* TODO: the synced calendars in "My Calendars" use a different id column. We need a better way to deal with that.
*
- *
+ *
* @author Marten Gajda
*/
public class GenericListFragment extends ActionBarFragment implements OnItemClickListener, LoaderCallbacks
{
- private static final String TAG = "GenericListFragment";
public static final String ARG_URI = "uri";
public static final String ARG_TITLE = "title";
public static final String ARG_EMPTY_MESSAGE = "empty_message";
public static final String ARG_PROJECTION = "projection";
public static final String ARG_SHOW_STARS = "show_stars";
-
public final static String[] PROJECTION = new String[] { CalendarContentContract.ContentItem._ID,
CalendarContentContract.SubscribedCalendars.CALENDAR_NAME, CalendarContentContract.ContentItem.TYPE, CalendarContentContract.ContentItem.ICON_ID,
ContentItem.SEASON, ContentItem.STARRED, CalendarContentContract.SubscribedCalendars.ITEM_ID };
-
public final static String[] PROJECTION2 = new String[] { CalendarContentContract.ContentItem._ID, CalendarContentContract.ContentItem.TITLE,
CalendarContentContract.ContentItem.TYPE, CalendarContentContract.ContentItem.ICON_ID, ContentItem.SEASON, ContentItem.STARRED };
-
+ private static final String TAG = "GenericListFragment";
@Parameter(key = ARG_URI)
private Uri mUri;
@@ -132,7 +130,6 @@ public void onResume()
{
mListView.setSelectionFromTop(mFirstItem, mPosFromTop);
}
- setupActionBar();
}
@@ -148,6 +145,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(this);
+ setupActionBar(result);
+
FragmentActivity activity = getActivity();
/*
@@ -237,16 +236,14 @@ else if (CalendarContentContract.ContentItem.TYPE_CALENDAR.equals(itemType))
@Override
- public void setupActionBar()
+ public void setupActionBar(View view)
{
if (getParentFragment() == null) // the topmost fragment owns the action bar
{
- ActionBar ab = getActivity().getActionBar();
- ab.removeAllTabs();
- ab.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
- FragmentActivity activity = getActivity();
+ ActionBar ab = ((ActionBarActivity) getActivity()).getSupportActionBar();
+ ActionBarActivity activity = (ActionBarActivity) getActivity();
activity.setTitle(mTitle);
- activity.getActionBar().setTitle(mTitle);
+ ab.setTitle(mTitle);
}
}
diff --git a/UI/src/org/dmfs/webcal/fragments/InputTextDialogFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/InputTextDialogFragment.java
similarity index 99%
rename from UI/src/org/dmfs/webcal/fragments/InputTextDialogFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/InputTextDialogFragment.java
index 1c32ae5..37a0a74 100644
--- a/UI/src/org/dmfs/webcal/fragments/InputTextDialogFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/InputTextDialogFragment.java
@@ -40,7 +40,7 @@
/**
* A simple prompt for text input.
- *
+ *
* @author Marten Gajda
*/
public class InputTextDialogFragment extends SupportDialogFragment implements OnEditorActionListener
@@ -48,24 +48,21 @@ public class InputTextDialogFragment extends SupportDialogFragment implements On
private final static String ARG_TITLE_ID = "title_id";
private final static String ARG_INITIAL_TEXT = "initial_text";
-
- public interface OnTextInputListener
- {
- void onTextInput(String inputText);
- }
-
@Parameter(key = ARG_TITLE_ID)
private int mTitleId;
-
@Parameter(key = ARG_INITIAL_TEXT)
private String mInitialText;
-
private EditText mEditText;
+ public InputTextDialogFragment()
+ {
+ }
+
+
/**
* Create a {@link InputTextDialogFragment} with the given title and initial text value.
- *
+ *
* @param titleId
* The resource id of the title.
* @param initalText
@@ -83,11 +80,6 @@ public static InputTextDialogFragment newInstance(int titleId, String initalText
}
- public InputTextDialogFragment()
- {
- }
-
-
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
@@ -176,4 +168,9 @@ else if (activity instanceof OnTextInputListener)
return false;
}
+ public interface OnTextInputListener
+ {
+ void onTextInput(String inputText);
+ }
+
}
diff --git a/UI/src/org/dmfs/webcal/fragments/MessageDialogFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/MessageDialogFragment.java
similarity index 99%
rename from UI/src/org/dmfs/webcal/fragments/MessageDialogFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/MessageDialogFragment.java
index d92c550..e2a5234 100644
--- a/UI/src/org/dmfs/webcal/fragments/MessageDialogFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/MessageDialogFragment.java
@@ -35,7 +35,7 @@
/**
* A simple message dialog.
- *
+ *
* @author Marten Gajda
*/
public class MessageDialogFragment extends SupportDialogFragment
@@ -51,9 +51,14 @@ public class MessageDialogFragment extends SupportDialogFragment
private String mMessageText;
+ public MessageDialogFragment()
+ {
+ }
+
+
/**
* Create a {@link MessageDialogFragment} with the given title and message text value and show it.
- *
+ *
* @param manager
* A {@link FragmentManager}.
* @param titleId
@@ -73,11 +78,6 @@ public static void show(FragmentManager manager, int titleId, String messageText
}
- public MessageDialogFragment()
- {
- }
-
-
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
diff --git a/UI/src/org/dmfs/webcal/fragments/PagerFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/PagerFragment.java
similarity index 68%
rename from UI/src/org/dmfs/webcal/fragments/PagerFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/PagerFragment.java
index 7ebef73..87f5984 100644
--- a/UI/src/org/dmfs/webcal/fragments/PagerFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/PagerFragment.java
@@ -21,17 +21,15 @@
import org.dmfs.android.calendarcontent.provider.CalendarContentContract.ContentItem;
import org.dmfs.android.retentionmagic.annotations.Parameter;
import org.dmfs.android.retentionmagic.annotations.Retain;
+import org.dmfs.webcal.ActionBarActivity;
import org.dmfs.webcal.R;
import org.dmfs.webcal.adapters.SectionsPagerAdapter;
import org.dmfs.webcal.utils.BitmapUtils;
import org.dmfs.webcal.utils.ImageProxy;
import org.dmfs.webcal.utils.ImageProxy.ImageAvailableListener;
+import org.dmfs.webcal.views.TabBarLayout;
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.ActionBar.TabListener;
import android.app.Activity;
-import android.app.FragmentTransaction;
import android.content.ContentUris;
import android.content.Context;
import android.content.SharedPreferences;
@@ -46,7 +44,7 @@
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -58,19 +56,17 @@
/**
* A fragment that contains a pager to present the sections of a page item to the user. It takes a {@link Uri} or a page item id.
- *
+ *
* @author Marten Gajda
*/
-public class PagerFragment extends ActionBarFragment implements LoaderCallbacks, TabListener, OnPageChangeListener, OnSharedPreferenceChangeListener,
- ImageAvailableListener
+public class PagerFragment extends ActionBarFragment implements LoaderCallbacks, OnSharedPreferenceChangeListener, ImageAvailableListener
{
- private final static String TAG = "PagerFragment";
-
- private final static String ARG_SECTIONS_URI = "uri";
/**
* FIXME: we should not publish this internal field.
*/
public static final String ARG_PAGE_TITLE = "title";
+ private final static String TAG = "PagerFragment";
+ private final static String ARG_SECTIONS_URI = "uri";
private static final String ARG_PAGE_ICON = "icon";
private final static int ID_URL_LOADER = 0;
@@ -91,7 +87,6 @@ public class PagerFragment extends ActionBarFragment implements LoaderCallbacks<
/**
* The id is used to store the selected tab for this page, don't remove it.
*/
- @SuppressWarnings("unused")
private long mId;
@Retain(permanent = true, classNS = TAG, instanceNSField = "mId", key = "selectedTab")
@@ -99,10 +94,12 @@ public class PagerFragment extends ActionBarFragment implements LoaderCallbacks<
private ProgressBar mProgressBar;
+ private TabBarLayout mTabLayout;
+
/**
* Create a new {@link PagerFragment} for the given sections {@link Uri}.
- *
+ *
* @param sectionsUri
* A {@link Uri} that points to the sections to show.
* @param pageTitle
@@ -125,7 +122,7 @@ public static PagerFragment newInstance(Uri sectionsUri, String pageTitle, long
/**
* Create a new {@link PagerFragment} for the given page id.
- *
+ *
* @param context
* A {@link Context}.
* @param pageId
@@ -145,7 +142,8 @@ public static PagerFragment newInstance(Context context, long pageId, String pag
@Override
public void onCreate(Bundle savedInstanceState)
{
- // get the id before we call super.onCreate, because it's used to retrieve the id of the section to show first
+ // get the id before we call super.onCreate, because it's used to
+ // retrieve the id of the section to show first
mId = ContentUris.parseId(mUri);
super.onCreate(savedInstanceState);
}
@@ -162,7 +160,8 @@ public void onAttach(Activity activity)
@Override
public void onDetach()
{
- // avoid to get notifications for changes in the shared preferences that we caused ourselves (because the active section has been stored)
+ // avoid to get notifications for changes in the shared preferences that
+ // we caused ourselves (because the active section has been stored)
Activity activity = getActivity();
activity.getSharedPreferences(activity.getPackageName() + "_preferences", 0).unregisterOnSharedPreferenceChangeListener(this);
super.onDetach();
@@ -177,6 +176,17 @@ public void onStart()
}
+ @Override
+ public void onStop()
+ {
+ if (mViewPager != null)
+ {
+ mSelectedTab = mViewPager.getCurrentItem();
+ }
+ super.onStop();
+ }
+
+
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
@@ -184,33 +194,18 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
mProgressBar = (ProgressBar) returnView.findViewById(android.R.id.progress);
mMessageText = (TextView) returnView.findViewById(android.R.id.message);
+ mTabLayout = (TabBarLayout) returnView.findViewById(R.id.tab_bar);
mAdapter = new SectionsPagerAdapter(getChildFragmentManager(), mIcon);
mViewPager = (ViewPager) returnView.findViewById(R.id.pager);
- mViewPager.setOnPageChangeListener(this);
mViewPager.setAdapter(mAdapter);
+ setupActionBar(returnView);
+
// start loading the pages
getLoaderManager().initLoader(ID_URL_LOADER, null, this);
- // set the page title and clear the subtitle if any
- ActionBar actionBar = getActivity().getActionBar();
- actionBar.setTitle(mTitle);
- actionBar.setSubtitle(null);
-
- // load the icon and set it if we get any, otherwise insert a placeholder and set it later
- Drawable icon = ImageProxy.getInstance(this.getActivity()).getImage(mIcon, this);
- if (icon != null)
- {
- // we need to pre-scale the icon, apparently Android doesn't do that for us
- actionBar.setIcon(BitmapUtils.scaleDrawable(getResources(), (BitmapDrawable) icon, 36, 36));
- }
- else
- {
- actionBar.setIcon(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
- }
-
return returnView;
}
@@ -225,29 +220,45 @@ public Loader onCreateLoader(int id, Bundle extras)
@Override
public void onLoadFinished(Loader cursorLoader, Cursor cursor)
{
+ // update adapter
mAdapter.swapCursor(cursor);
+
if (cursor == null)
{
- // this indicates an error when loading the page, show an error message
+ // this indicates an error when loading the page, show an error
+ // message
mMessageText.setVisibility(View.VISIBLE);
mProgressBar.setVisibility(View.GONE);
mViewPager.setVisibility(View.GONE);
+ mTabLayout.setVisibility(View.GONE);
+
}
else if (cursor.getCount() > 0)
{
- // indicates the page has been loaded, hide progress indicator and show pager
+ // indicates the page has been loaded, hide progress indicator and
+ // show pager
mMessageText.setVisibility(View.GONE);
mProgressBar.setVisibility(View.GONE);
mViewPager.setVisibility(View.VISIBLE);
- setupActionBarTabs();
+ mViewPager.setVisibility(View.VISIBLE);
+
+ if (cursor.getCount() > 1)
+ {
+ mTabLayout.setVisibility(View.VISIBLE);
+ populateTabBar();
+
+ if (cursor.getCount() > mSelectedTab)
+ {
+ mViewPager.setCurrentItem(mSelectedTab);
+ }
+
+ }
}
else
{
- // all pages must have at least one section, 0 results means we're still waiting for the page to load, show a progress indicator
- Activity activity = getActivity();
+ // all pages must have at least one section, 0 results means we're
+ // still waiting for the page to load, show a progress indicator
mProgressBar.setVisibility(View.VISIBLE);
- activity.getActionBar().removeAllTabs();
- activity.getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
}
}
@@ -256,6 +267,7 @@ else if (cursor.getCount() > 0)
public void onLoaderReset(Loader cursorLoader)
{
mAdapter.swapCursor(null);
+ mViewPager.invalidate();
}
@@ -265,126 +277,50 @@ public void imageAvailable(long mIconId, Drawable drawable)
if (isAdded())
{
// the image has been loaded, scale it and update the ActionBar
- getActivity().getActionBar().setIcon(BitmapUtils.scaleDrawable(getResources(), (BitmapDrawable) drawable, 36, 36));
+ ((ActionBarActivity) getActivity()).getSupportActionBar().setIcon(BitmapUtils.scaleDrawable(getResources(), (BitmapDrawable) drawable, 36, 36));
}
}
@Override
- public void setupActionBar()
+ public void setupActionBar(View view)
{
- if (mAdapter != null)
- {
- setupActionBarTabs();
- }
- }
-
-
- /**
- * Configures the tabs on the action bar.
- */
- private void setupActionBarTabs()
- {
- ActionBar actionBar = getActivity().getActionBar();
-
- int tabCount = actionBar.getTabCount();
- int pageCount = mAdapter.getCount();
-
- // replace titles and listeners of existing tabs
- int i = 0;
- for (; i < tabCount && i < pageCount; ++i)
- {
- final Tab tab = actionBar.getTabAt(i);
- tab.setText(mAdapter.getPageTitle(i));
- tab.setTabListener(this);
- }
-
- // add missing tabs
- for (; i < pageCount; ++i)
- {
- actionBar.addTab(actionBar.newTab().setText(mAdapter.getPageTitle(i)).setTabListener(this));
- }
-
- // remove remaining tabs
- for (; i < tabCount; --tabCount)
- {
- actionBar.removeTabAt(i);
- }
-
- if (pageCount > 1)
- {
- int selection = mSelectedTab;
- // changing the navigation mode might trigger a call to onTabSelected overriding mSelectedTab with a wrong value, so save it
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
- mSelectedTab = selection;
- if (selection < pageCount)
- {
- mViewPager.setCurrentItem(selection, false);
- }
- }
- else
- {
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
- }
- }
-
-
- @Override
- public void onTabReselected(Tab arg0, FragmentTransaction arg1)
- {
- // nothing to do
- }
+ // set the page title and clear the subtitle if any
+ Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar);
+ toolbar.setTitle(mTitle);
+ toolbar.setSubtitle(null);
- @Override
- public void onTabSelected(Tab tab, FragmentTransaction fragmentTransaction)
- {
- mSelectedTab = tab.getPosition();
- if (mSelectedTab != mViewPager.getCurrentItem())
- {
- mViewPager.setCurrentItem(tab.getPosition());
- }
- }
+ // we are disabling the icon for now, as this better matches the material design
+ // displayToolbarIcon(toolbar);
-
- @Override
- public void onTabUnselected(Tab arg0, FragmentTransaction arg1)
- {
- // nothing to do
}
- @Override
- public void onPageSelected(int position)
+ private void displayToolbarIcon(Toolbar toolbar)
{
- Activity activity = getActivity();
- if (activity == null)
+ // load the icon and set it if we get any, otherwise insert a
+ // placeholder and set it later
+ Drawable icon = ImageProxy.getInstance(this.getActivity()).getImage(mIcon, this);
+ if (icon != null)
{
- // nothing to do
- return;
+ // we need to pre-scale the icon, apparently Android doesn't do that
+ // for us
+ toolbar.setLogo(BitmapUtils.scaleDrawable(getResources(), (BitmapDrawable) icon, 36, 36));
}
-
- ActionBar actionBar = activity.getActionBar();
-
- if (actionBar != null && position != actionBar.getSelectedNavigationIndex())
+ else
{
- mSelectedTab = position;
- actionBar.setSelectedNavigationItem(position);
+ toolbar.setLogo(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
}
- }
-
- @Override
- public void onPageScrollStateChanged(int arg0)
- {
- // nothing to do
}
- @Override
- public void onPageScrolled(int arg0, float arg1, int arg2)
+ private void populateTabBar()
{
- // nothing to do
+ // Give the SlidingTabLayout the ViewPager, this must be done AFTER the ViewPager has had
+ // it's PagerAdapter set.
+ mTabLayout.setViewPager(mViewPager);
}
diff --git a/UI/src/org/dmfs/webcal/fragments/PreferencesFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/PreferencesFragment.java
similarity index 99%
rename from UI/src/org/dmfs/webcal/fragments/PreferencesFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/PreferencesFragment.java
index 1150612..67901b0 100644
--- a/UI/src/org/dmfs/webcal/fragments/PreferencesFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/PreferencesFragment.java
@@ -43,7 +43,29 @@
public class PreferencesFragment extends PreferenceFragment
{
private static final String TAG = "WebcalPrefsFragment";
+ /**
+ * {@link OnPreferenceChangeListener} to update dependencies and summary of ListPreferences
+ */
+ private final OnPreferenceChangeListener PrefUpdater = new OnPreferenceChangeListener()
+ {
+ public boolean onPreferenceChange(Preference preference, Object newValue)
+ {
+ if (ListPreference.class.isInstance(preference))
+ {
+ ListPreference pref = (ListPreference) preference;
+ pref.setSummary(pref.getEntries()[pref.findIndexOfValue((String) newValue)]);
+ }
+ else if (EditTextPreference.class.isInstance(preference))
+ {
+ EditTextPreference pref = (EditTextPreference) preference;
+ pref.setSummary((String) newValue);
+ }
+
+ return true;
+ }
+
+ };
private String[] mCountryNames;
private String[] mCountryCodes;
@@ -84,7 +106,7 @@ public void onCreate(Bundle savedInstanceState)
/**
* Build the country list and sort it by name. This method populates {@link #mCountryCodes} and {@link #mCountryNames}.
- *
+ *
* @throws UnsupportedEncodingException
* @throws NotFoundException
* @throws IOException
@@ -139,30 +161,6 @@ private void getCountries() throws UnsupportedEncodingException, NotFoundExcepti
}
- /**
- * {@link OnPreferenceChangeListener} to update dependencies and summary of ListPreferences
- */
- private final OnPreferenceChangeListener PrefUpdater = new OnPreferenceChangeListener()
- {
-
- public boolean onPreferenceChange(Preference preference, Object newValue)
- {
- if (ListPreference.class.isInstance(preference))
- {
- ListPreference pref = (ListPreference) preference;
- pref.setSummary(pref.getEntries()[pref.findIndexOfValue((String) newValue)]);
- }
- else if (EditTextPreference.class.isInstance(preference))
- {
- EditTextPreference pref = (EditTextPreference) preference;
- pref.setSummary((String) newValue);
- }
-
- return true;
- }
-
- };
-
private static class Country implements Comparable
{
final String name;
diff --git a/UI/src/org/dmfs/webcal/fragments/PurchaseDialogFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/PurchaseDialogFragment.java
similarity index 99%
rename from UI/src/org/dmfs/webcal/fragments/PurchaseDialogFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/PurchaseDialogFragment.java
index d30a37f..b845c82 100644
--- a/UI/src/org/dmfs/webcal/fragments/PurchaseDialogFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/PurchaseDialogFragment.java
@@ -40,7 +40,7 @@
* This dialog only presents the user with an option to purchase, it doesn't launch the actual purchase flow. That's left to the listener when
* {@link OnPurchaseListener#onPurchase(boolean)} is called.
*
- *
+ *
* @author Marten Gajda
*/
public class PurchaseDialogFragment extends SupportDialogFragment implements OnClickListener
@@ -48,35 +48,18 @@ public class PurchaseDialogFragment extends SupportDialogFragment implements OnC
private final static String ARG_ENABLE_FREE_TRIAL = "enableFreeTrial";
private final static String ARG_PRICE = "price";
-
- /**
- * A listener for purchase events.
- */
- public interface OnPurchaseListener
- {
-
- /**
- * Called when the user hits the button to purchase or to take the free trial.
- *
- * @param freeTrial
- * If the user has chosen to take the free trial.
- */
- public void onPurchase(boolean freeTrial);
- }
-
@Parameter(key = ARG_ENABLE_FREE_TRIAL)
private boolean mEnableFreeTrial;
-
@Parameter(key = ARG_PRICE)
private String mPrice;
/**
* Create a {@link PurchaseDialogFragment}.
- *
+ *
* @param enableFreeTrial
* Whether to allow to take a free trial.
- *
+ *
* @param price
* The price of the product.
* @return A new {@link PurchaseDialogFragment}.
@@ -153,7 +136,7 @@ else if (id == R.id.cancel_button)
/**
* Notifies the parent Fragment or Activity (which ever implements {@link OnPurchaseListener}) about the purchase.
- *
+ *
* @param freeTrial
* Indicates that the user has chosen the free trial.
*/
@@ -177,4 +160,19 @@ else if (parentActivity instanceof OnPurchaseListener)
listener.onPurchase(freeTrial);
}
}
+
+ /**
+ * A listener for purchase events.
+ */
+ public interface OnPurchaseListener
+ {
+
+ /**
+ * Called when the user hits the button to purchase or to take the free trial.
+ *
+ * @param freeTrial
+ * If the user has chosen to take the free trial.
+ */
+ public void onPurchase(boolean freeTrial);
+ }
}
diff --git a/UI/src/org/dmfs/webcal/fragments/SubscribeableItemFragment.java b/UI/src/main/java/org/dmfs/webcal/fragments/SubscribeableItemFragment.java
similarity index 99%
rename from UI/src/org/dmfs/webcal/fragments/SubscribeableItemFragment.java
rename to UI/src/main/java/org/dmfs/webcal/fragments/SubscribeableItemFragment.java
index adca954..a7de5c9 100644
--- a/UI/src/org/dmfs/webcal/fragments/SubscribeableItemFragment.java
+++ b/UI/src/main/java/org/dmfs/webcal/fragments/SubscribeableItemFragment.java
@@ -52,7 +52,7 @@
/**
* A Fragment that shows a header to initiate the subscription flow. It's a wrapper for another fragment that doesn't need to care about payments & stuff.
- *
+ *
* @author Marten Gajda
*/
public abstract class SubscribeableItemFragment extends SupportFragment implements OnClickListener, OnInventoryListener, OnIabPurchaseFinishedListener,
@@ -75,9 +75,6 @@ public abstract class SubscribeableItemFragment extends SupportFragment implemen
private Place mWaitingForInventory = new Place(1);
private Place mWaitingForPaymentStatus = new Place(1);
private Place mWaitingForUpdateView = new Place();
-
- private boolean mIsPurchased = false;
-
/**
* This {@link Transition} is fired when the inventory has been updated.
*/
@@ -99,7 +96,15 @@ protected void execute(Inventory inventory)
}
}
};
-
+ private Transition mHandleOnCreateView = new Transition(1, mWaitingForUpdateView)
+ {
+ @Override
+ protected void execute(Void param)
+ {
+ // nothing to do
+ }
+ };
+ private boolean mIsPurchased = false;
/**
* This {@link Transition} is fired when the payment status has been loaded from the SDK.
*/
@@ -135,16 +140,6 @@ protected void execute(Cursor cursor)
onPaymentStatusChange();
}
};
-
- private Transition mHandleOnCreateView = new Transition(1, mWaitingForUpdateView)
- {
- @Override
- protected void execute(Void param)
- {
- // nothing to do
- }
- };
-
private Transition mHandleUpdateView = new Transition(3, mWaitingForUpdateView, 2, mWaitingForUpdateView)
{
@Override
@@ -176,6 +171,39 @@ protected void execute(Void param)
private PetriNet mPetriNet = new PetriNet(mInventoryUpdated, mPaymentStatusUpdated, mHandleOnCreateView, mHandleUpdateView);
+ /**
+ * Remove parts from the product title we don't want to present to the user, like the app title. The Google service dialog will show them for us.
+ *
+ * @param productTitle
+ * The raw product title as returned by Google.
+ * @return The sanitized product title.
+ */
+ private static String sanitizeGoogleProductTitle(String productTitle)
+ {
+ if (productTitle != null)
+ {
+ // remove any white space, just in case ...
+ productTitle = productTitle.trim();
+
+ if (productTitle.startsWith("Sync "))
+ {
+ productTitle = productTitle.substring(5);
+ }
+
+ // remove "()" at the end of the product title, Google adds it automatically but we don't want to show it
+ if (productTitle.endsWith(")"))
+ {
+ int idx = productTitle.lastIndexOf("(");
+ if (idx > 0)
+ {
+ productTitle = productTitle.substring(0, idx).trim();
+ }
+ }
+ }
+ return productTitle;
+ }
+
+
@Override
public void onAttach(final Activity activity)
{
@@ -236,7 +264,7 @@ public void onResume()
// we need this to update the UI if the free trial expired between onPause and onResume
mHandler.post(mTrialButtonUpdater);
- }
+ };
@Override
@@ -244,7 +272,7 @@ public void onPause()
{
super.onPause();
mHandler.removeCallbacks(mTrialButtonUpdater);
- };
+ }
@Override
@@ -394,6 +422,31 @@ else if (show && v != null && v.getVisibility() != View.VISIBLE)
}
}
+
+ /**
+ * Replace the unlock button by a buy button or vice versa.
+ *
+ * @param showBuyNow
+ * true to show the buy button.
+ */
+ private void swapButtons(boolean showBuyNow)
+ {
+ mUnlockButton.setVisibility(showBuyNow ? View.GONE : View.VISIBLE);
+ mBuyButton.setVisibility(showBuyNow ? View.VISIBLE : View.GONE);
+ }
+
+
+ public abstract void onPaymentStatusChange();
+
+
+ public abstract void onPurchase(boolean success, boolean freeTrial);
+
+
+ public abstract String getItemTitle();
+
+
+ public abstract String getGoogleSubscriptionId();
+
private final Runnable mTrialButtonUpdater = new Runnable()
{
@Override
@@ -435,61 +488,4 @@ else if (mTrialExpiryTime > now)
}
};
-
- /**
- * Replace the unlock button by a buy button or vice versa.
- *
- * @param showBuyNow
- * true to show the buy button.
- */
- private void swapButtons(boolean showBuyNow)
- {
- mUnlockButton.setVisibility(showBuyNow ? View.GONE : View.VISIBLE);
- mBuyButton.setVisibility(showBuyNow ? View.VISIBLE : View.GONE);
- }
-
-
- /**
- * Remove parts from the product title we don't want to present to the user, like the app title. The Google service dialog will show them for us.
- *
- * @param productTitle
- * The raw product title as returned by Google.
- * @return The sanitized product title.
- */
- private static String sanitizeGoogleProductTitle(String productTitle)
- {
- if (productTitle != null)
- {
- // remove any white space, just in case ...
- productTitle = productTitle.trim();
-
- if (productTitle.startsWith("Sync "))
- {
- productTitle = productTitle.substring(5);
- }
-
- // remove "()" at the end of the product title, Google adds it automatically but we don't want to show it
- if (productTitle.endsWith(")"))
- {
- int idx = productTitle.lastIndexOf("(");
- if (idx > 0)
- {
- productTitle = productTitle.substring(0, idx).trim();
- }
- }
- }
- return productTitle;
- }
-
-
- public abstract void onPaymentStatusChange();
-
-
- public abstract void onPurchase(boolean success, boolean freeTrial);
-
-
- public abstract String getItemTitle();
-
-
- public abstract String getGoogleSubscriptionId();
-}
\ No newline at end of file
+}
diff --git a/UI/src/org/dmfs/webcal/push/PushHelperService.java b/UI/src/main/java/org/dmfs/webcal/push/PushHelperService.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/push/PushHelperService.java
rename to UI/src/main/java/org/dmfs/webcal/push/PushHelperService.java
diff --git a/UI/src/org/dmfs/webcal/push/PushReceiver.java b/UI/src/main/java/org/dmfs/webcal/push/PushReceiver.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/push/PushReceiver.java
rename to UI/src/main/java/org/dmfs/webcal/push/PushReceiver.java
diff --git a/UI/src/org/dmfs/webcal/utils/BitmapUtils.java b/UI/src/main/java/org/dmfs/webcal/utils/BitmapUtils.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/BitmapUtils.java
rename to UI/src/main/java/org/dmfs/webcal/utils/BitmapUtils.java
diff --git a/UI/src/org/dmfs/webcal/utils/EmptyService.java b/UI/src/main/java/org/dmfs/webcal/utils/EmptyService.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/EmptyService.java
rename to UI/src/main/java/org/dmfs/webcal/utils/EmptyService.java
diff --git a/UI/src/org/dmfs/webcal/utils/Event.java b/UI/src/main/java/org/dmfs/webcal/utils/Event.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/Event.java
rename to UI/src/main/java/org/dmfs/webcal/utils/Event.java
diff --git a/UI/src/org/dmfs/webcal/utils/ExpandAnimation.java b/UI/src/main/java/org/dmfs/webcal/utils/ExpandAnimation.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/ExpandAnimation.java
rename to UI/src/main/java/org/dmfs/webcal/utils/ExpandAnimation.java
diff --git a/UI/src/org/dmfs/webcal/utils/ImageLoaderQueue.java b/UI/src/main/java/org/dmfs/webcal/utils/ImageLoaderQueue.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/ImageLoaderQueue.java
rename to UI/src/main/java/org/dmfs/webcal/utils/ImageLoaderQueue.java
diff --git a/UI/src/org/dmfs/webcal/utils/ImageProxy.java b/UI/src/main/java/org/dmfs/webcal/utils/ImageProxy.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/ImageProxy.java
rename to UI/src/main/java/org/dmfs/webcal/utils/ImageProxy.java
diff --git a/UI/src/org/dmfs/webcal/utils/ProtectedBackgroundJob.java b/UI/src/main/java/org/dmfs/webcal/utils/ProtectedBackgroundJob.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/ProtectedBackgroundJob.java
rename to UI/src/main/java/org/dmfs/webcal/utils/ProtectedBackgroundJob.java
diff --git a/UI/src/org/dmfs/webcal/utils/PurchasedItemCache.java b/UI/src/main/java/org/dmfs/webcal/utils/PurchasedItemCache.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/PurchasedItemCache.java
rename to UI/src/main/java/org/dmfs/webcal/utils/PurchasedItemCache.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/Base64.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/Base64.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/Base64.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/Base64.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/Base64DecoderException.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/Base64DecoderException.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/Base64DecoderException.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/Base64DecoderException.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/IabException.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/IabException.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/IabException.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/IabException.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/IabHelper.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/IabHelper.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/IabHelper.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/IabHelper.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/IabResult.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/IabResult.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/IabResult.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/IabResult.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/Inventory.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/Inventory.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/Inventory.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/Inventory.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/Purchase.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/Purchase.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/Purchase.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/Purchase.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/Security.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/Security.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/Security.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/Security.java
diff --git a/UI/src/org/dmfs/webcal/utils/billing/SkuDetails.java b/UI/src/main/java/org/dmfs/webcal/utils/billing/SkuDetails.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/utils/billing/SkuDetails.java
rename to UI/src/main/java/org/dmfs/webcal/utils/billing/SkuDetails.java
diff --git a/UI/src/org/dmfs/webcal/views/RemoteImageView.java b/UI/src/main/java/org/dmfs/webcal/views/RemoteImageView.java
similarity index 100%
rename from UI/src/org/dmfs/webcal/views/RemoteImageView.java
rename to UI/src/main/java/org/dmfs/webcal/views/RemoteImageView.java
diff --git a/UI/src/main/java/org/dmfs/webcal/views/TabBar.java b/UI/src/main/java/org/dmfs/webcal/views/TabBar.java
new file mode 100644
index 0000000..a4ee68d
--- /dev/null
+++ b/UI/src/main/java/org/dmfs/webcal/views/TabBar.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2014 SchedJoules
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.dmfs.webcal.views;
+
+import org.dmfs.webcal.R;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.LinearLayout;
+
+
+public class TabBar extends LinearLayout
+{
+ private static final int BOTTOM_DIVIDER_HEIGHT = 0;
+ private static final byte BOTTOM_DIVIDER_TRANSPARENCY = 0x26;
+ private static final int INDICATOR_HEIGHT = 3;
+ private static final int DIVIDER_WIDTH = 8;
+ private static final byte DIVIDER_TRANSPARENCY = 0x20;
+ private static final float DIVIDER_HEIGHT = 0;
+
+ private final int mBottomDividerHeight;
+ private final Paint mBottomDividerPaint;
+
+ private final int mSelectedIndicatorThickness;
+ private final Paint mSelectedIndicatorPaint;
+
+ private final int mBottomDividerColor;
+
+ private final Paint mDividerPaint;
+ private final float mDividerHeight;
+
+ private int mSelectedPosition;
+ private float mSelectionOffset;
+
+ private final ColorizerImpl mColorizer;
+
+
+ TabBar(Context context)
+ {
+ this(context, null);
+ }
+
+
+ TabBar(Context context, AttributeSet attrs)
+ {
+ super(context, attrs);
+ setWillNotDraw(false);
+
+ final float density = getResources().getDisplayMetrics().density;
+
+ TypedValue outValue = new TypedValue();
+ context.getTheme().resolveAttribute(R.attr.color, outValue, true);
+ final int themeColorPrimary = outValue.data;
+
+ context.getTheme().resolveAttribute(R.attr.colorAccent, outValue, true);
+ final int themeColorAccent = outValue.data;
+
+ mBottomDividerColor = setColorAlpha(themeColorPrimary, BOTTOM_DIVIDER_TRANSPARENCY);
+
+ mColorizer = new ColorizerImpl();
+ mColorizer.setIndicatorColors(themeColorAccent);
+ mColorizer.setDividerColors(setColorAlpha(themeColorAccent, DIVIDER_TRANSPARENCY));
+
+ mBottomDividerHeight = (int) (BOTTOM_DIVIDER_HEIGHT * density);
+ mBottomDividerPaint = new Paint();
+ mBottomDividerPaint.setColor(mBottomDividerColor);
+
+ mSelectedIndicatorThickness = (int) (INDICATOR_HEIGHT * density);
+ mSelectedIndicatorPaint = new Paint();
+
+ mDividerHeight = DIVIDER_HEIGHT;
+ mDividerPaint = new Paint();
+ mDividerPaint.setStrokeWidth((int) (DIVIDER_WIDTH * density));
+ }
+
+
+ void setSelectedIndicatorColors(int... colors)
+ {
+ mColorizer.setIndicatorColors(colors);
+ invalidate();
+ }
+
+
+ void setDividerColors(int... colors)
+ {
+ mColorizer.setDividerColors(colors);
+ invalidate();
+ }
+
+
+ void onViewPagerPageChanged(int position, float positionOffset)
+ {
+ mSelectedPosition = position;
+ mSelectionOffset = positionOffset;
+ invalidate();
+ }
+
+
+ @Override
+ protected void onDraw(Canvas canvas)
+ {
+ final int height = getHeight();
+ final int childCount = getChildCount();
+ final int dividerHeightPx = (int) (Math.min(Math.max(0f, mDividerHeight), 1f) * height);
+
+ // Thick colored underline below the current selection
+ if (childCount > 0)
+ {
+ View selectedTitle = getChildAt(mSelectedPosition);
+ int left = selectedTitle.getLeft();
+ int right = selectedTitle.getRight();
+ int color = mColorizer.getIndicatorColor(mSelectedPosition);
+
+ if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1))
+ {
+ int nextColor = mColorizer.getIndicatorColor(mSelectedPosition + 1);
+ if (color != nextColor)
+ {
+ color = blendColors(nextColor, color, mSelectionOffset);
+ }
+
+ // Draw the selection partway between the tabs
+ View nextTitle = getChildAt(mSelectedPosition + 1);
+ left = (int) (mSelectionOffset * nextTitle.getLeft() + (1.0f - mSelectionOffset) * left);
+ right = (int) (mSelectionOffset * nextTitle.getRight() + (1.0f - mSelectionOffset) * right);
+ }
+
+ mSelectedIndicatorPaint.setColor(color);
+
+ canvas.drawRect(left, height - mSelectedIndicatorThickness, right, height, mSelectedIndicatorPaint);
+ }
+
+ // Thin underline along the entire bottom edge
+ canvas.drawRect(0, height - mBottomDividerHeight, getWidth(), height, mBottomDividerPaint);
+
+ // Vertical separators between the titles && set title alpha
+ int separatorTop = (height - dividerHeightPx) / 2;
+ for (int i = 0; i < childCount; i++)
+ {
+ View child = getChildAt(i);
+
+ if (child == getChildAt(mSelectedPosition) && mSelectionOffset == 0)
+ {
+ child.setAlpha(1);
+ }
+ else
+ {
+ child.setAlpha(0.6f);
+ }
+
+ // don't draw separator for the last element
+ if (i != childCount - 1)
+ {
+ mDividerPaint.setColor(mColorizer.getDividerColor(i));
+ canvas.drawLine(child.getRight(), separatorTop, child.getRight(), separatorTop + dividerHeightPx, mDividerPaint);
+ }
+
+ }
+ }
+
+
+ /**
+ * Set the alpha value of the {@code color} to be the given {@code alpha} value.
+ */
+ private static int setColorAlpha(int color, byte alpha)
+ {
+ return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
+ }
+
+
+ /**
+ * Blend {@code color1} and {@code color2} using the given ratio.
+ *
+ * @param ratio
+ * of which to blend. 1.0 will return {@code color1}, 0.5 will give an even blend, 0.0 will return {@code color2}.
+ */
+ private static int blendColors(int color1, int color2, float ratio)
+ {
+ final float inverseRation = 1f - ratio;
+ float r = (Color.red(color1) * ratio) + (Color.red(color2) * inverseRation);
+ float g = (Color.green(color1) * ratio) + (Color.green(color2) * inverseRation);
+ float b = (Color.blue(color1) * ratio) + (Color.blue(color2) * inverseRation);
+ return Color.rgb((int) r, (int) g, (int) b);
+ }
+
+ private static class ColorizerImpl implements TabBarLayout.Colorizer
+ {
+ private int[] mIndicatorColors;
+ private int[] mDividerColors;
+
+
+ @Override
+ public final int getIndicatorColor(int position)
+ {
+ return mIndicatorColors[position % mIndicatorColors.length];
+ }
+
+
+ @Override
+ public final int getDividerColor(int position)
+ {
+ return mDividerColors[position % mDividerColors.length];
+ }
+
+
+ void setIndicatorColors(int... colors)
+ {
+ mIndicatorColors = colors;
+ }
+
+
+ void setDividerColors(int... colors)
+ {
+ mDividerColors = colors;
+ }
+ }
+
+}
diff --git a/UI/src/main/java/org/dmfs/webcal/views/TabBarLayout.java b/UI/src/main/java/org/dmfs/webcal/views/TabBarLayout.java
new file mode 100644
index 0000000..9ffde84
--- /dev/null
+++ b/UI/src/main/java/org/dmfs/webcal/views/TabBarLayout.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright (C) 2014 SchedJoules
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.dmfs.webcal.views;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.util.SparseArray;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+
+public class TabBarLayout extends HorizontalScrollView
+{
+
+ private static final int LABEL_MARGIN_LEFT = 24;
+ private static final int TAB_PADDING = 16;
+ private static final int LABEL_TEXT_SIZE = 12;
+
+ private int mLabelMarginLeft;
+ private TabBar mTabBar;
+
+ private int mTabViewLayoutId;
+ private int mTabViewTextViewId;
+
+ private ViewPager mViewPager;
+ private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
+ private boolean mDistributeEvenly = true;
+ private SparseArray mContentDescriptions = new SparseArray();
+
+
+ public TabBarLayout(Context context)
+ {
+ this(context, null);
+ }
+
+
+ public TabBarLayout(Context context, AttributeSet attrs)
+ {
+ this(context, attrs, 0);
+ }
+
+
+ public TabBarLayout(Context context, AttributeSet attrs, int defStyle)
+ {
+ super(context, attrs, defStyle);
+
+ setFillViewport(true);
+ setHorizontalScrollBarEnabled(false);
+
+ mLabelMarginLeft = (int) (LABEL_MARGIN_LEFT * getResources().getDisplayMetrics().density);
+
+ mTabBar = new TabBar(context);
+ addView(mTabBar, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+ }
+
+
+ /**
+ * Sets the colors to be used for indicating the selected tab. These colors are treated as a circular array. Providing one color will mean that all tabs are
+ * indicated with the same color.
+ */
+ public void setSelectedIndicatorColors(int... colors)
+ {
+ mTabBar.setSelectedIndicatorColors(colors);
+ }
+
+
+ /**
+ * Sets the colors to be used for tab dividers. These colors are treated as a circular array. Providing one color will mean that all tabs are indicated with
+ * the same color.
+ */
+ public void setDividerColors(int... colors)
+ {
+ mTabBar.setDividerColors(colors);
+ }
+
+
+ /**
+ * Set the {@link ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are required to set any {@link ViewPager.OnPageChangeListener}
+ * through this method. This is so that the layout can update it's scroll position correctly.
+ *
+ * @see ViewPager#setOnPageChangeListener(ViewPager.OnPageChangeListener)
+ */
+ public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener)
+ {
+ mViewPagerPageChangeListener = listener;
+ }
+
+
+ /**
+ * Set the custom layout to be inflated for the tab views.
+ *
+ * @param layoutResId
+ * Layout id to be inflated
+ * @param textViewId
+ * id of the {@link android.widget.TextView} in the inflated view
+ */
+ public void setCustomTabView(int layoutResId, int textViewId)
+ {
+ mTabViewLayoutId = layoutResId;
+ mTabViewTextViewId = textViewId;
+ }
+
+
+ /**
+ * Sets the associated view pager. Note that the assumption here is that the pager content (number of tabs and tab titles) does not change after this call
+ * has been made.
+ */
+ public void setViewPager(ViewPager viewPager)
+ {
+ mTabBar.removeAllViews();
+
+ mViewPager = viewPager;
+ if (viewPager != null)
+ {
+ viewPager.setOnPageChangeListener(new InternalViewPagerListener());
+ populateTabStrip();
+ }
+ }
+
+
+ /**
+ * Create a default view to be used for tabs. This is called if a custom tab view is not set via {@link #setCustomTabView(int, int)}.
+ */
+ protected TextView createDefaultTabView(Context context)
+ {
+ TextView textView = new TextView(context);
+ textView.setGravity(Gravity.CENTER);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, LABEL_TEXT_SIZE);
+ textView.setTypeface(Typeface.DEFAULT_BOLD);
+ textView.setTextColor(Color.WHITE);
+ textView.setSingleLine();
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+ {
+ // If we're running on Honeycomb or newer, then we can use the Theme's
+ // selectableItemBackground to ensure that the View has a pressed state
+ TypedValue outValue = new TypedValue();
+ getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
+ textView.setBackgroundResource(outValue.resourceId);
+ }
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+ {
+ // If we're running on ICS or newer, enable all-caps to match the Action Bar tab style
+ textView.setAllCaps(true);
+ }
+
+ int padding = (int) (TAB_PADDING * getResources().getDisplayMetrics().density);
+ textView.setPadding(padding, padding, padding, padding);
+
+ return textView;
+ }
+
+
+ private void populateTabStrip()
+ {
+
+ final PagerAdapter adapter = mViewPager.getAdapter();
+ final View.OnClickListener tabClickListener = new TabClickListener();
+ int count = adapter.getCount();
+ if (count == 0)
+ {
+ setVisibility(View.GONE);
+ }
+ else
+ {
+ setVisibility(View.VISIBLE);
+ }
+
+ for (int i = 0; i < count; i++)
+ {
+ View tabView = null;
+ TextView tabTitleView = null;
+ if (mTabViewLayoutId != 0)
+ {
+ // If there is a custom tab view layout id set, try and inflate it
+ tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabBar, false);
+ tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
+ }
+ if (tabView == null)
+ {
+ tabView = createDefaultTabView(getContext());
+ }
+ if (tabTitleView == null && TextView.class.isInstance(tabView))
+ {
+ tabTitleView = (TextView) tabView;
+ }
+
+ tabTitleView.setText(adapter.getPageTitle(i));
+ tabView.setOnClickListener(tabClickListener);
+ String desc = mContentDescriptions.get(i, null);
+ if (desc != null)
+ {
+ tabView.setContentDescription(desc);
+ }
+ mTabBar.addView(tabView);
+
+ if (mDistributeEvenly)
+ {
+ LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) tabView.getLayoutParams();
+ if (lp != null)
+ {
+ lp.weight = 1;
+ }
+
+ }
+ }
+ }
+
+
+ public void notifyDataSetChanged()
+ {
+ populateTabStrip();
+
+ }
+
+
+ @Override
+ protected void onAttachedToWindow()
+ {
+ super.onAttachedToWindow();
+
+ if (mViewPager != null)
+ {
+ scrollToTab(mViewPager.getCurrentItem(), 0);
+ }
+ }
+
+
+ private void scrollToTab(int tabIndex, int positionOffset)
+ {
+ final int tabStripChildCount = mTabBar.getChildCount();
+ if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount)
+ {
+ return;
+ }
+
+ View selectedChild = mTabBar.getChildAt(tabIndex);
+ if (selectedChild != null)
+ {
+ int targetScrollX = selectedChild.getLeft() + positionOffset;
+
+ if (tabIndex > 0 || positionOffset > 0)
+ {
+ // If we're not at the first child and are mid-scroll, make sure we obey the offset
+ targetScrollX -= mLabelMarginLeft;
+ }
+
+ scrollTo(targetScrollX, 0);
+ }
+ }
+
+ public interface Colorizer
+ {
+ int getIndicatorColor(int position);
+
+
+ int getDividerColor(int position);
+
+ }
+
+ private class InternalViewPagerListener implements ViewPager.OnPageChangeListener
+ {
+ private int mScrollState;
+
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
+ {
+ int tabStripChildCount = mTabBar.getChildCount();
+ if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount))
+ {
+ return;
+ }
+
+ mTabBar.onViewPagerPageChanged(position, positionOffset);
+
+ View selectedTitle = mTabBar.getChildAt(position);
+ int extraOffset = (selectedTitle != null) ? (int) (positionOffset * selectedTitle.getWidth()) : 0;
+ scrollToTab(position, extraOffset);
+
+ if (mViewPagerPageChangeListener != null)
+ {
+ mViewPagerPageChangeListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
+ }
+ }
+
+
+ @Override
+ public void onPageScrollStateChanged(int state)
+ {
+ mScrollState = state;
+
+ if (mViewPagerPageChangeListener != null)
+ {
+ mViewPagerPageChangeListener.onPageScrollStateChanged(state);
+ }
+ }
+
+
+ @Override
+ public void onPageSelected(int position)
+ {
+ if (mScrollState == ViewPager.SCROLL_STATE_IDLE)
+ {
+ mTabBar.onViewPagerPageChanged(position, 0f);
+ scrollToTab(position, 0);
+ }
+
+ if (mViewPagerPageChangeListener != null)
+ {
+ mViewPagerPageChangeListener.onPageSelected(position);
+ }
+ }
+
+ }
+
+ private class TabClickListener implements View.OnClickListener
+ {
+ @Override
+ public void onClick(View v)
+ {
+ for (int i = 0; i < mTabBar.getChildCount(); i++)
+ {
+ if (v == mTabBar.getChildAt(i))
+ {
+ mViewPager.setCurrentItem(i);
+ return;
+ }
+ }
+ }
+ }
+
+}
diff --git a/UI/res/color/text_color_free_trial.xml b/UI/src/main/res/color/text_color_free_trial.xml
similarity index 100%
rename from UI/res/color/text_color_free_trial.xml
rename to UI/src/main/res/color/text_color_free_trial.xml
diff --git a/UI/res/drawable-hdpi/drawer_shadow.9.png b/UI/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from UI/res/drawable-hdpi/drawer_shadow.9.png
rename to UI/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/UI/res/drawable-hdpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-hdpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-hdpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-hdpi/ic_24_country_black50.png b/UI/src/main/res/drawable-hdpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-hdpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-hdpi/ic_24_settings_white.png b/UI/src/main/res/drawable-hdpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-hdpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-hdpi/ic_action_new_event_dark.png b/UI/src/main/res/drawable-hdpi/ic_action_new_event_dark.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_action_new_event_dark.png
rename to UI/src/main/res/drawable-hdpi/ic_action_new_event_dark.png
diff --git a/UI/res/drawable-hdpi/ic_action_new_event_light.png b/UI/src/main/res/drawable-hdpi/ic_action_new_event_light.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_action_new_event_light.png
rename to UI/src/main/res/drawable-hdpi/ic_action_new_event_light.png
diff --git a/UI/res/drawable-hdpi/ic_action_settings_dark.png b/UI/src/main/res/drawable-hdpi/ic_action_settings_dark.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_action_settings_dark.png
rename to UI/src/main/res/drawable-hdpi/ic_action_settings_dark.png
diff --git a/UI/res/drawable-hdpi/ic_action_settings_light.png b/UI/src/main/res/drawable-hdpi/ic_action_settings_light.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_action_settings_light.png
rename to UI/src/main/res/drawable-hdpi/ic_action_settings_light.png
diff --git a/UI/res/drawable-hdpi/ic_allcalendars.png b/UI/src/main/res/drawable-hdpi/ic_allcalendars.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_allcalendars.png
rename to UI/src/main/res/drawable-hdpi/ic_allcalendars.png
diff --git a/UI/res/drawable-hdpi/ic_drawer.png b/UI/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_drawer.png
rename to UI/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/UI/res/drawable-hdpi/ic_faq.png b/UI/src/main/res/drawable-hdpi/ic_faq.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_faq.png
rename to UI/src/main/res/drawable-hdpi/ic_faq.png
diff --git a/UI/res/drawable-hdpi/ic_favouites.png b/UI/src/main/res/drawable-hdpi/ic_favouites.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_favouites.png
rename to UI/src/main/res/drawable-hdpi/ic_favouites.png
diff --git a/UI/res/drawable-hdpi/ic_feedback.png b/UI/src/main/res/drawable-hdpi/ic_feedback.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_feedback.png
rename to UI/src/main/res/drawable-hdpi/ic_feedback.png
diff --git a/UI/res/drawable-hdpi/ic_mycalendars.png b/UI/src/main/res/drawable-hdpi/ic_mycalendars.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_mycalendars.png
rename to UI/src/main/res/drawable-hdpi/ic_mycalendars.png
diff --git a/UI/res/drawable-hdpi/ic_settings.png b/UI/src/main/res/drawable-hdpi/ic_settings.png
similarity index 100%
rename from UI/res/drawable-hdpi/ic_settings.png
rename to UI/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/UI/res/drawable-ldpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-ldpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-ldpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-ldpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-ldpi/ic_24_country_black50.png b/UI/src/main/res/drawable-ldpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-ldpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-ldpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-ldpi/ic_24_settings_white.png b/UI/src/main/res/drawable-ldpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-ldpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-ldpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-mdpi/drawer_shadow.9.png b/UI/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from UI/res/drawable-mdpi/drawer_shadow.9.png
rename to UI/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/UI/res/drawable-mdpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-mdpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-mdpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-mdpi/ic_24_country_black50.png b/UI/src/main/res/drawable-mdpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-mdpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-mdpi/ic_24_settings_white.png b/UI/src/main/res/drawable-mdpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-mdpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-mdpi/ic_action_new_event_dark.png b/UI/src/main/res/drawable-mdpi/ic_action_new_event_dark.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_action_new_event_dark.png
rename to UI/src/main/res/drawable-mdpi/ic_action_new_event_dark.png
diff --git a/UI/res/drawable-mdpi/ic_action_new_event_light.png b/UI/src/main/res/drawable-mdpi/ic_action_new_event_light.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_action_new_event_light.png
rename to UI/src/main/res/drawable-mdpi/ic_action_new_event_light.png
diff --git a/UI/res/drawable-mdpi/ic_action_settings_dark.png b/UI/src/main/res/drawable-mdpi/ic_action_settings_dark.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_action_settings_dark.png
rename to UI/src/main/res/drawable-mdpi/ic_action_settings_dark.png
diff --git a/UI/res/drawable-mdpi/ic_action_settings_light.png b/UI/src/main/res/drawable-mdpi/ic_action_settings_light.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_action_settings_light.png
rename to UI/src/main/res/drawable-mdpi/ic_action_settings_light.png
diff --git a/UI/res/drawable-mdpi/ic_allcalendars.png b/UI/src/main/res/drawable-mdpi/ic_allcalendars.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_allcalendars.png
rename to UI/src/main/res/drawable-mdpi/ic_allcalendars.png
diff --git a/UI/res/drawable-mdpi/ic_drawer.png b/UI/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_drawer.png
rename to UI/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/UI/res/drawable-mdpi/ic_faq.png b/UI/src/main/res/drawable-mdpi/ic_faq.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_faq.png
rename to UI/src/main/res/drawable-mdpi/ic_faq.png
diff --git a/UI/res/drawable-mdpi/ic_favouites.png b/UI/src/main/res/drawable-mdpi/ic_favouites.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_favouites.png
rename to UI/src/main/res/drawable-mdpi/ic_favouites.png
diff --git a/UI/res/drawable-mdpi/ic_feedback.png b/UI/src/main/res/drawable-mdpi/ic_feedback.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_feedback.png
rename to UI/src/main/res/drawable-mdpi/ic_feedback.png
diff --git a/UI/res/drawable-mdpi/ic_mycalendars.png b/UI/src/main/res/drawable-mdpi/ic_mycalendars.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_mycalendars.png
rename to UI/src/main/res/drawable-mdpi/ic_mycalendars.png
diff --git a/UI/res/drawable-mdpi/ic_settings.png b/UI/src/main/res/drawable-mdpi/ic_settings.png
similarity index 100%
rename from UI/res/drawable-mdpi/ic_settings.png
rename to UI/src/main/res/drawable-mdpi/ic_settings.png
diff --git a/UI/res/drawable-xhdpi/drawer_shadow.9.png b/UI/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from UI/res/drawable-xhdpi/drawer_shadow.9.png
rename to UI/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/UI/res/drawable-xhdpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-xhdpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-xhdpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-xhdpi/ic_24_country_black50.png b/UI/src/main/res/drawable-xhdpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-xhdpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-xhdpi/ic_24_settings_white.png b/UI/src/main/res/drawable-xhdpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-xhdpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-xhdpi/ic_action_new_event_dark.png b/UI/src/main/res/drawable-xhdpi/ic_action_new_event_dark.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_action_new_event_dark.png
rename to UI/src/main/res/drawable-xhdpi/ic_action_new_event_dark.png
diff --git a/UI/res/drawable-xhdpi/ic_action_new_event_light.png b/UI/src/main/res/drawable-xhdpi/ic_action_new_event_light.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_action_new_event_light.png
rename to UI/src/main/res/drawable-xhdpi/ic_action_new_event_light.png
diff --git a/UI/res/drawable-xhdpi/ic_action_settings_dark.png b/UI/src/main/res/drawable-xhdpi/ic_action_settings_dark.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_action_settings_dark.png
rename to UI/src/main/res/drawable-xhdpi/ic_action_settings_dark.png
diff --git a/UI/res/drawable-xhdpi/ic_action_settings_light.png b/UI/src/main/res/drawable-xhdpi/ic_action_settings_light.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_action_settings_light.png
rename to UI/src/main/res/drawable-xhdpi/ic_action_settings_light.png
diff --git a/UI/res/drawable-xhdpi/ic_allcalendars.png b/UI/src/main/res/drawable-xhdpi/ic_allcalendars.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_allcalendars.png
rename to UI/src/main/res/drawable-xhdpi/ic_allcalendars.png
diff --git a/UI/res/drawable-xhdpi/ic_drawer.png b/UI/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_drawer.png
rename to UI/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/UI/res/drawable-xhdpi/ic_faq.png b/UI/src/main/res/drawable-xhdpi/ic_faq.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_faq.png
rename to UI/src/main/res/drawable-xhdpi/ic_faq.png
diff --git a/UI/res/drawable-xhdpi/ic_favouites.png b/UI/src/main/res/drawable-xhdpi/ic_favouites.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_favouites.png
rename to UI/src/main/res/drawable-xhdpi/ic_favouites.png
diff --git a/UI/res/drawable-xhdpi/ic_feedback.png b/UI/src/main/res/drawable-xhdpi/ic_feedback.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_feedback.png
rename to UI/src/main/res/drawable-xhdpi/ic_feedback.png
diff --git a/UI/res/drawable-xhdpi/ic_mycalendars.png b/UI/src/main/res/drawable-xhdpi/ic_mycalendars.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_mycalendars.png
rename to UI/src/main/res/drawable-xhdpi/ic_mycalendars.png
diff --git a/UI/res/drawable-xhdpi/ic_settings.png b/UI/src/main/res/drawable-xhdpi/ic_settings.png
similarity index 100%
rename from UI/res/drawable-xhdpi/ic_settings.png
rename to UI/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/UI/res/drawable-xxhdpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-xxhdpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-xxhdpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-xxhdpi/ic_24_country_black50.png b/UI/src/main/res/drawable-xxhdpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-xxhdpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-xxhdpi/ic_24_settings_white.png b/UI/src/main/res/drawable-xxhdpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-xxhdpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-xxhdpi/ic_action_new_event_dark.png b/UI/src/main/res/drawable-xxhdpi/ic_action_new_event_dark.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_action_new_event_dark.png
rename to UI/src/main/res/drawable-xxhdpi/ic_action_new_event_dark.png
diff --git a/UI/res/drawable-xxhdpi/ic_action_new_event_light.png b/UI/src/main/res/drawable-xxhdpi/ic_action_new_event_light.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_action_new_event_light.png
rename to UI/src/main/res/drawable-xxhdpi/ic_action_new_event_light.png
diff --git a/UI/res/drawable-xxhdpi/ic_action_settings_dark.png b/UI/src/main/res/drawable-xxhdpi/ic_action_settings_dark.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_action_settings_dark.png
rename to UI/src/main/res/drawable-xxhdpi/ic_action_settings_dark.png
diff --git a/UI/res/drawable-xxhdpi/ic_action_settings_light.png b/UI/src/main/res/drawable-xxhdpi/ic_action_settings_light.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_action_settings_light.png
rename to UI/src/main/res/drawable-xxhdpi/ic_action_settings_light.png
diff --git a/UI/res/drawable-xxhdpi/ic_allcalendars.png b/UI/src/main/res/drawable-xxhdpi/ic_allcalendars.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_allcalendars.png
rename to UI/src/main/res/drawable-xxhdpi/ic_allcalendars.png
diff --git a/UI/res/drawable-xxhdpi/ic_fa_star.png b/UI/src/main/res/drawable-xxhdpi/ic_fa_star.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_fa_star.png
rename to UI/src/main/res/drawable-xxhdpi/ic_fa_star.png
diff --git a/UI/res/drawable-xxhdpi/ic_fa_star_o.png b/UI/src/main/res/drawable-xxhdpi/ic_fa_star_o.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_fa_star_o.png
rename to UI/src/main/res/drawable-xxhdpi/ic_fa_star_o.png
diff --git a/UI/res/drawable-xxhdpi/ic_faq.png b/UI/src/main/res/drawable-xxhdpi/ic_faq.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_faq.png
rename to UI/src/main/res/drawable-xxhdpi/ic_faq.png
diff --git a/UI/res/drawable-xxhdpi/ic_favouites.png b/UI/src/main/res/drawable-xxhdpi/ic_favouites.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_favouites.png
rename to UI/src/main/res/drawable-xxhdpi/ic_favouites.png
diff --git a/UI/res/drawable-xxhdpi/ic_feedback.png b/UI/src/main/res/drawable-xxhdpi/ic_feedback.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_feedback.png
rename to UI/src/main/res/drawable-xxhdpi/ic_feedback.png
diff --git a/UI/res/drawable-xxhdpi/ic_mycalendars.png b/UI/src/main/res/drawable-xxhdpi/ic_mycalendars.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_mycalendars.png
rename to UI/src/main/res/drawable-xxhdpi/ic_mycalendars.png
diff --git a/UI/res/drawable-xxhdpi/ic_settings.png b/UI/src/main/res/drawable-xxhdpi/ic_settings.png
similarity index 100%
rename from UI/res/drawable-xxhdpi/ic_settings.png
rename to UI/src/main/res/drawable-xxhdpi/ic_settings.png
diff --git a/UI/res/drawable-xxxhdpi/ic_24_analytics_black50.png b/UI/src/main/res/drawable-xxxhdpi/ic_24_analytics_black50.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_24_analytics_black50.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_24_analytics_black50.png
diff --git a/UI/res/drawable-xxxhdpi/ic_24_country_black50.png b/UI/src/main/res/drawable-xxxhdpi/ic_24_country_black50.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_24_country_black50.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_24_country_black50.png
diff --git a/UI/res/drawable-xxxhdpi/ic_24_settings_white.png b/UI/src/main/res/drawable-xxxhdpi/ic_24_settings_white.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_24_settings_white.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_24_settings_white.png
diff --git a/UI/res/drawable-xxxhdpi/ic_allcalendars.png b/UI/src/main/res/drawable-xxxhdpi/ic_allcalendars.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_allcalendars.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_allcalendars.png
diff --git a/UI/res/drawable-xxxhdpi/ic_faq.png b/UI/src/main/res/drawable-xxxhdpi/ic_faq.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_faq.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_faq.png
diff --git a/UI/res/drawable-xxxhdpi/ic_favouites.png b/UI/src/main/res/drawable-xxxhdpi/ic_favouites.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_favouites.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_favouites.png
diff --git a/UI/res/drawable-xxxhdpi/ic_feedback.png b/UI/src/main/res/drawable-xxxhdpi/ic_feedback.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_feedback.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_feedback.png
diff --git a/UI/res/drawable-xxxhdpi/ic_mycalendars.png b/UI/src/main/res/drawable-xxxhdpi/ic_mycalendars.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_mycalendars.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_mycalendars.png
diff --git a/UI/res/drawable-xxxhdpi/ic_settings.png b/UI/src/main/res/drawable-xxxhdpi/ic_settings.png
similarity index 100%
rename from UI/res/drawable-xxxhdpi/ic_settings.png
rename to UI/src/main/res/drawable-xxxhdpi/ic_settings.png
diff --git a/UI/res/drawable/background_edittext.xml b/UI/src/main/res/drawable/background_edittext.xml
similarity index 100%
rename from UI/res/drawable/background_edittext.xml
rename to UI/src/main/res/drawable/background_edittext.xml
diff --git a/UI/res/drawable/background_edittext_active.xml b/UI/src/main/res/drawable/background_edittext_active.xml
similarity index 93%
rename from UI/res/drawable/background_edittext_active.xml
rename to UI/src/main/res/drawable/background_edittext_active.xml
index e358ae4..cbd9879 100644
--- a/UI/res/drawable/background_edittext_active.xml
+++ b/UI/src/main/res/drawable/background_edittext_active.xml
@@ -1,4 +1,4 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/res/layout/activity_preferences.xml b/UI/src/main/res/layout/activity_preferences.xml
similarity index 100%
rename from UI/res/layout/activity_preferences.xml
rename to UI/src/main/res/layout/activity_preferences.xml
diff --git a/UI/res/layout/calendar_entry_item.xml b/UI/src/main/res/layout/calendar_entry_item.xml
similarity index 67%
rename from UI/res/layout/calendar_entry_item.xml
rename to UI/src/main/res/layout/calendar_entry_item.xml
index 70602b2..be25714 100644
--- a/UI/res/layout/calendar_entry_item.xml
+++ b/UI/src/main/res/layout/calendar_entry_item.xml
@@ -1,16 +1,17 @@
+ android:background="@android:color/white">
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp">
@@ -43,31 +43,35 @@
android:layout_centerVertical="true"
android:focusable="false" />
-
+ android:orientation="vertical">
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/res/layout/events_preview_list_item.xml b/UI/src/main/res/layout/events_preview_list_item.xml
similarity index 100%
rename from UI/res/layout/events_preview_list_item.xml
rename to UI/src/main/res/layout/events_preview_list_item.xml
diff --git a/UI/res/layout/events_preview_list_section_header.xml b/UI/src/main/res/layout/events_preview_list_section_header.xml
similarity index 79%
rename from UI/res/layout/events_preview_list_section_header.xml
rename to UI/src/main/res/layout/events_preview_list_section_header.xml
index 7d9d5a0..c96c3c1 100644
--- a/UI/res/layout/events_preview_list_section_header.xml
+++ b/UI/src/main/res/layout/events_preview_list_section_header.xml
@@ -2,9 +2,9 @@
+ android:paddingRight="8dp">
+ android:textColor="?attr/colorPrimary" />
\ No newline at end of file
diff --git a/UI/src/main/res/layout/events_preview_list_section_header_flat.xml b/UI/src/main/res/layout/events_preview_list_section_header_flat.xml
new file mode 100644
index 0000000..d7b74fc
--- /dev/null
+++ b/UI/src/main/res/layout/events_preview_list_section_header_flat.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/res/layout/fragment_calendar_item.xml b/UI/src/main/res/layout/fragment_calendar_item.xml
similarity index 58%
rename from UI/res/layout/fragment_calendar_item.xml
rename to UI/src/main/res/layout/fragment_calendar_item.xml
index e4c4470..59e03d7 100644
--- a/UI/res/layout/fragment_calendar_item.xml
+++ b/UI/src/main/res/layout/fragment_calendar_item.xml
@@ -1,23 +1,21 @@
+ android:orientation="vertical">
-
+ android:layout_height="wrap_content">
-
+ android:layout_height="wrap_content">
+ android:layout_height="match_parent">
-
+ android:paddingRight="8sp">
-
-
-
-
+ android:layout_height="@dimen/toolbar_shadow_height" />
\ No newline at end of file
diff --git a/UI/res/layout/fragment_calendar_settings.xml b/UI/src/main/res/layout/fragment_calendar_settings.xml
similarity index 100%
rename from UI/res/layout/fragment_calendar_settings.xml
rename to UI/src/main/res/layout/fragment_calendar_settings.xml
diff --git a/UI/res/layout/fragment_calendar_sync_button.xml b/UI/src/main/res/layout/fragment_calendar_sync_button.xml
similarity index 78%
rename from UI/res/layout/fragment_calendar_sync_button.xml
rename to UI/src/main/res/layout/fragment_calendar_sync_button.xml
index 43f5684..6c2d826 100644
--- a/UI/res/layout/fragment_calendar_sync_button.xml
+++ b/UI/src/main/res/layout/fragment_calendar_sync_button.xml
@@ -2,9 +2,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/primaryColorShaded"
+ android:background="?attr/colorPrimary"
android:orientation="vertical"
- tools:context=".MainActivity" >
+ tools:context=".MainActivity">
+ android:paddingBottom="8dp"
+ android:paddingEnd="14dp"
+ android:paddingLeft="18dp"
+ android:paddingRight="14dp"
+ android:paddingStart="18dp"
+ android:paddingTop="8dp"
+ android:visibility="gone">
diff --git a/UI/res/layout/fragment_events_preview_detail.xml b/UI/src/main/res/layout/fragment_events_preview_detail.xml
similarity index 100%
rename from UI/res/layout/fragment_events_preview_detail.xml
rename to UI/src/main/res/layout/fragment_events_preview_detail.xml
diff --git a/UI/res/layout/fragment_input_text_dialog.xml b/UI/src/main/res/layout/fragment_input_text_dialog.xml
similarity index 90%
rename from UI/res/layout/fragment_input_text_dialog.xml
rename to UI/src/main/res/layout/fragment_input_text_dialog.xml
index 7229d5f..1f084aa 100644
--- a/UI/res/layout/fragment_input_text_dialog.xml
+++ b/UI/src/main/res/layout/fragment_input_text_dialog.xml
@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
- android:padding="8dp" >
+ android:padding="8dp">
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
- android:orientation="horizontal" >
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/res/layout/fragment_purchasable_item.xml b/UI/src/main/res/layout/fragment_purchasable_item.xml
similarity index 92%
rename from UI/res/layout/fragment_purchasable_item.xml
rename to UI/src/main/res/layout/fragment_purchasable_item.xml
index c5fa7ca..e8da971 100644
--- a/UI/res/layout/fragment_purchasable_item.xml
+++ b/UI/src/main/res/layout/fragment_purchasable_item.xml
@@ -1,13 +1,13 @@
+ android:orientation="vertical">
+ android:visibility="gone">
+ android:gravity="center_vertical|right">
+ android:visibility="gone">
-
+ android:layout_weight="1">
\ No newline at end of file
diff --git a/UI/res/layout/fragment_purchase_dialog.xml b/UI/src/main/res/layout/fragment_purchase_dialog.xml
similarity index 100%
rename from UI/res/layout/fragment_purchase_dialog.xml
rename to UI/src/main/res/layout/fragment_purchase_dialog.xml
diff --git a/UI/res/layout/fragment_webcal_preferences.xml b/UI/src/main/res/layout/fragment_webcal_preferences.xml
similarity index 100%
rename from UI/res/layout/fragment_webcal_preferences.xml
rename to UI/src/main/res/layout/fragment_webcal_preferences.xml
diff --git a/UI/res/layout/generic_list.xml b/UI/src/main/res/layout/generic_list.xml
similarity index 76%
rename from UI/res/layout/generic_list.xml
rename to UI/src/main/res/layout/generic_list.xml
index c8ac8cd..75a042b 100644
--- a/UI/res/layout/generic_list.xml
+++ b/UI/src/main/res/layout/generic_list.xml
@@ -2,18 +2,16 @@
+ android:layout_height="match_parent">
-
+ android:dividerHeight="0px"
+ tools:listitem="@layout/page_entry_item" />
+ android:background="@android:color/white">
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp">
-
+ android:orientation="vertical">
-
+
+
+
+
\ No newline at end of file
diff --git a/UI/res/menu/calendar_item.xml b/UI/src/main/res/menu/calendar_item.xml
similarity index 73%
rename from UI/res/menu/calendar_item.xml
rename to UI/src/main/res/menu/calendar_item.xml
index ed58f3f..e06a0f0 100644
--- a/UI/res/menu/calendar_item.xml
+++ b/UI/src/main/res/menu/calendar_item.xml
@@ -1,13 +1,14 @@
-