fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating some dialog margins/paddings, styling and formatting

Browse Source
This commit is contained in:
tibbi
2021-11-19 22:54:32 +01:00
parent e1017d9c72
commit 43cfd8609c
31 changed files with 249 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt
View File

@@ -1,7 +1,6 @@
package com.simplemobiletools.calendar.pro.dialogs package com.simplemobiletools.calendar.pro.dialogs
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.activities.SimpleActivity import com.simplemobiletools.calendar.pro.activities.SimpleActivity
@@ -15,8 +14,10 @@ import kotlinx.android.synthetic.main.dialog_export_events.view.*
import java.io.File import java.io.File
import java.util.* import java.util.*
class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hidePath: Boolean, class ExportEventsDialog(
val callback: (file: File, eventTypes: ArrayList<Long>) -> Unit) { val activity: SimpleActivity, val path: String, val hidePath: Boolean,
val callback: (file: File, eventTypes: ArrayList<Long>) -> Unit
) {
private var realPath = if (path.isEmpty()) activity.internalStoragePath else path private var realPath = if (path.isEmpty()) activity.internalStoragePath else path
val config = activity.config val config = activity.config
@@ -24,7 +25,10 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hid
val view = (activity.layoutInflater.inflate(R.layout.dialog_export_events, null) as ViewGroup).apply { val view = (activity.layoutInflater.inflate(R.layout.dialog_export_events, null) as ViewGroup).apply {
export_events_folder.text = activity.humanizePath(realPath) export_events_folder.text = activity.humanizePath(realPath)
export_events_filename.setText("${activity.getString(R.string.events)}_${activity.getCurrentFormattedDateTime()}") export_events_filename.setText("${activity.getString(R.string.events)}_${activity.getCurrentFormattedDateTime()}")
export_events_checkbox.isChecked = config.exportPastEvents export_past_events_checkbox.isChecked = config.exportPastEvents
export_past_events_checkbox_holder.setOnClickListener {
export_past_events_checkbox.toggle()
}
if (hidePath) { if (hidePath) {
export_events_folder_label.beGone() export_events_folder_label.beGone()
@@ -46,42 +50,39 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hid
export_events_types_list.adapter = FilterEventTypeAdapter(activity, it, eventTypes) export_events_types_list.adapter = FilterEventTypeAdapter(activity, it, eventTypes)
if (it.size > 1) { if (it.size > 1) {
export_events_pick_types.beVisible() export_events_pick_types.beVisible()
val margin = activity.resources.getDimension(R.dimen.normal_margin).toInt()
(export_events_checkbox.layoutParams as LinearLayout.LayoutParams).leftMargin = margin
} }
} }
} }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, null) .setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this, R.string.export_events) { activity.setupDialogStuff(view, this, R.string.export_events) {
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val filename = view.export_events_filename.value val filename = view.export_events_filename.value
when { when {
filename.isEmpty() -> activity.toast(R.string.empty_name) filename.isEmpty() -> activity.toast(R.string.empty_name)
filename.isAValidFilename() -> { filename.isAValidFilename() -> {
val file = File(realPath, "$filename.ics") val file = File(realPath, "$filename.ics")
if (!hidePath && file.exists()) { if (!hidePath && file.exists()) {
activity.toast(R.string.name_taken) activity.toast(R.string.name_taken)
return@setOnClickListener return@setOnClickListener
} }
ensureBackgroundThread { ensureBackgroundThread {
config.lastExportPath = file.absolutePath.getParentPath() config.lastExportPath = file.absolutePath.getParentPath()
config.exportPastEvents = view.export_events_checkbox.isChecked config.exportPastEvents = view.export_past_events_checkbox.isChecked
val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList() val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList()
callback(file, eventTypes) callback(file, eventTypes)
dismiss() dismiss()
}
} }
else -> activity.toast(R.string.invalid_name)
} }
else -> activity.toast(R.string.invalid_name)
} }
} }
} }
}
} }
} }

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ImportEventsDialog.kt
View File

