fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use some resources from Commons

This commit is contained in:
tibbi 2016-12-27 23:18:48 +01:00
parent 841f084c8b
commit 14dbc6a099
30 changed files with 81 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -32,7 +32,7 @@ android {
}
dependencies {
compile 'com.simplemobiletools:commons:2.0.1'
compile 'com.simplemobiletools:commons:2.0.3'
compile 'joda-time:joda-time:2.9.1'
compile 'com.facebook.stetho:stetho:1.4.1'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

1
app/src/main/kotlin/com/simplemobiletools/calendar/activities/AboutActivity.kt
View File

@ -1,5 +1,6 @@
package com.simplemobiletools.calendar.activities
import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri

16
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@ -9,11 +9,15 @@ import android.view.View
import android.view.WindowManager
import android.widget.AdapterView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.*
import com.simplemobiletools.calendar.extensions.beVisibleIf
import com.simplemobiletools.calendar.extensions.scheduleNotification
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.extensions.hideKeyboard
import com.simplemobiletools.commons.extensions.showKeyboard
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.value
import kotlinx.android.synthetic.main.activity_event.*
import org.joda.time.DateTime
import org.joda.time.DateTimeZone
@ -22,7 +26,6 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
private var mWasReminderInit = false
private var mWasEndDateSet = false
private var mWasEndTimeSet = false
private var mDialogTheme = 0
lateinit var mEventStartDateTime: DateTime
lateinit var mEventEndDateTime: DateTime
@ -33,7 +36,6 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
setContentView(R.layout.activity_event)
val intent = intent ?: return
mDialogTheme = if (mConfig.isDarkTheme) R.style.DialogTheme_Dark else R.style.DialogTheme
mWasReminderInit = false
val eventId = intent.getIntExtra(EVENT_ID, 0)
@ -307,24 +309,24 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
fun setupStartDate() {
hideKeyboard()
DatePickerDialog(this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1,
DatePickerDialog(this, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1,
mEventStartDateTime.dayOfMonth).show()
}
fun setupStartTime() {
hideKeyboard()
TimePickerDialog(this, mDialogTheme, startTimeSetListener, mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, true).show()
TimePickerDialog(this, startTimeSetListener, mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, true).show()
}
fun setupEndDate() {
hideKeyboard()
DatePickerDialog(this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1,
DatePickerDialog(this, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1,
mEventEndDateTime.dayOfMonth).show()
}
fun setupEndTime() {
hideKeyboard()
TimePickerDialog(this, mDialogTheme, endTimeSetListener, mEventEndDateTime.hourOfDay, mEventEndDateTime.minuteOfHour, true).show()
TimePickerDialog(this, endTimeSetListener, mEventEndDateTime.hourOfDay, mEventEndDateTime.minuteOfHour, true).show()
}
private val startDateSetListener = DatePickerDialog.OnDateSetListener { view, year, monthOfYear, dayOfMonth ->

6
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@ -11,11 +11,11 @@ import android.view.View
import android.widget.AdapterView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.beVisibleIf
import com.simplemobiletools.calendar.extensions.hideKeyboard
import com.simplemobiletools.calendar.extensions.showKeyboard
import com.simplemobiletools.calendar.extensions.value
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.commons.extensions.hideKeyboard
import com.simplemobiletools.commons.extensions.showKeyboard
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.value
import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : SimpleActivity() {

4
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt
View File

@ -1,9 +1,9 @@
package com.simplemobiletools.calendar.activities
import com.simplemobiletools.calendar.R
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.MenuItem
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.helpers.Config
open class SimpleActivity : AppCompatActivity() {
@ -11,7 +11,7 @@ open class SimpleActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
mConfig = Config.newInstance(applicationContext)
setTheme(if (mConfig.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
setTheme(R.style.AppTheme)
super.onCreate(savedInstanceState)
}

4
app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetListConfigureActivity.kt
View File

@ -11,12 +11,12 @@ import android.support.v7.app.AppCompatActivity
import android.widget.SeekBar
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.adapters.EventListWidgetAdapterOld
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.models.ListEvent
import com.simplemobiletools.calendar.models.ListItem
import com.simplemobiletools.calendar.models.ListSection
import com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.widget_config_list.*
import org.joda.time.DateTime
import yuku.ambilwarna.AmbilWarnaDialog
@ -62,7 +62,7 @@ class WidgetListConfigureActivity : AppCompatActivity() {
mRes = resources
val prefs = initPrefs(this)
mTextColorWithoutTransparency = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.colorPrimary))
mTextColorWithoutTransparency = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.color_primary))
updateTextColors()
mBgColor = prefs.getInt(WIDGET_BG_COLOR, 1)

4
app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
View File

@ -14,10 +14,10 @@ import android.widget.SeekBar
import android.widget.TextView
import com.simplemobiletools.calendar.MonthlyCalendarImpl
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
import com.simplemobiletools.calendar.models.Day
import com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.first_row.*
import kotlinx.android.synthetic.main.top_navigation.*
import kotlinx.android.synthetic.main.widget_config_monthly.*
@ -67,7 +67,7 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
mTodayTextSize /= mRes.displayMetrics.density
val prefs = initPrefs(this)
mTextColorWithoutTransparency = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.colorPrimary))
mTextColorWithoutTransparency = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.color_primary))
updateTextColors()
mBgColor = prefs.getInt(WIDGET_BG_COLOR, 1)

