diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 49695e648..847541a25 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -11,6 +11,7 @@ import android.view.View import com.simplemobiletools.calendar.BuildConfig import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.adapters.MyMonthPagerAdapter +import com.simplemobiletools.calendar.adapters.MyWeekPagerAdapter import com.simplemobiletools.calendar.adapters.MyYearPagerAdapter import com.simplemobiletools.calendar.dialogs.ChangeViewDialog import com.simplemobiletools.calendar.extensions.config @@ -109,7 +110,7 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener { } else if (config.storedView == EVENTS_LIST_VIEW) { fillEventsList() } else if (config.storedView == WEEKLY_VIEW) { - + fillWeeklyViewPager() } else { val targetDay = DateTime().toString(Formatter.DAYCODE_PATTERN) fillMonthlyViewPager(targetDay) @@ -157,6 +158,13 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener { return months } + private fun fillWeeklyViewPager() { + val weeklyAdapter = MyWeekPagerAdapter(supportFragmentManager) + main_view_pager.apply { + adapter = weeklyAdapter + } + } + private fun fillYearlyViewPager() { calendar_fab.visibility = View.GONE val targetYear = DateTime().toString(Formatter.YEAR_PATTERN).toInt() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt new file mode 100644 index 000000000..32f70fd6c --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt @@ -0,0 +1,19 @@ +package com.simplemobiletools.calendar.adapters + +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v4.app.FragmentManager +import android.support.v4.app.FragmentStatePagerAdapter +import com.simplemobiletools.calendar.fragments.WeekFragment + +class MyWeekPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) { + + override fun getCount() = 1 + + override fun getItem(position: Int): Fragment { + val bundle = Bundle() + val fragment = WeekFragment() + fragment.arguments = bundle + return fragment + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt new file mode 100644 index 000000000..df42eabe8 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt @@ -0,0 +1,27 @@ +package com.simplemobiletools.calendar.fragments + +import android.os.Bundle +import android.support.v4.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.simplemobiletools.calendar.R +import com.simplemobiletools.calendar.helpers.DBHelper +import com.simplemobiletools.calendar.models.Event +import java.util.* +import kotlin.comparisons.compareBy + +class WeekFragment : Fragment(), DBHelper.GetEventsListener { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view = inflater.inflate(R.layout.fragment_week, container, false) + + return view + } + + override fun gotEvents(events: MutableList) { + val sorted = ArrayList(events.sortedWith(compareBy({ it.startTS }, { it.endTS }, { it.title }, { it.description }))) + activity?.runOnUiThread { + + } + } +} diff --git a/app/src/main/res/layout/fragment_week.xml b/app/src/main/res/layout/fragment_week.xml new file mode 100644 index 000000000..4d44a9c3f --- /dev/null +++ b/app/src/main/res/layout/fragment_week.xml @@ -0,0 +1,8 @@ + + + +