@@ -63,6 +63,10 @@ class ImportEventsDialog(val activity: SimpleActivity, val path: String, val cal
updateEventType(this) updateEventType(this)
} }
} }
import_events_checkbox_holder.setOnClickListener {
import_events_checkbox.toggle()
}
} }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)

7
app/src/main/res/layout/activity_day.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/day_coordinator" android:id="@+id/day_coordinator"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -10,7 +9,7 @@
android:id="@+id/view_pager" android:id="@+id/view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/activity_margin"/> android:layout_marginTop="@dimen/activity_margin" />
<com.simplemobiletools.commons.views.MyFloatingActionButton <com.simplemobiletools.commons.views.MyFloatingActionButton
android:id="@+id/day_fab" android:id="@+id/day_fab"
@@ -20,6 +19,6 @@
android:layout_margin="@dimen/activity_margin" android:layout_margin="@dimen/activity_margin"
android:src="@drawable/ic_plus_vector" android:src="@drawable/ic_plus_vector"
app:backgroundTint="@color/color_primary" app:backgroundTint="@color/color_primary"
app:rippleColor="@color/pressed_item_foreground"/> app:rippleColor="@color/pressed_item_foreground" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -19,9 +19,7 @@
<FrameLayout <FrameLayout
android:id="@+id/fragments_holder" android:id="@+id/fragments_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent" />
</FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

5
app/src/main/res/layout/activity_manage_event_types.xml
View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.commons.views.MyRecyclerView <com.simplemobiletools.commons.views.MyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/manage_event_types_list" android:id="@+id/manage_event_types_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/> app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />

5
app/src/main/res/layout/all_day_events_holder_line.xml
View File

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

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/calendar_item_calendar_holder" android:id="@+id/calendar_item_calendar_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -13,10 +12,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingBottom="@dimen/activity_margin"
android:paddingStart="@dimen/big_margin" android:paddingStart="@dimen/big_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
tools:text="Calendar name"/> android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin"
tools:text="Calendar name" />
</RelativeLayout> </RelativeLayout>

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

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

5
app/src/main/res/layout/day_monthly_event_view.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_event_id" android:id="@+id/day_monthly_event_id"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -14,4 +13,4 @@
android:paddingEnd="@dimen/tiny_margin" android:paddingEnd="@dimen/tiny_margin"
android:textSize="@dimen/day_monthly_text_size" android:textSize="@dimen/day_monthly_text_size"
tools:targetApi="m" tools:targetApi="m"
tools:text="1"/> tools:text="1" />

5
app/src/main/res/layout/day_monthly_number_view.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_number_id" android:id="@+id/day_monthly_number_id"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -13,4 +12,4 @@
android:paddingStart="@dimen/tiny_margin" android:paddingStart="@dimen/tiny_margin"
android:paddingEnd="@dimen/tiny_margin" android:paddingEnd="@dimen/tiny_margin"
android:textSize="@dimen/normal_text_size" android:textSize="@dimen/normal_text_size"
tools:text="1"/> tools:text="1" />

25
app/src/main/res/layout/dialog_custom_event_repeat_interval.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_custom_repeat_interval_scrollview" android:id="@+id/dialog_custom_repeat_interval_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -11,8 +10,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/activity_margin" android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingEnd="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/dialog_custom_repeat_interval_value" android:id="@+id/dialog_custom_repeat_interval_value"
@@ -23,7 +22,7 @@
android:inputType="number" android:inputType="number"
android:maxLength="4" android:maxLength="4"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<RadioGroup <RadioGroup
android:id="@+id/dialog_radio_view" android:id="@+id/dialog_radio_view"
@@ -35,33 +34,33 @@
android:id="@+id/dialog_radio_days" android:id="@+id/dialog_radio_days"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/days_raw"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/days_raw" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_radio_weeks" android:id="@+id/dialog_radio_weeks"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/weeks_raw"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/weeks_raw" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_radio_months" android:id="@+id/dialog_radio_months"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/months_raw"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/months_raw" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_radio_years" android:id="@+id/dialog_radio_years"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/years_raw"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/years_raw" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

