Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Francesco Furlan committed Jul 5, 2017
2 parents 4578e67 + 6b9dd91 commit 8e10021
Show file tree
Hide file tree
Showing 59 changed files with 162 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library;
package com.molo17.customizablecalendar.library;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand All @@ -7,7 +7,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;

/**
* Instrumentation test, which will execute on an Android device.
Expand All @@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.francesco.furlan.customcizablecalendar.library.test", appContext.getPackageName());
assertEquals("com.molo17.customizablecalendar.library.test", appContext.getPackageName());
}
}
6 changes: 2 additions & 4 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.francesco.furlan.customizablecalendar.library">

<application
android:allowBackup="true"
android:label="@string/app_name"
package="com.molo17.customizablecalendar.library">

<application android:allowBackup="true" android:label="@string/app_name"
android:supportsRtl="true">

</application>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.adapter;
package com.molo17.customizablecalendar.library.adapter;

import android.content.Context;
import android.support.annotation.LayoutRes;
Expand All @@ -8,12 +8,12 @@
import android.view.ViewGroup;
import android.widget.LinearLayout;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.components.MonthGridView;
import com.francesco.furlan.customizablecalendar.library.interactors.AUCalendar;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.francesco.furlan.customizablecalendar.library.view.BaseView;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.components.MonthGridView;
import com.molo17.customizablecalendar.library.interactors.AUCalendar;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.view.BaseView;

/**
* Created by francescofurlan on 23/06/17.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.adapter;
package com.molo17.customizablecalendar.library.adapter;

import android.content.Context;
import android.graphics.Color;
Expand All @@ -9,14 +9,14 @@
import android.widget.BaseAdapter;
import android.widget.TextView;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.interactors.AUCalendar;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.model.CalendarFields;
import com.francesco.furlan.customizablecalendar.library.model.CalendarItem;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.francesco.furlan.customizablecalendar.library.utils.DateUtils;
import com.francesco.furlan.customizablecalendar.library.view.MonthView;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.interactors.AUCalendar;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.model.CalendarFields;
import com.molo17.customizablecalendar.library.model.CalendarItem;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.utils.DateUtils;
import com.molo17.customizablecalendar.library.view.MonthView;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.adapter;
package com.molo17.customizablecalendar.library.adapter;

import android.content.Context;
import android.support.annotation.LayoutRes;
Expand All @@ -8,7 +8,7 @@
import android.view.ViewGroup;
import android.widget.TextView;

import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -10,12 +10,12 @@
import android.util.AttributeSet;
import android.view.View;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.adapter.CalendarViewAdapter;
import com.francesco.furlan.customizablecalendar.library.interactors.AUCalendar;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.francesco.furlan.customizablecalendar.library.view.CalendarView;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.adapter.CalendarViewAdapter;
import com.molo17.customizablecalendar.library.interactors.AUCalendar;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.view.CalendarView;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -7,11 +7,11 @@
import android.view.LayoutInflater;
import android.widget.LinearLayout;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.implementations.CustomizableCalendarPresenterImpl;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.francesco.furlan.customizablecalendar.library.view.CustomizableCalendarView;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.implementations.CustomizableCalendarPresenterImpl;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.view.CustomizableCalendarView;

import butterknife.ButterKnife;
import butterknife.InjectView;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.support.annotation.LayoutRes;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.RelativeLayout;

import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;

/**
* Created by francescofurlan on 23/06/17.
*/

