diff --git a/app/src/main/1.html b/app/src/main/1.html new file mode 100644 index 0000000000000000000000000000000000000000..b6bd29dddaed903bd59201f9f5744ae406d4b40c --- /dev/null +++ b/app/src/main/1.html @@ -0,0 +1 @@ +sadas \ No newline at end of file diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index 75374d906650e1310264f83f2515e3cd5407cc34..53e03cac20aae8bf623d24d471334bb536b47c12 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -44,6 +44,7 @@ import java.text.SimpleDateFormat import java.util.* import kotlin.collections.ArrayList + class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private val CALDAV_SYNC_DELAY = 1000L @@ -56,7 +57,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private var shouldGoToTodayBeVisible = false private var goToTodayButton: MenuItem? = null private var currentFragments = ArrayList<MyFragmentHolder>() - + private var deleteAllevent = SettingsActivity() private var mStoredTextColor = 0 private var mStoredBackgroundColor = 0 private var mStoredPrimaryColor = 0 @@ -65,6 +66,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private var mStoredUse24HourFormat = false private var mStoredDimPastEvents = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) @@ -377,6 +379,9 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { RadioGroupDialog(this, items) { toast(R.string.importing) Thread { + dbHelper.deleteAllEvents() + //개인 일정 삭제 안되게 전처리 + // val holidays = getString(R.string.holidays) var eventTypeId = dbHelper.getEventTypeIdWithTitle(holidays) if (eventTypeId == -1) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e486b4871324e812cd189a644d5b9d492436551a..b8790ad08e00cf639a0596fb62985cfaf6fce2d0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/calendar_coordinator" android:layout_width="match_parent" @@ -9,7 +8,7 @@ <FrameLayout android:id="@+id/fragments_holder" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" /> <com.simplemobiletools.commons.views.MyFloatingActionButton android:id="@+id/calendar_fab" @@ -20,7 +19,7 @@ android:contentDescription="@string/new_event" android:src="@drawable/ic_plus" app:backgroundTint="@color/color_primary" - app:rippleColor="@color/pressed_item_foreground"/> + app:rippleColor="@color/pressed_item_foreground" /> <RelativeLayout android:id="@+id/search_holder" @@ -40,7 +39,7 @@ android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin" android:text="@string/no_items_found" - android:textSize="@dimen/bigger_text_size"/> + android:textSize="@dimen/bigger_text_size" /> <com.simplemobiletools.commons.views.MyTextView android:id="@+id/search_placeholder_2" @@ -54,7 +53,7 @@ android:paddingRight="@dimen/activity_margin" android:paddingTop="@dimen/medium_margin" android:text="@string/type_2_characters" - android:textSize="@dimen/bigger_text_size"/> + android:textSize="@dimen/bigger_text_size" /> <com.simplemobiletools.commons.views.MyRecyclerView android:id="@+id/search_results_list" @@ -62,7 +61,7 @@ android:layout_height="match_parent" android:clipToPadding="false" android:scrollbars="vertical" - app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/> + app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" /> </RelativeLayout> </android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f6a634151283cf5c5d4506fc58f19028b449367..b9d16ba5f31c0ae3d7f7486a196c6096170ba021 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,72 +1,72 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Simple Calendar</string> - <string name="app_launcher_name">Calendar</string> - <string name="change_view">Change view</string> + <string name="app_name">심플 캘린더</string> + <string name="app_launcher_name">캘린더</string> + <string name="change_view">보기 변경</string> <string name="daily_view">Daily view</string> - <string name="weekly_view">Weekly view</string> - <string name="monthly_view">Monthly view</string> - <string name="yearly_view">Yearly view</string> - <string name="simple_event_list">Simple event list</string> - <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string> - <string name="go_to_today">Go to today</string> + <string name="weekly_view">주간 보기</string> + <string name="monthly_view">월간 보기</string> + <string name="yearly_view">연간 보기</string> + <string name="simple_event_list">간단한 이벤트 목록</string> + <string name="no_upcoming_events">다가올 이벤트가 없는 것 같습니다.</string> + <string name="go_to_today">오늘로 이동</string> <!-- Widget titles --> - <string name="widget_monthly">Calendar monthly</string> - <string name="widget_list">Calendar event list</string> + <string name="widget_monthly">월별 달력</string> + <string name="widget_list">일정 목록 달력</string> <!-- Event --> - <string name="event">Event</string> - <string name="edit_event">Edit Event</string> - <string name="new_event">New Event</string> + <string name="event">이벤트</string> + <string name="edit_event">이벤트 수정</string> + <string name="new_event">새 이벤트</string> <string name="create_new_event">Create a new event</string> <string name="duplicate_event">Duplicate event</string> - <string name="title_empty">Title cannot be empty</string> - <string name="end_before_start">The event cannot end earlier than it starts</string> - <string name="event_added">Event added successfully</string> - <string name="event_updated">Event updated successfully</string> - <string name="filter_events_by_type">Filter events by type</string> + <string name="title_empty">제목을 입력해주세요</string> + <string name="end_before_start">이벤트가 시작되기 전에 끝날 수 없습니다</string> + <string name="event_added">이벤트가 성공적으로 추가되었습니다</string> + <string name="event_updated">이벤트를 수정했습니다</string> + <string name="filter_events_by_type">유형별 이벤트</string> <string name="please_fill_location">Please fill in a location to be shown on a map</string> <string name="public_event_notification_text">An event is upcoming</string> <!-- Event Repetition --> - <string name="repetition">Repetition</string> - <string name="no_repetition">No repetition</string> - <string name="daily">Daily</string> - <string name="weekly">Weekly</string> - <string name="monthly">Monthly</string> - <string name="yearly">Yearly</string> - <string name="weeks_raw">weeks</string> - <string name="months_raw">months</string> - <string name="years_raw">years</string> - <string name="repeat_till">Repeat till</string> - <string name="forever">Forever</string> - <string name="event_is_repeatable">The event is repeatable</string> - <string name="selection_contains_repetition">The selection contains repeating events</string> - <string name="delete_one_only">Delete the selected occurrence only</string> - <string name="delete_all_occurrences">Delete all occurrences</string> - <string name="update_one_only">Update the selected occurrence only</string> - <string name="update_all_occurrences">Update all occurrences</string> - <string name="repeat_till_date">Repeat till a date</string> - <string name="repeat_x_times">Repeat x times</string> - <string name="repeat_forever">Repeat forever</string> - <string name="times">times</string> - <string name="repeat">Repeat</string> - <string name="repeat_on">Repeat on</string> - <string name="every_day">Every day</string> - <string name="selected_days">On selected days</string> - <string name="the_same_day">The same day</string> - <string name="the_last_day">The last day</string> - <string name="repeat_on_the_same_day_monthly">Repeat on the same day each month</string> - <string name="repeat_on_the_last_day_monthly">Repeat on the last day of the month</string> + <string name="repetition">반복</string> + <string name="no_repetition">반복 없음</string> + <string name="daily">매일</string> + <string name="weekly">매주</string> + <string name="monthly">매월</string> + <string name="yearly">매년</string> + <string name="weeks_raw">주</string> + <string name="months_raw">월</string> + <string name="years_raw">년</string> + <string name="repeat_till">까지 반복</string> + <string name="forever">영원히</string> + <string name="event_is_repeatable">반복 이벤트입니다</string> + <string name="selection_contains_repetition">선택한 항목에 반복되는 이벤트들이 있습니다</string> + <string name="delete_one_only">선택한 항목만 삭제</string> + <string name="delete_all_occurrences">모든 항목 삭제</string> + <string name="update_one_only">선택한 항목만 변경</string> + <string name="update_all_occurrences">모든 항목 변경</string> + <string name="repeat_till_date">날짜까지 반복</string> + <string name="repeat_x_times">횟수 반복</string> + <string name="repeat_forever">영원히 반복</string> + <string name="times">번</string> + <string name="repeat">반복</string> + <string name="repeat_on">반복하다</string> + <string name="every_day">매일</string> + <string name="selected_days">선택한 요일에</string> + <string name="the_same_day">같은 날</string> + <string name="the_last_day">마지막 날</string> + <string name="repeat_on_the_same_day_monthly">매월 같은 날 반복</string> + <string name="repeat_on_the_last_day_monthly">매월 매지막 날 반복</string> <string name="repeat_on_the_same_day_yearly">Repeat on the same day every year</string> - <string name="repeat_every_m">Repeat every</string> - <string name="every_m">Every</string> - <string name="first_m">first</string> - <string name="second_m">second</string> - <string name="third_m">third</string> - <string name="fourth_m">fourth</string> - <string name="last_m">last</string> + <string name="repeat_every_m">매일 반복</string> + <string name="every_m">매일</string> + <string name="first_m">첫 번째</string> + <string name="second_m">두 번째</string> + <string name="third_m">세 번째</string> + <string name="fourth_m">네 번째</string> + <string name="last_m">마지막</string> <!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- used in repetition, like "Every first Sunday" --> @@ -79,78 +79,78 @@ <string name="last_f">last</string> <!-- Birthdays --> - <string name="birthdays">Birthdays</string> - <string name="add_birthdays">Add contact birthdays</string> - <string name="no_birthdays">No birthdays have been found</string> - <string name="birthdays_added">Birthdays added successfully</string> + <string name="birthdays">생일</string> + <string name="add_birthdays">연락처의 생일 추가</string> + <string name="no_birthdays">조회된 생일이 없음</string> + <string name="birthdays_added">생일 추가 완료</string> <!-- Anniversaries --> - <string name="anniversaries">Anniversaries</string> - <string name="add_anniversaries">Add contact anniversaries</string> - <string name="no_anniversaries">No anniversaries have been found</string> - <string name="anniversaries_added">Anniversaries added successfully</string> + <string name="anniversaries">기념일</string> + <string name="add_anniversaries">연락처의 기념일 추가</string> + <string name="no_anniversaries">조회된 기념일 없음</string> + <string name="anniversaries_added">기념일 추가 완료</string> <!-- Event Reminders --> - <string name="reminder">Reminder</string> - <string name="before">before</string> - <string name="add_another_reminder">Add another reminder</string> + <string name="reminder">알림</string> + <string name="before">전</string> + <string name="add_another_reminder">다른 알림 추가</string> <string name="event_reminders">Event reminders</string> <!-- Export / Import --> - <string name="import_events">Import events</string> - <string name="export_events">Export events</string> - <string name="import_events_from_ics">Import events from an .ics file</string> - <string name="export_events_to_ics">Export events to an .ics file</string> - <string name="default_event_type">Default event type</string> - <string name="export_past_events_too">Export past events too</string> - <string name="include_event_types">Include event types</string> - <string name="filename_without_ics">Filename (without .ics)</string> + <string name="import_events">이벤트들 가져 오기</string> + <string name="export_events">이벤트들 내보내기</string> + <string name="import_events_from_ics">.ics 파일에서 이벤트들 가져오기</string> + <string name="export_events_to_ics">.ics 파일로 이벤트들 내보내기</string> + <string name="default_event_type">기본 이벤트 유형</string> + <string name="export_past_events_too">과거 이벤트들 내보내기</string> + <string name="include_event_types">이벤트 유형 포함</string> + <string name="filename_without_ics">파일이름 (.ics 없이)</string> <string name="override_event_types">Override event types in the file</string> <!-- Event details --> - <string name="title">Title</string> + <string name="title">제목</string> <string name="location">Location</string> - <string name="description">Description</string> - <string name="all_day">All-day</string> + <string name="description">설명</string> + <string name="all_day">하루 종일</string> <!-- Weekly view --> - <string name="week">Week</string> + <string name="week">주</string> <!-- Event types --> - <string name="event_types">Event types</string> - <string name="add_new_type">Add a new type</string> - <string name="edit_type">Edit type</string> - <string name="type_already_exists">Type with this title already exists</string> - <string name="color">Color</string> - <string name="regular_event">Regular event</string> - <string name="cannot_delete_default_type">Default event type cannot be deleted</string> - <string name="select_event_type">Select an event type</string> - <string name="move_events_into_default">Move affected events into the default event type</string> - <string name="remove_affected_events">Permanently remove affected events</string> + <string name="event_types">이벤트 유형</string> + <string name="add_new_type">새로운 유형 추가</string> + <string name="edit_type">유형 수정</string> + <string name="type_already_exists">이미 같은 이름의 유형이 존재합니다</string> + <string name="color">색상</string> + <string name="regular_event">표준 이벤트</string> + <string name="cannot_delete_default_type">기본 유형은 삭제할 수 없습니다</string> + <string name="select_event_type">이벤트 유형 선택</string> + <string name="move_events_into_default">영향을 받는 이벤트들을 기본 유형으로 이동</string> + <string name="remove_affected_events">영향을 받는 이벤트들을 영구적으로 제거</string> <string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string> <!-- Holidays --> - <string name="holidays">Holidays</string> - <string name="add_holidays">Add holidays</string> - <string name="national_holidays">National holidays</string> - <string name="religious_holidays">Religious holidays</string> + <string name="holidays">공휴일</string> + <string name="add_holidays">공휴일 추가</string> + <string name="national_holidays">국경일</string> + <string name="religious_holidays">종교 휴일</string> <string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string> - <string name="importing_some_holidays_failed">Importing some events failed</string> - <string name="importing_holidays_failed">Importing holidays failed</string> + <string name="importing_some_holidays_failed">일부 이벤트를 가져오지 못했습니다</string> + <string name="importing_holidays_failed">공휴일을 가져오는데 실패했습니다</string> <!-- Settings --> - <string name="manage_event_types">Manage event types</string> - <string name="start_day_at">Start day at</string> - <string name="end_day_at">End day at</string> - <string name="week_numbers">Show week numbers</string> - <string name="vibrate">Vibrate on reminder notification</string> - <string name="reminder_sound">Reminder sound</string> - <string name="no_ringtone_picker">No app capable of setting ringtone found</string> - <string name="no_ringtone_selected">None</string> - <string name="day_end_before_start">The day cannot end earlier than it starts</string> - <string name="caldav_sync">CalDAV sync</string> + <string name="manage_event_types">이벤트 유형 관리</string> + <string name="start_day_at">시작 시간</string> + <string name="end_day_at">종료 시간</string> + <string name="week_numbers">주 번호 표시</string> + <string name="vibrate">알림 시 진동</string> + <string name="reminder_sound">알림 소리</string> + <string name="no_ringtone_picker">벨소리를 설정할 수 있는 앱이 없습니다</string> + <string name="no_ringtone_selected">없음</string> + <string name="day_end_before_start">요일은 시작하기 전에 끝날 수 없습니다</string> + <string name="caldav_sync">CalDAV 동기화</string> <string name="event_lists">Event lists</string> - <string name="display_past_events">Display events from the past</string> + <string name="display_past_events">과거의 이벤트 표시</string> <string name="replace_description_with_location">Replace event description with location</string> <string name="delete_all_events">Delete all events</string> <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string> @@ -161,15 +161,15 @@ <!-- CalDAV sync --> <string name="caldav">CalDAV</string> - <string name="select_caldav_calendars">Select calendars to sync</string> - <string name="manage_synced_calendars">Manage synced calendars</string> - <string name="store_locally_only">Store locally only</string> - <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> - <string name="refreshing">Refreshing…</string> - <string name="refreshing_complete">Refreshing complete</string> - <string name="editing_calendar_failed">Editing calendar failed</string> - <string name="syncing">Syncing…</string> - <string name="synchronization_completed">Sync completed</string> + <string name="select_caldav_calendars">동기화 할 캘린더 선택</string> + <string name="manage_synced_calendars">동기화된 캘린더 관리</string> + <string name="store_locally_only">로컬에만 저장</string> + <string name="refresh_caldav_calendars">CalDAV 캘린더들 새로고침</string> + <string name="refreshing">새로고침 중…</string> + <string name="refreshing_complete">새로고침 완료</string> + <string name="editing_calendar_failed">변경 실패</string> + <string name="syncing">동기화중…</string> + <string name="synchronization_completed">동기화 완료</string> <!-- alternative versions for some languages, use the same translations if you are not sure what this means --> <!-- used in repetition, like "Every last Sunday" --> @@ -201,19 +201,19 @@ <!-- Strings displayed only on Google Playstore. Optional, but good to have --> <!-- Short description has to have less than 80 chars --> - <string name="app_short_description">A simple calendar with events, customizable widget and no ads.</string> + <string name="app_short_description">사용자 정의 위젯이 있는 심플한 캘린더입니다. 그리고 광고가 없습니다.</string> <string name="app_long_description"> - A simple calendar with optional CalDAV synchronization. You can easily create recurring events and setup reminders, it can also display week numbers. + Google 동기화가 있는 심플한 캘린더입니다. 쉽게 반복 이벤트와 알림을 설정할 수 있으며, 주 번호도 표시할 수 있습니다. - Contains a monthly view and an event list widget where you can customize the color of the text, as well as the alpha and the color of the background. + 텍스트의 색상은 물론 배경의 투명도와 색상을 정할 수 있는, 크기 조절이 가능한 4x4 위젯이 포함되어 있습니다. - Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. + 광고와 불필요한 권한이 없습니다. 이것은 완전히 오픈소스이며, 색상을 설정할 수 있습니다. - The Storage permission is needed only for exporting or importing events from .ics files. + 저장 권한은 .ics 파일에서 이벤트를 가져오는 경우에만 필요합니다. The Contacts permission is used only at importing contact birthdays and anniversaries. - This app is just one piece of a bigger series of apps. You can find the rest of them at https://www.simplemobiletools.com + 이 앱은 더 큰 시리즈의 앱들 중 하나입니다. 나머지는 https://www.simplemobiletools.com 에서 찾을 수 있습니다. </string> <!--