23
app/src/main/res/layout/dialog_delete_event.xml
View File

@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/delete_event_holder" android:id="@+id/delete_event_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/big_margin" android:paddingStart="@dimen/big_margin"
android:paddingEnd="@dimen/big_margin" android:paddingTop="@dimen/big_margin"
android:paddingTop="@dimen/big_margin"> android:paddingEnd="@dimen/big_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/delete_event_description" android:id="@+id/delete_event_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/proceed_with_deletion" android:text="@string/proceed_with_deletion"
android:textSize="@dimen/bigger_text_size"/> android:textSize="@dimen/bigger_text_size" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/delete_event_repeat_description" android:id="@+id/delete_event_repeat_description"
@@ -23,7 +22,7 @@
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin"
android:text="@string/event_is_repeatable" android:text="@string/event_is_repeatable"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<RadioGroup <RadioGroup
android:id="@+id/delete_event_radio_view" android:id="@+id/delete_event_radio_view"
@@ -35,24 +34,24 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/delete_one_only"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/delete_one_only" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/delete_event_future" android:id="@+id/delete_event_future"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/delete_future_occurrences"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/delete_future_occurrences" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/delete_event_all" android:id="@+id/delete_event_all"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/delete_all_occurrences"/> android:paddingBottom="@dimen/normal_margin"
android:text="@string/delete_all_occurrences" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

17
app/src/main/res/layout/dialog_edit_repeating_event.xml
View File

@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/edit_repeating_event_holder" android:id="@+id/edit_repeating_event_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/big_margin" android:paddingStart="@dimen/big_margin"
android:paddingEnd="@dimen/big_margin" android:paddingTop="@dimen/big_margin"
android:paddingTop="@dimen/big_margin"> android:paddingEnd="@dimen/big_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/edit_repeating_event_title" android:id="@+id/edit_repeating_event_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:text="@string/event_is_repeatable"/> android:text="@string/event_is_repeatable" />
<RadioGroup <RadioGroup
android:id="@+id/edit_repeating_event_radiogroup" android:id="@+id/edit_repeating_event_radiogroup"
@@ -26,9 +25,9 @@
android:id="@+id/edit_repeating_event_one_only" android:id="@+id/edit_repeating_event_one_only"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:text="@string/update_one_only"/> android:paddingBottom="@dimen/activity_margin"
android:text="@string/update_one_only" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/edit_repeating_event_this_and_future_occurences" android:id="@+id/edit_repeating_event_this_and_future_occurences"
@@ -42,9 +41,9 @@
android:id="@+id/edit_repeating_event_all_occurrences" android:id="@+id/edit_repeating_event_all_occurrences"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:text="@string/update_all_occurrences"/> android:paddingBottom="@dimen/activity_margin"
android:text="@string/update_all_occurrences" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

22
app/src/main/res/layout/dialog_event_type.xml
View File

@@ -1,45 +1,43 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/event_type_dialog_holder" android:id="@+id/event_type_dialog_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/activity_margin" android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingEnd="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/type_title_label" android:id="@+id/type_title_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title"/> android:layout_marginStart="@dimen/small_margin"
android:text="@string/title" />
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/type_title" android:id="@+id/type_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:layout_marginLeft="@dimen/small_margin"
android:layout_marginStart="@dimen/small_margin"
android:inputType="textCapSentences" android:inputType="textCapSentences"
android:maxLength="80" android:maxLength="80"
android:singleLine="true" android:singleLine="true"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/type_color_label" android:id="@+id/type_color_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/color"/> android:layout_marginStart="@dimen/small_margin"
android:text="@string/color" />
<ImageView <ImageView
android:id="@+id/type_color" android:id="@+id/type_color"
android:layout_width="@dimen/color_sample_size" android:layout_width="@dimen/color_sample_size"
android:layout_height="@dimen/color_sample_size" android:layout_height="@dimen/color_sample_size"
android:layout_marginLeft="@dimen/medium_margin" android:layout_marginStart="@dimen/small_margin"
android:layout_marginStart="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin" />
android:layout_marginTop="@dimen/medium_margin"/>
</LinearLayout> </LinearLayout>