public class HeaderView extends RelativeLayout implements com.francesco.furlan.customizablecalendar.library.view.HeaderView {
public class HeaderView extends RelativeLayout implements com.molo17.customizablecalendar.library.view.HeaderView {
private CustomizableCalendarPresenter presenter;
private ViewInteractor viewInteractor;
private Context context;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -9,12 +9,12 @@
import android.widget.GridView;
import android.widget.LinearLayout;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.adapter.MonthAdapter;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.model.CalendarItem;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.francesco.furlan.customizablecalendar.library.view.BaseView;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.adapter.MonthAdapter;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.model.CalendarItem;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.view.BaseView;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -9,10 +9,10 @@
import android.widget.RelativeLayout;
import android.widget.TextView;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.interactors.AUCalendar;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.interactors.AUCalendar;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;

import org.joda.time.DateTime;

Expand All @@ -25,7 +25,7 @@
* Created by francescofurlan on 23/06/17.
*/

public class SubView extends RelativeLayout implements com.francesco.furlan.customizablecalendar.library.view.SubView {
public class SubView extends RelativeLayout implements com.molo17.customizablecalendar.library.view.SubView {
@InjectView(android.R.id.message)
TextView monthTxt;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.components;
package com.molo17.customizablecalendar.library.components;

import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -9,11 +9,11 @@
import android.text.TextUtils;
import android.util.AttributeSet;

import com.francesco.furlan.customizablecalendar.library.R;
import com.francesco.furlan.customizablecalendar.library.adapter.WeekDaysViewAdapter;
import com.francesco.furlan.customizablecalendar.library.interactors.AUCalendar;
import com.francesco.furlan.customizablecalendar.library.interactors.ViewInteractor;
import com.francesco.furlan.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;
import com.molo17.customizablecalendar.library.R;
import com.molo17.customizablecalendar.library.adapter.WeekDaysViewAdapter;
import com.molo17.customizablecalendar.library.interactors.AUCalendar;
import com.molo17.customizablecalendar.library.interactors.ViewInteractor;
import com.molo17.customizablecalendar.library.presenter.interfeaces.CustomizableCalendarPresenter;

import java.text.DateFormatSymbols;
import java.util.ArrayList;
Expand All @@ -24,7 +24,7 @@
* Created by francescofurlan on 23/06/17.
*/

public class WeekDaysView extends RecyclerView implements com.francesco.furlan.customizablecalendar.library.view.WeekDaysView {
public class WeekDaysView extends RecyclerView implements com.molo17.customizablecalendar.library.view.WeekDaysView {
WeekDaysViewAdapter weekDaysViewAdapter;
private Context context;
private @LayoutRes int layoutResId = -1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.francesco.furlan.customizablecalendar.library.interactors;
package com.molo17.customizablecalendar.library.interactors;

import com.francesco.furlan.customizablecalendar.library.model.Calendar;
import com.francesco.furlan.customizablecalendar.library.model.CalendarFields;
import com.molo17.customizablecalendar.library.model.Calendar;
import com.molo17.customizablecalendar.library.model.CalendarFields;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.interactors;
package com.molo17.customizablecalendar.library.interactors;

import android.support.annotation.LayoutRes;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.molo17.customizablecalendar.library.interactors;

import com.molo17.customizablecalendar.library.view.CalendarView;
import com.molo17.customizablecalendar.library.view.HeaderView;
import com.molo17.customizablecalendar.library.view.SubView;
import com.molo17.customizablecalendar.library.view.WeekDaysView;

/**
* Created by francescofurlan on 30/06/17.
*/

public interface ViewInjector {
void injectCalendarView(CalendarView calendarView);

void injectHeaderView(HeaderView headerView);

void injectSubView(SubView subView);

void injectWeekDaysView(WeekDaysView weekDaysView);
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.francesco.furlan.customizablecalendar.library.interactors;
package com.molo17.customizablecalendar.library.interactors;

import android.view.View;
import android.view.ViewGroup;

import com.francesco.furlan.customizablecalendar.library.adapter.WeekDaysViewAdapter;
import com.francesco.furlan.customizablecalendar.library.model.CalendarItem;
import com.molo17.customizablecalendar.library.adapter.WeekDaysViewAdapter;
import com.molo17.customizablecalendar.library.model.CalendarItem;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.model;
package com.molo17.customizablecalendar.library.model;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.francesco.furlan.customizablecalendar.library.model;
package com.molo17.customizablecalendar.library.model;

import android.support.annotation.StringDef;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.CURRENT_MONTH;
import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.FIRST_DAY_OF_WEEK;
import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.FIRST_SELECTED_DAY;
import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.LAST_SELECTED_DAY;
import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.MONTHS;
import static com.francesco.furlan.customizablecalendar.library.model.CalendarFields.MULTIPLE_SELECTION;
import static com.molo17.customizablecalendar.library.model.CalendarFields.CURRENT_MONTH;
import static com.molo17.customizablecalendar.library.model.CalendarFields.FIRST_DAY_OF_WEEK;
import static com.molo17.customizablecalendar.library.model.CalendarFields.FIRST_SELECTED_DAY;
import static com.molo17.customizablecalendar.library.model.CalendarFields.LAST_SELECTED_DAY;
import static com.molo17.customizablecalendar.library.model.CalendarFields.MONTHS;
import static com.molo17.customizablecalendar.library.model.CalendarFields.MULTIPLE_SELECTION;

/**
* Created by francescofurlan on 30/06/17.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.francesco.furlan.customizablecalendar.library.model;
package com.molo17.customizablecalendar.library.model;

import org.joda.time.DateTime;

Expand Down
Loading

0 comments on commit 8e10021

Please sign in to comment.