2
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
View File

@ -49,7 +49,7 @@ class EventListAdapter(val activity: SimpleActivity, val mItems: List<ListItem>,
init {
mTopDivider = activity.resources.getDrawable(R.drawable.divider)
mOrangeColor = activity.resources.getColor(R.color.colorPrimary)
mOrangeColor = activity.resources.getColor(R.color.color_primary)
val mTodayCode = Formatter.getDayCodeFromTS(mNow)
mTodayDate = Formatter.getDate(activity, mTodayCode)
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
View File

@ -9,13 +9,13 @@ import android.widget.RemoteViews
import android.widget.RemoteViewsService
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.R.id.event_item_holder
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.calendar.models.ListEvent
import com.simplemobiletools.calendar.models.ListItem
import com.simplemobiletools.calendar.models.ListSection
import com.simplemobiletools.commons.extensions.adjustAlpha
import org.joda.time.DateTime
import java.util.*
import kotlin.comparisons.compareBy

2
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt
View File

@ -10,7 +10,7 @@ import com.simplemobiletools.calendar.helpers.DAY_CODE
class MyDayPagerAdapter(fm: FragmentManager, private val mCodes: List<String>, private val mListener: DayFragment.DeleteListener) :
FragmentStatePagerAdapter(fm) {
lateinit var fragments: SparseArray<DayFragment>
var fragments: SparseArray<DayFragment>
init {
fragments = SparseArray(10)

5
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
View File

@ -16,12 +16,12 @@ import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.activities.SimpleActivity
import com.simplemobiletools.calendar.adapters.EventsAdapter
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.*
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 com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.fragment_day.view.*
import kotlinx.android.synthetic.main.top_navigation.view.*
import java.util.*
@ -85,8 +85,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DBHelper.GetEvents
}
fun pickDay() {
val theme = if (mConfig.isDarkTheme) R.style.MyAlertDialog_Dark else R.style.MyAlertDialog
val alertDialog = AlertDialog.Builder(context, theme)
val alertDialog = AlertDialog.Builder(context)
val view = getLayoutInflater(arguments).inflate(R.layout.date_picker, null)
val datePicker = view.findViewById(R.id.date_picker) as DatePicker

9
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@ -14,12 +14,12 @@ import android.widget.*
import com.simplemobiletools.calendar.MonthlyCalendarImpl
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.DayActivity
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.extensions.beVisibleIf
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
import com.simplemobiletools.calendar.interfaces.NavigationListener
import com.simplemobiletools.calendar.models.Day
import com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.first_row.*
import kotlinx.android.synthetic.main.fragment_month.view.*
import kotlinx.android.synthetic.main.top_navigation.view.*
@ -94,9 +94,9 @@ class MonthFragment : Fragment(), MonthlyCalendar {
private fun setupButtons() {
val baseColor = if (mConfig.isDarkTheme) Color.WHITE else Color.BLACK
mTextColor = baseColor.adjustAlpha(HIGH_ALPHA)
mTextColorWithEvent = mRes.getColor(R.color.colorPrimary).adjustAlpha(HIGH_ALPHA)
mTextColorWithEvent = mRes.getColor(R.color.color_primary).adjustAlpha(HIGH_ALPHA)
mWeakTextColor = baseColor.adjustAlpha(LOW_ALPHA)
mWeakTextColorWithEvent = mRes.getColor(R.color.colorPrimary).adjustAlpha(LOW_ALPHA)
mWeakTextColorWithEvent = mRes.getColor(R.color.color_primary).adjustAlpha(LOW_ALPHA)
mHolder.apply {
top_left_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP)
@ -117,8 +117,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
fun showMonthDialog() {
val theme = if (mConfig.isDarkTheme) R.style.MyAlertDialog_Dark else R.style.MyAlertDialog
val alertDialog = AlertDialog.Builder(context, theme)
val alertDialog = AlertDialog.Builder(context)
val view = getLayoutInflater(arguments).inflate(R.layout.date_picker, null)
val datePicker = view.findViewById(R.id.date_picker) as DatePicker
hideDayPicker(datePicker)

4
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
View File

@ -10,13 +10,13 @@ import android.view.ViewGroup
import android.widget.TextView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.YearlyCalendarImpl
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.HIGH_ALPHA
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 com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.fragment_year.view.*
import org.joda.time.DateTime
import java.util.*
@ -75,7 +75,7 @@ class YearFragment : Fragment(), YearlyCalendar {
val now = DateTime()
if (now.year == mYear) {
val monthLabel = mView.findViewById(res.getIdentifier("month_${now.monthOfYear}_label", "id", activity.packageName)) as TextView
monthLabel.setTextColor(res.getColor(R.color.colorPrimary).adjustAlpha(HIGH_ALPHA))
monthLabel.setTextColor(res.getColor(R.color.color_primary).adjustAlpha(HIGH_ALPHA))
val monthView = mView.findViewById(res.getIdentifier("month_${now.monthOfYear}", "id", activity.packageName)) as SmallMonthView
monthView.setTodaysId(now.dayOfMonth)

4
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
View File

@ -7,10 +7,10 @@ import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
import android.database.sqlite.SQLiteQueryBuilder
import android.text.TextUtils
import com.simplemobiletools.calendar.extensions.getIntValue
import com.simplemobiletools.calendar.extensions.getStringValue
import com.simplemobiletools.calendar.extensions.updateWidgets
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue
import org.joda.time.DateTime
import java.util.*

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetListProvider.kt
View File

@ -12,8 +12,8 @@ import android.net.Uri
import android.widget.RemoteViews
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.services.WidgetService
import com.simplemobiletools.commons.extensions.adjustAlpha
class MyWidgetListProvider : AppWidgetProvider() {
companion object {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
View File

@ -16,9 +16,9 @@ import com.simplemobiletools.calendar.MonthlyCalendarImpl
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.DayActivity
import com.simplemobiletools.calendar.activities.MainActivity
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
import com.simplemobiletools.calendar.models.Day
import com.simplemobiletools.commons.extensions.adjustAlpha
import org.joda.time.DateTime
class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {

4
app/src/main/kotlin/com/simplemobiletools/calendar/views/SmallMonthView.kt
View File

@ -7,9 +7,9 @@ import android.graphics.Paint
import android.util.AttributeSet
import android.view.View
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.adjustAlpha
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.MEDIUM_ALPHA
import com.simplemobiletools.commons.extensions.adjustAlpha
import java.util.*
class SmallMonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(context, attrs, defStyle) {
@ -59,7 +59,7 @@ class SmallMonthView(context: Context, attrs: AttributeSet, defStyle: Int) : Vie
val baseColor = if (Config.newInstance(context).isDarkTheme) Color.WHITE else Color.BLACK
mTextColor = baseColor.adjustAlpha(MEDIUM_ALPHA)
mColoredTextColor = resources.getColor(R.color.colorPrimary).adjustAlpha(MEDIUM_ALPHA)
mColoredTextColor = resources.getColor(R.color.color_primary).adjustAlpha(MEDIUM_ALPHA)
mPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = mTextColor

2
app/src/main/res/drawable/event_item_background.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/mediumGrey" android:state_activated="true"/>
<item android:drawable="@color/activated_item_foreground" android:state_activated="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

13
app/src/main/res/layout/activity_about.xml
View File

@ -43,7 +43,7 @@
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/more_apps_underlined"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/about_invite"
@ -53,7 +53,7 @@
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/invite_friends_underlined"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/about_rate_us"
@ -63,7 +63,7 @@
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/rate_us_underlined"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/about_license"
@ -73,7 +73,7 @@
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/third_party_licences_underlined"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/about_donate"
@ -83,14 +83,13 @@
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/donate_underlined"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/about_follow_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_donate"
android:paddingBottom="@dimen/social_padding"
android:paddingTop="@dimen/activity_margin"
android:text="@string/follow_us"/>
@ -106,8 +105,6 @@
android:layout_width="@dimen/social_logo"
android:layout_height="@dimen/social_logo"
android:layout_below="@+id/about_follow_us"
android:layout_marginLeft="@dimen/social_padding"
android:layout_marginRight="@dimen/social_padding"
android:layout_toEndOf="@+id/about_facebook"
android:layout_toRightOf="@+id/about_facebook"
android:src="@mipmap/gplus"/>

9
app/src/main/res/layout/activity_event.xml
View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/event_scrollview"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/event_scrollview"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/event_holder"

8
app/src/main/res/layout/activity_license.xml
View File

@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin"
android:text="@string/kotlin_title"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/license_kotlin_text"
@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin"
android:text="@string/ambilwarna_title"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/license_ambilwarna_text"
@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin"
android:text="@string/joda_title"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/license_joda_text"
@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin"
android:text="@string/stetho_title"
android:textColor="@color/colorPrimary"/>
android:textColor="@color/color_primary"/>
<TextView
android:id="@+id/license_stetho_text"

26
app/src/main/res/layout/activity_settings.xml
View File

@ -15,7 +15,6 @@
android:id="@+id/settings_dark_theme_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -24,8 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/dark_theme"/>
<android.support.v7.widget.SwitchCompat
@ -43,7 +40,6 @@
android:id="@+id/settings_sunday_first_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -52,8 +48,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/sunday_first"/>
<android.support.v7.widget.SwitchCompat
@ -71,7 +65,6 @@
android:id="@+id/settings_week_numbers_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -80,8 +73,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/week_numbers"/>
<android.support.v7.widget.SwitchCompat
@ -99,7 +90,6 @@
android:id="@+id/settings_vibrate_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -108,8 +98,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/vibrate"/>
<android.support.v7.widget.SwitchCompat
@ -127,7 +115,6 @@
android:id="@+id/settings_reminder_sound_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -136,8 +123,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/reminder_sound"/>
<TextView
@ -157,7 +142,6 @@
android:id="@+id/settings_default_reminder_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
@ -166,8 +150,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"
android:text="@string/default_event_reminder"/>
<android.support.v7.widget.AppCompatSpinner
@ -184,9 +166,7 @@
android:id="@+id/settings_custom_reminder_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/settings_padding"
android:layout_marginRight="@dimen/activity_margin"
android:layout_marginTop="@dimen/settings_padding"
android:orientation="horizontal"
android:visibility="gone">
@ -207,16 +187,12 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:entries="@array/custom_reminders"
android:gravity="center"
android:paddingLeft="@dimen/settings_padding"
android:paddingStart="@dimen/settings_padding"/>
android:gravity="center"/>
<TextView
android:id="@+id/custom_reminder_other_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/settings_padding"
android:layout_marginStart="@dimen/settings_padding"
android:gravity="center"
android:text="@string/before"/>

2
app/src/main/res/layout/date_picker.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DatePicker
android:id="@+id/date_picker"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:calendarViewShown="false"

2
app/src/main/res/layout/event_list_widget.xml
View File

@ -11,6 +11,6 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/medium_padding"/>
android:paddingTop="@dimen/medium_margin"/>
</RelativeLayout>

2
app/src/main/res/layout/fragment_event_list.xml
View File

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/medium_padding"
android:paddingTop="@dimen/medium_margin"
android:visibility="gone"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>

4
app/src/main/res/layout/top_navigation.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
android:id="@+id/calendar_holder"
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/calendar_holder">
<ImageView
android:id="@+id/top_left_arrow"

13
app/src/main/res/layout/widget_config_list.xml
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin">
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin">
<ListView
android:id="@+id/config_events_list"
@ -14,7 +15,7 @@
android:clipToPadding="false"
android:divider="@null"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/medium_padding"/>
android:paddingTop="@dimen/medium_margin"/>
<Button
android:id="@+id/config_bg_color"

13
app/src/main/res/layout/widget_config_monthly.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@ -11,13 +12,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/config_bg_color"
android:layout_marginBottom="@dimen/activity_margin" />
android:layout_marginBottom="@dimen/activity_margin"/>
<Button
android:id="@+id/config_bg_color"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_above="@+id/config_text_color" />
android:layout_above="@+id/config_text_color"/>
<RelativeLayout
android:id="@+id/config_bg_seekbar_holder"
@ -34,14 +35,14 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" />
android:paddingRight="@dimen/activity_margin"/>
</RelativeLayout>
<Button
android:id="@+id/config_text_color"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentBottom="true" />
android:layout_alignParentBottom="true"/>
<Button
android:id="@+id/config_save"
@ -54,5 +55,5 @@
android:paddingRight="@dimen/activity_margin"
android:text="@android:string/ok"
android:textColor="@android:color/white"
android:textSize="@dimen/big_text_size" />
android:textSize="@dimen/big_text_size"/>
</RelativeLayout>

6
app/src/main/res/layout/widget_event_list.xml
View File

@ -11,10 +11,10 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="@dimen/medium_padding"
android:dividerHeight="@dimen/medium_margin"
android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/medium_padding"/>
android:paddingTop="@dimen/medium_margin"/>
<TextView
android:id="@+id/widget_event_list_empty"
@ -23,6 +23,6 @@
android:gravity="center_horizontal"
android:padding="@dimen/big_margin"
android:text="@string/no_upcoming_events"
android:textSize="@dimen/dialog_text_size"/>
android:textSize="@dimen/bigger_text_size"/>
</RelativeLayout>

11
app/src/main/res/values/styles.xml
View File

@ -3,7 +3,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="colorAccent">@color/color_primary</item>
<item name="colorAccent">@color/color_accent</item>
<item name="buttonStyle">@style/MyButton</item>
<item name="android:buttonStyle">@style/MyButton</item>
<item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
@ -41,22 +41,23 @@
<style name="MyAlertDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert"/>
<style name="AppTheme.ActionBarStyle" parent="@style/Base.Widget.AppCompat.ActionBar">
<item name="background">@color/color_primary</item>
<item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
</style>
<style name="AppTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">20sp</item>
<item name="android:textSize">@dimen/actionbar_text_size</item>
</style>
<style name="SpinnerItem" parent="@android:style/Widget.TextView">
<item name="android:paddingRight">@dimen/activity_margin</item>
<item name="android:gravity">center</item>
</style>
<style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.TextView">
<item name="android:gravity">center_vertical</item>
<item name="android:padding">@dimen/settings_padding</item>
<item name="android:paddingTop">@dimen/medium_margin</item>
<item name="android:paddingBottom">@dimen/medium_margin</item>
<item name="android:paddingLeft">@dimen/activity_margin</item>
<item name="android:paddingRight">@dimen/activity_margin</item>
</style>
</resources>