60
app/src/main/res/layout/dialog_export_events.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/export_events_scrollview" android:id="@+id/export_events_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -11,56 +11,73 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin">
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/export_events_folder_label" android:id="@+id/export_events_folder_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/medium_margin"
android:paddingStart="@dimen/normal_margin"
android:text="@string/folder" android:text="@string/folder"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/export_events_folder" android:id="@+id/export_events_folder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin" android:layout_marginStart="@dimen/activity_margin"
android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:paddingTop="@dimen/small_margin" android:padding="@dimen/small_margin"
android:paddingEnd="@dimen/small_margin" tools:text="Internal/" />
android:paddingBottom="@dimen/small_margin"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/export_events_filename_label" android:id="@+id/export_events_filename_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:paddingStart="@dimen/activity_margin"
android:text="@string/filename_without_ics" android:text="@string/filename_without_ics"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/export_events_filename" android:id="@+id/export_events_filename"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin" android:layout_marginStart="@dimen/activity_margin"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginEnd="@dimen/big_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/small_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.commons.views.MyAppCompatCheckbox <RelativeLayout
android:id="@+id/export_events_checkbox" android:id="@+id/export_past_events_checkbox_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/small_margin" android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/small_margin" android:paddingStart="@dimen/normal_margin"
android:text="@string/export_past_events_too"/> android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin">
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/export_past_events_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:layoutDirection="rtl"
android:padding="@dimen/medium_margin"
android:text="@string/export_past_events_too" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/export_events_pick_types" android:id="@+id/export_events_pick_types"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
@@ -71,14 +88,15 @@
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin" android:layout_marginBottom="@dimen/medium_margin"
android:background="@color/divider_grey" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/export_events_pick_types_label" android:id="@+id/export_events_pick_types_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:text="@string/include_event_types" android:text="@string/include_event_types"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<com.simplemobiletools.commons.views.MyRecyclerView <com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/export_events_types_list" android:id="@+id/export_events_types_list"
@@ -87,7 +105,7 @@
android:clipToPadding="false" android:clipToPadding="false"
android:overScrollMode="never" android:overScrollMode="never"
android:paddingTop="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/> app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

39
app/src/main/res/layout/dialog_import_events.xml
View File

@@ -5,14 +5,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin">
android:paddingEnd="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/import_events_event_type_label" android:id="@+id/import_events_event_type_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin" android:layout_marginStart="@dimen/medium_margin"
android:paddingStart="@dimen/normal_margin"
android:text="@string/default_event_type" android:text="@string/default_event_type"
android:textSize="@dimen/smaller_text_size" /> android:textSize="@dimen/smaller_text_size" />
@@ -20,9 +20,11 @@
android:id="@+id/import_event_type_holder" android:id="@+id/import_event_type_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/small_margin"> android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin">
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/import_event_type_title" android:id="@+id/import_event_type_title"
@@ -30,7 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toStartOf="@+id/import_event_type_color" android:layout_toStartOf="@+id/import_event_type_color"
android:paddingStart="@dimen/small_margin" android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin"
tools:text="@string/regular_event" /> tools:text="@string/regular_event" />
@@ -39,18 +41,29 @@
android:layout_width="@dimen/color_sample_size" android:layout_width="@dimen/color_sample_size"
android:layout_height="@dimen/color_sample_size" android:layout_height="@dimen/color_sample_size"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/medium_margin"
android:clickable="false" /> android:clickable="false" />
</RelativeLayout> </RelativeLayout>
<com.simplemobiletools.commons.views.MyAppCompatCheckbox <RelativeLayout
android:id="@+id/import_events_checkbox" android:id="@+id/import_events_checkbox_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/normal_margin" android:background="?attr/selectableItemBackground"
android:paddingTop="@dimen/activity_margin" android:paddingStart="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/ignore_event_types" /> android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin">
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/import_events_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:layoutDirection="rtl"
android:padding="@dimen/medium_margin"
android:text="@string/ignore_event_types" />
</RelativeLayout>
</LinearLayout> </LinearLayout>

