From 22e9e92cd76af4952a7bc33ae036c8686fa830a2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 23 Nov 2016 20:59:09 +0100 Subject: [PATCH] rename some layouts --- .../com/simplemobiletools/calendar/fragments/DayFragment.kt | 4 ++-- .../com/simplemobiletools/calendar/fragments/MonthFragment.kt | 4 ++-- .../com/simplemobiletools/calendar/fragments/YearFragment.kt | 4 ++-- .../simplemobiletools/calendar/helpers/MyWidgetProvider.kt | 2 +- .../main/res/layout/{day_fragment.xml => fragment_day.xml} | 0 .../res/layout/{month_fragment.xml => fragment_month.xml} | 0 .../main/res/layout/{year_fragment.xml => fragment_year.xml} | 0 app/src/main/res/layout/widget_config.xml | 2 +- app/src/main/res/xml/widget_info.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename app/src/main/res/layout/{day_fragment.xml => fragment_day.xml} (100%) rename app/src/main/res/layout/{month_fragment.xml => fragment_month.xml} (100%) rename app/src/main/res/layout/{year_fragment.xml => fragment_year.xml} (100%) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt index ecb64308d..1b9df8895 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -23,7 +23,7 @@ import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.interfaces.NavigationListener import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.views.RecyclerViewDivider -import kotlinx.android.synthetic.main.day_fragment.view.* +import kotlinx.android.synthetic.main.fragment_day.view.* import kotlinx.android.synthetic.main.top_navigation.view.* import java.util.* import kotlin.comparisons.compareBy @@ -47,7 +47,7 @@ class DayFragment : Fragment(), DBHelper.EventsListener, DBHelper.GetEventsListe } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - val view = inflater.inflate(R.layout.day_fragment, container, false) + val view = inflater.inflate(R.layout.fragment_day, container, false) mRes = resources mHolder = view.day_holder diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt index 855c30d23..bfe9c949d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt @@ -21,7 +21,7 @@ import com.simplemobiletools.calendar.interfaces.MonthlyCalendar import com.simplemobiletools.calendar.interfaces.NavigationListener import com.simplemobiletools.calendar.models.Day import kotlinx.android.synthetic.main.first_row.* -import kotlinx.android.synthetic.main.month_fragment.view.* +import kotlinx.android.synthetic.main.fragment_month.view.* import kotlinx.android.synthetic.main.top_navigation.view.* import org.joda.time.DateTime @@ -44,7 +44,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { lateinit var mCalendar: MonthlyCalendarImpl override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? { - val view = inflater!!.inflate(R.layout.month_fragment, container, false) + val view = inflater!!.inflate(R.layout.fragment_month, container, false) mRes = resources mHolder = view.calendar_holder diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt index 674827acf..1698d1aab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt @@ -17,7 +17,7 @@ import com.simplemobiletools.calendar.helpers.YEAR_LABEL import com.simplemobiletools.calendar.interfaces.NavigationListener import com.simplemobiletools.calendar.interfaces.YearlyCalendar import com.simplemobiletools.calendar.views.SmallMonthView -import kotlinx.android.synthetic.main.year_fragment.view.* +import kotlinx.android.synthetic.main.fragment_year.view.* import org.joda.time.DateTime import java.util.* @@ -30,7 +30,7 @@ class YearFragment : Fragment(), YearlyCalendar { lateinit var mCalendar: YearlyCalendarImpl override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? { - mView = inflater!!.inflate(R.layout.year_fragment, container, false) + mView = inflater!!.inflate(R.layout.fragment_year, container, false) mYear = arguments.getInt(YEAR_LABEL) setupMonths() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetProvider.kt index d336d154d..ec10a266e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetProvider.kt @@ -59,7 +59,7 @@ class MyWidgetProvider : AppWidgetProvider(), MonthlyCalendar { mTodayTextSize = mRes.getDimension(R.dimen.today_text_size) / mRes.displayMetrics.density mWidgetManager = AppWidgetManager.getInstance(mContext) - mRemoteViews = RemoteViews(mContext.packageName, R.layout.month_fragment) + mRemoteViews = RemoteViews(mContext.packageName, R.layout.fragment_month) mIntent = Intent(mContext, MyWidgetProvider::class.java) setupButtons() updateLabelColor() diff --git a/app/src/main/res/layout/day_fragment.xml b/app/src/main/res/layout/fragment_day.xml similarity index 100% rename from app/src/main/res/layout/day_fragment.xml rename to app/src/main/res/layout/fragment_day.xml diff --git a/app/src/main/res/layout/month_fragment.xml b/app/src/main/res/layout/fragment_month.xml similarity index 100% rename from app/src/main/res/layout/month_fragment.xml rename to app/src/main/res/layout/fragment_month.xml diff --git a/app/src/main/res/layout/year_fragment.xml b/app/src/main/res/layout/fragment_year.xml similarity index 100% rename from app/src/main/res/layout/year_fragment.xml rename to app/src/main/res/layout/fragment_year.xml diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml index 20123c5ab..701183798 100644 --- a/app/src/main/res/layout/widget_config.xml +++ b/app/src/main/res/layout/widget_config.xml @@ -7,7 +7,7 @@