17
app/src/main/res/layout/dialog_repeat_limit_type_picker.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/dialog_repeat_type_picker_holder" android:id="@+id/dialog_repeat_type_picker_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -16,41 +15,39 @@
android:id="@+id/repeat_type_till_date" android:id="@+id/repeat_type_till_date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/repeat_till_date"/> android:text="@string/repeat_till_date" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/repeat_type_date" android:id="@+id/repeat_type_date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/repeat_type_margin_start"
android:layout_marginStart="@dimen/repeat_type_margin_start" android:layout_marginStart="@dimen/repeat_type_margin_start"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin"
tools:text="January 1 1970"/> android:paddingBottom="@dimen/normal_margin"
tools:text="January 1 1970" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/repeat_type_x_times" android:id="@+id/repeat_type_x_times"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_margin" android:layout_marginTop="@dimen/small_margin"
android:text="@string/stop_repeating_after_x"/> android:text="@string/stop_repeating_after_x" />
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/repeat_type_count" android:id="@+id/repeat_type_count"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/repeat_type_margin_start"
android:layout_marginStart="@dimen/repeat_type_margin_start" android:layout_marginStart="@dimen/repeat_type_margin_start"
android:inputType="number" android:inputType="number"
android:maxLength="5" android:maxLength="5"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size" />
<com.simplemobiletools.commons.views.MyCompatRadioButton <com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/repeat_type_forever" android:id="@+id/repeat_type_forever"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:text="@string/repeat_forever"/> android:text="@string/repeat_forever" />
</RadioGroup> </RadioGroup>
</ScrollView> </ScrollView>

14
app/src/main/res/layout/dialog_select_event_type_color.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_select_event_type_color_scrollview" android:id="@+id/dialog_select_event_type_color_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -18,10 +17,10 @@
android:paddingStart="@dimen/big_margin" android:paddingStart="@dimen/big_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:visibility="gone"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:text="@string/select_a_different_caldav_color" android:text="@string/select_a_different_caldav_color"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"
android:visibility="gone" />
<ImageView <ImageView
android:id="@+id/dialog_select_event_type_other_divider" android:id="@+id/dialog_select_event_type_other_divider"
@@ -29,8 +28,8 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_below="@+id/dialog_select_event_type_other_value" android:layout_below="@+id/dialog_select_event_type_other_value"
android:background="@color/divider_grey" android:background="@color/divider_grey"
android:visibility="gone" android:importantForAccessibility="no"
android:importantForAccessibility="no"/> android:visibility="gone" />
<RadioGroup <RadioGroup
android:id="@+id/dialog_select_event_type_color_radio" android:id="@+id/dialog_select_event_type_color_radio"
@@ -40,6 +39,7 @@
android:paddingStart="@dimen/activity_margin" android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin"/> android:paddingBottom="@dimen/normal_margin" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>

7
app/src/main/res/layout/dialog_select_radio_group.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_radio_holder" android:id="@+id/dialog_radio_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -9,9 +8,9 @@
android:id="@+id/dialog_radio_group" android:id="@+id/dialog_radio_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin"
android:paddingStart="@dimen/activity_margin" android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingTop="@dimen/normal_margin"/> android:paddingBottom="@dimen/normal_margin" />
</ScrollView> </ScrollView>

11
app/src/main/res/layout/dialog_set_reminders.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/set_reminders_holder_dialog_holder" android:id="@+id/set_reminders_holder_dialog_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -17,7 +16,7 @@
android:layout_marginStart="@dimen/normal_margin" android:layout_marginStart="@dimen/normal_margin"
android:alpha="0.8" android:alpha="0.8"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_bell_vector"/> android:src="@drawable/ic_bell_vector" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/set_reminders_1" android:id="@+id/set_reminders_1"
@@ -28,7 +27,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:textSize="@dimen/day_text_size"/> android:textSize="@dimen/day_text_size" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/set_reminders_2" android:id="@+id/set_reminders_2"
@@ -41,7 +40,7 @@
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:text="@string/add_another_reminder" android:text="@string/add_another_reminder"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
android:visibility="gone"/> android:visibility="gone" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/set_reminders_3" android:id="@+id/set_reminders_3"
@@ -54,6 +53,6 @@
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:text="@string/add_another_reminder" android:text="@string/add_another_reminder"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
android:visibility="gone"/> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

7
app/src/main/res/layout/dialog_vertical_linear_layout.xml
View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_vertical_linear_layout" android:id="@+id/dialog_vertical_linear_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/activity_margin" android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"/> android:paddingEnd="@dimen/activity_margin" />

23
app/src/main/res/layout/event_item_day_view.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_frame" android:id="@+id/event_item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -15,19 +14,19 @@
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin"> android:paddingBottom="@dimen/normal_margin">
<ImageView <ImageView
android:id="@+id/event_item_color_bar" android:id="@+id/event_item_color_bar"
android:layout_width="@dimen/event_color_bar_width" android:layout_width="@dimen/event_color_bar_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/event_item_description"
android:layout_alignTop="@+id/event_item_title" android:layout_alignTop="@+id/event_item_title"
android:layout_alignBottom="@+id/event_item_description"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingTop="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
@@ -35,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="13:00"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
@@ -43,8 +42,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:text="15:00" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="15:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -56,7 +55,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
<TextView <TextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@@ -69,7 +68,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event description"/> tools:text="Event description" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

17
app/src/main/res/layout/event_item_day_view_simple.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_frame" android:id="@+id/event_item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -15,20 +14,20 @@
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingTop="@dimen/normal_margin"> android:paddingBottom="@dimen/normal_margin">
<ImageView <ImageView
android:id="@+id/event_item_color_bar" android:id="@+id/event_item_color_bar"
android:layout_width="@dimen/event_color_bar_width" android:layout_width="@dimen/event_color_bar_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/event_item_start"
android:layout_alignTop="@+id/event_item_start" android:layout_alignTop="@+id/event_item_start"
android:layout_alignBottom="@+id/event_item_start"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingTop="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
@@ -36,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="13:00"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -48,7 +47,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

23
app/src/main/res/layout/event_list_item.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_frame" android:id="@+id/event_item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -15,20 +14,20 @@
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingTop="@dimen/medium_margin"> android:paddingBottom="@dimen/medium_margin">
<ImageView <ImageView
android:id="@+id/event_item_color_bar" android:id="@+id/event_item_color_bar"
android:layout_width="@dimen/event_color_bar_width" android:layout_width="@dimen/event_color_bar_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/event_item_end"
android:layout_alignTop="@+id/event_item_start" android:layout_alignTop="@+id/event_item_start"
android:layout_alignBottom="@+id/event_item_end"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingTop="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
@@ -36,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="13:00"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
@@ -45,8 +44,8 @@
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="15:00" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="15:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -58,7 +57,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
<TextView <TextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@@ -72,7 +71,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event description"/> tools:text="Event description" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

17
app/src/main/res/layout/event_list_item_simple.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_frame" android:id="@+id/event_item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -15,20 +14,20 @@
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:paddingTop="@dimen/normal_margin"> android:paddingBottom="@dimen/normal_margin">
<ImageView <ImageView
android:id="@+id/event_item_color_bar" android:id="@+id/event_item_color_bar"
android:layout_width="@dimen/event_color_bar_width" android:layout_width="@dimen/event_color_bar_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/event_item_start"
android:layout_alignTop="@+id/event_item_start" android:layout_alignTop="@+id/event_item_start"
android:layout_alignBottom="@+id/event_item_start"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingTop="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
@@ -36,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="13:00"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -48,7 +47,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

17
app/src/main/res/layout/event_list_item_widget.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -16,15 +15,15 @@
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingTop="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingBottom="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:text="13:00" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
@@ -33,8 +32,8 @@
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="15:00" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="15:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -46,7 +45,7 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/small_margin" android:paddingEnd="@dimen/small_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
<TextView <TextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@@ -60,6 +59,6 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/small_margin" android:paddingEnd="@dimen/small_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event description"/> tools:text="Event description" />
</RelativeLayout> </RelativeLayout>

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_holder" android:id="@+id/event_item_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -11,12 +10,12 @@
android:id="@+id/event_item_color_bar" android:id="@+id/event_item_color_bar"
android:layout_width="@dimen/event_color_bar_width" android:layout_width="@dimen/event_color_bar_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/event_item_start"
android:layout_alignTop="@+id/event_item_start" android:layout_alignTop="@+id/event_item_start"
android:layout_alignBottom="@+id/event_item_start"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:background="@drawable/event_list_color_bar" android:background="@drawable/event_list_color_bar"
android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"
android:paddingTop="@dimen/tiny_margin"/> android:paddingBottom="@dimen/tiny_margin" />
<TextView <TextView
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
@@ -24,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@+id/event_item_color_bar" android:layout_toEndOf="@+id/event_item_color_bar"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="13:00"/> tools:text="13:00" />
<TextView <TextView
android:id="@+id/event_item_title" android:id="@+id/event_item_title"
@@ -36,6 +35,6 @@
android:maxLines="1" android:maxLines="1"
android:paddingEnd="@dimen/small_margin" android:paddingEnd="@dimen/small_margin"
android:textSize="@dimen/day_text_size" android:textSize="@dimen/day_text_size"
tools:text="Event title"/> tools:text="Event title" />
</RelativeLayout> </RelativeLayout>

3
app/src/main/res/layout/event_list_section.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/event_section_title" android:id="@+id/event_section_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/event_section_title" android:id="@+id/event_section_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="1dp"
android:drawableTop="@drawable/divider_width" android:drawableTop="@drawable/divider_width"
android:paddingBottom="@dimen/small_margin" android:drawablePadding="1dp"
android:paddingTop="@dimen/small_margin" android:paddingTop="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"
android:textSize="@dimen/normal_text_size" android:textSize="@dimen/normal_text_size"
android:textStyle="bold"/> android:textStyle="bold" />

10
app/src/main/res/layout/filter_event_type_view.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/filter_event_type_holder" android:id="@+id/filter_event_type_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -13,18 +12,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/medium_margin" android:layout_marginEnd="@dimen/medium_margin"
android:layout_toStartOf="@+id/filter_event_type_color" android:layout_toStartOf="@+id/filter_event_type_color"
android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/small_margin"/> android:paddingStart="@dimen/small_margin" />
<ImageView <ImageView
android:id="@+id/filter_event_type_color" android:id="@+id/filter_event_type_color"
android:layout_width="@dimen/color_sample_size" android:layout_width="@dimen/color_sample_size"
android:layout_height="@dimen/color_sample_size" android:layout_height="@dimen/color_sample_size"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/medium_margin" android:layout_marginEnd="@dimen/medium_margin"
android:layout_marginRight="@dimen/medium_margin" android:clickable="false" />
android:clickable="false"/>
</RelativeLayout> </RelativeLayout>

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/event_item_frame" android:id="@+id/event_item_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -25,18 +24,16 @@
android:layout_toStartOf="@+id/event_type_color" android:layout_toStartOf="@+id/event_type_color"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin"
tools:text="Event type"/> tools:text="Event type" />
<ImageView <ImageView
android:id="@+id/event_type_color" android:id="@+id/event_type_color"
android:layout_width="@dimen/color_sample_size" android:layout_width="@dimen/color_sample_size"
android:layout_height="@dimen/color_sample_size" android:layout_height="@dimen/color_sample_size"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/medium_margin" android:layout_marginEnd="@dimen/medium_margin"
android:layout_marginRight="@dimen/medium_margin" android:clickable="false" />
android:clickable="false"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>