Skip to content

Commit e2ae8af

Browse files
naveensinghnaveensingh
committed
Migrate to non-transitive R class
1 parent a408323 commit e2ae8af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+271
-217
lines changed

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt

+24-9
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,13 @@ class EventActivity : SimpleActivity() {
129129
override fun onBackPressed() {
130130
if (System.currentTimeMillis() - mLastSavePromptTS > SAVE_DISCARD_PROMPT_INTERVAL && isEventChanged()) {
131131
mLastSavePromptTS = System.currentTimeMillis()
132-
ConfirmationAdvancedDialog(this, "", R.string.save_before_closing, R.string.save, R.string.discard) {
132+
ConfirmationAdvancedDialog(
133+
activity = this,
134+
message = "",
135+
messageId = com.simplemobiletools.commons.R.string.save_before_closing,
136+
positive = com.simplemobiletools.commons.R.string.save,
137+
negative = com.simplemobiletools.commons.R.string.discard
138+
) {
133139
if (it) {
134140
saveCurrentEvent()
135141
} else {
@@ -779,7 +785,7 @@ class EventActivity : SimpleActivity() {
779785

780786
private fun getRepeatXthDayInMonthString(includeBase: Boolean, repeatRule: Int): String {
781787
val weekDayString = getRepeatXthDayString(includeBase, repeatRule)
782-
val monthString = resources.getStringArray(R.array.in_months)[mEventStartDateTime.monthOfYear - 1]
788+
val monthString = resources.getStringArray(com.simplemobiletools.commons.R.array.in_months)[mEventStartDateTime.monthOfYear - 1]
783789
return "$weekDayString $monthString"
784790
}
785791

@@ -794,7 +800,11 @@ class EventActivity : SimpleActivity() {
794800
private fun checkRepetitionRuleText() {
795801
when {
796802
mRepeatInterval.isXWeeklyRepetition() -> {
797-
binding.eventRepetitionRule.text = if (mRepeatRule == EVERY_DAY_BIT) getString(R.string.every_day) else getShortDaysFromBitmask(mRepeatRule)
803+
binding.eventRepetitionRule.text = if (mRepeatRule == EVERY_DAY_BIT) {
804+
getString(com.simplemobiletools.commons.R.string.every_day)
805+
} else {
806+
getShortDaysFromBitmask(mRepeatRule)
807+
}
798808
}
799809

800810
mRepeatInterval.isXMonthlyRepetition() -> {
@@ -934,8 +944,8 @@ class EventActivity : SimpleActivity() {
934944

935945
private fun showReminderTypePicker(currentValue: Int, callback: (Int) -> Unit) {
936946
val items = arrayListOf(
937-
RadioItem(REMINDER_NOTIFICATION, getString(R.string.notification)),
938-
RadioItem(REMINDER_EMAIL, getString(R.string.email))
947+
RadioItem(REMINDER_NOTIFICATION, getString(com.simplemobiletools.commons.R.string.notification)),
948+
RadioItem(REMINDER_EMAIL, getString(com.simplemobiletools.commons.R.string.email))
939949
)
940950
RadioGroupDialog(this, items, currentValue) {
941951
callback(it as Int)
@@ -970,7 +980,12 @@ class EventActivity : SimpleActivity() {
970980

971981
private fun updateReminderTypeImage(view: ImageView, reminder: Reminder) {
972982
view.beVisibleIf(reminder.minutes != REMINDER_OFF && mEventCalendarId != STORED_LOCALLY_ONLY)
973-
val drawable = if (reminder.type == REMINDER_NOTIFICATION) R.drawable.ic_bell_vector else R.drawable.ic_mail_vector
983+
val drawable = if (reminder.type == REMINDER_NOTIFICATION) {
984+
com.simplemobiletools.commons.R.drawable.ic_bell_vector
985+
} else {
986+
com.simplemobiletools.commons.R.drawable.ic_mail_vector
987+
}
988+
974989
val icon = resources.getColoredDrawableWithColor(drawable, getProperTextColor())
975990
view.setImageDrawable(icon)
976991
}
@@ -1046,7 +1061,7 @@ class EventActivity : SimpleActivity() {
10461061

10471062
if (currentCalendar == null) {
10481063
mEventCalendarId = STORED_LOCALLY_ONLY
1049-
val mediumMargin = resources.getDimension(R.dimen.medium_margin).toInt()
1064+
val mediumMargin = resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin).toInt()
10501065
eventCaldavCalendarName.apply {
10511066
text = getString(R.string.store_locally_only)
10521067
setPadding(paddingLeft, paddingTop, paddingRight, mediumMargin)
@@ -1082,7 +1097,7 @@ class EventActivity : SimpleActivity() {
10821097
runOnUiThread {
10831098
eventCaldavCalendarName.apply {
10841099
text = currentCalendar.displayName
1085-
setPadding(paddingLeft, paddingTop, paddingRight, resources.getDimension(R.dimen.tiny_margin).toInt())
1100+
setPadding(paddingLeft, paddingTop, paddingRight, resources.getDimension(com.simplemobiletools.commons.R.dimen.tiny_margin).toInt())
10861101
}
10871102

10881103
eventCaldavCalendarHolder.apply {
@@ -1320,7 +1335,7 @@ class EventActivity : SimpleActivity() {
13201335
storeEvent(wasRepeatable)
13211336
}
13221337
} else {
1323-
PermissionRequiredDialog(this, R.string.allow_notifications_reminders, { openNotificationSettings() })
1338+
PermissionRequiredDialog(this, com.simplemobiletools.commons.R.string.allow_notifications_reminders, { openNotificationSettings() })
13241339
}
13251340
}
13261341
} else {

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt

+31-25
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
159159
addBirthdaysAnniversariesAtStart()
160160

161161
if (isPackageInstalled("com.simplemobiletools.calendar")) {
162-
ConfirmationDialog(this, "", R.string.upgraded_from_free_calendar, R.string.ok, 0, false) {}
162+
ConfirmationDialog(
163+
activity = this,
164+
message = "",
165+
messageId = com.simplemobiletools.commons.R.string.upgraded_from_free_calendar,
166+
positive = com.simplemobiletools.commons.R.string.ok,
167+
negative = 0,
168+
cancelOnTouchOutside = false
169+
) {}
163170
}
164171

165172
addImportIdsToTasks {
@@ -247,7 +254,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
247254
findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && !binding.mainMenu.isSearchOpen
248255
findItem(R.id.go_to_date).isVisible = config.storedView != EVENTS_LIST_VIEW
249256
findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
250-
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
257+
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)
251258
}
252259
}
253260

@@ -527,7 +534,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
527534
}
528535

529536
private fun resetActionBarTitle() {
530-
binding.mainMenu.updateHintText(getString(R.string.search))
537+
binding.mainMenu.updateHintText(getString(com.simplemobiletools.commons.R.string.search))
531538
}
532539

533540
private fun showFilterDialog() {
@@ -585,7 +592,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
585592
RadioGroupDialog(this, items) { selectedHoliday ->
586593
SetRemindersDialog(this, OTHER_EVENT) {
587594
val reminders = it
588-
toast(R.string.importing)
595+
toast(com.simplemobiletools.commons.R.string.importing)
589596
ensureBackgroundThread {
590597
val holidays = getString(R.string.holidays)
591598
var eventTypeId = eventsHelper.getEventTypeIdWithClass(HOLIDAY_EVENT)
@@ -631,7 +638,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
631638
}
632639
}
633640
} else {
634-
toast(R.string.no_contacts_permission)
641+
toast(com.simplemobiletools.commons.R.string.no_contacts_permission)
635642
}
636643
}
637644
}
@@ -662,7 +669,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
662669
}
663670
}
664671
} else {
665-
toast(R.string.no_contacts_permission)
672+
toast(com.simplemobiletools.commons.R.string.no_contacts_permission)
666673
}
667674
}
668675
}
@@ -705,7 +712,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
705712
private fun handleParseResult(result: ImportResult) {
706713
toast(
707714
when (result) {
708-
ImportResult.IMPORT_NOTHING_NEW -> R.string.no_new_items
715+
ImportResult.IMPORT_NOTHING_NEW -> com.simplemobiletools.commons.R.string.no_new_items
709716
ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
710717
ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
711718
else -> R.string.importing_holidays_failed
@@ -964,7 +971,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
964971

965972
private fun animateFabIcon(showPlus: Boolean) {
966973
val newDrawableId = if (showPlus) {
967-
R.drawable.ic_plus_vector
974+
com.simplemobiletools.commons.R.drawable.ic_plus_vector
968975
} else {
969976
R.drawable.ic_today_vector
970977
}
@@ -1071,13 +1078,13 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
10711078
try {
10721079
startActivityForResult(this, PICK_IMPORT_SOURCE_INTENT)
10731080
} catch (e: ActivityNotFoundException) {
1074-
toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
1081+
toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
10751082
} catch (e: Exception) {
10761083
showErrorToast(e)
10771084
}
10781085
}
10791086
} else {
1080-
PermissionRequiredDialog(this, R.string.allow_notifications_reminders, { openNotificationSettings() })
1087+
PermissionRequiredDialog(this, com.simplemobiletools.commons.R.string.allow_notifications_reminders, { openNotificationSettings() })
10811088
}
10821089
}
10831090
} else {
@@ -1101,7 +1108,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
11011108
"content" -> {
11021109
val tempFile = getTempFile()
11031110
if (tempFile == null) {
1104-
toast(R.string.unknown_error_occurred)
1111+
toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
11051112
return
11061113
}
11071114

@@ -1115,7 +1122,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
11151122
}
11161123
}
11171124

1118-
else -> toast(R.string.invalid_file_format)
1125+
else -> toast(com.simplemobiletools.commons.R.string.invalid_file_format)
11191126
}
11201127
}
11211128

@@ -1144,7 +1151,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
11441151
try {
11451152
startActivityForResult(this, PICK_EXPORT_FILE_INTENT)
11461153
} catch (e: ActivityNotFoundException) {
1147-
toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
1154+
toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
11481155
} catch (e: Exception) {
11491156
showErrorToast(e)
11501157
}
@@ -1167,14 +1174,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
11671174
ensureBackgroundThread {
11681175
val events = eventsHelper.getEventsToExport(eventTypes, config.exportEvents, config.exportTasks, config.exportPastEntries)
11691176
if (events.isEmpty()) {
1170-
toast(R.string.no_entries_for_exporting)
1177+
toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting)
11711178
} else {
11721179
IcsExporter(this).exportEvents(outputStream, events, true) { result ->
11731180
toast(
11741181
when (result) {
1175-
ExportResult.EXPORT_OK -> R.string.exporting_successful
1176-
ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed
1177-
else -> R.string.exporting_failed
1182+
ExportResult.EXPORT_OK -> com.simplemobiletools.commons.R.string.exporting_successful
1183+
ExportResult.EXPORT_PARTIAL -> com.simplemobiletools.commons.R.string.exporting_some_entries_failed
1184+
else -> com.simplemobiletools.commons.R.string.exporting_failed
11781185
}
11791186
)
11801187
}
@@ -1196,16 +1203,15 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
11961203
FAQItem(R.string.faq_3_title, R.string.faq_3_text),
11971204
FAQItem(R.string.faq_6_title, R.string.faq_6_text),
11981205
FAQItem(R.string.faq_1_title, R.string.faq_1_text),
1199-
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
1200-
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
1206+
FAQItem(com.simplemobiletools.commons.R.string.faq_1_title_commons, com.simplemobiletools.commons.R.string.faq_1_text_commons),
1207+
FAQItem(com.simplemobiletools.commons.R.string.faq_4_title_commons, com.simplemobiletools.commons.R.string.faq_4_text_commons),
12011208
FAQItem(R.string.faq_4_title, R.string.faq_4_text)
12021209
)
12031210

1204-
if (!resources.getBoolean(R.bool.hide_google_relations)) {
1205-
faqItems.add(FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons))
1206-
faqItems.add(FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons))
1207-
faqItems.add(FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))
1208-
1211+
if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) {
1212+
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons))
1213+
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons))
1214+
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_7_title_commons, com.simplemobiletools.commons.R.string.faq_7_text_commons))
12091215
}
12101216

12111217
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
@@ -1224,7 +1230,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
12241230
val placeholderTextId = if (config.displayEventTypes.isEmpty()) {
12251231
R.string.everything_filtered_out
12261232
} else {
1227-
R.string.no_items_found
1233+
com.simplemobiletools.commons.R.string.no_items_found
12281234
}
12291235

12301236
binding.searchPlaceholder.setText(placeholderTextId)

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt

+21-16
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,13 @@ class SettingsActivity : SimpleActivity() {
348348

349349
private fun setupStartWeekOn() = binding.apply {
350350
val items = arrayListOf(
351-
RadioItem(DateTimeConstants.SUNDAY, getString(R.string.sunday)),
352-
RadioItem(DateTimeConstants.MONDAY, getString(R.string.monday)),
353-
RadioItem(DateTimeConstants.TUESDAY, getString(R.string.tuesday)),
354-
RadioItem(DateTimeConstants.WEDNESDAY, getString(R.string.wednesday)),
355-
RadioItem(DateTimeConstants.THURSDAY, getString(R.string.thursday)),
356-
RadioItem(DateTimeConstants.FRIDAY, getString(R.string.friday)),
357-
RadioItem(DateTimeConstants.SATURDAY, getString(R.string.saturday)),
351+
RadioItem(DateTimeConstants.SUNDAY, getString(com.simplemobiletools.commons.R.string.sunday)),
352+
RadioItem(DateTimeConstants.MONDAY, getString(com.simplemobiletools.commons.R.string.monday)),
353+
RadioItem(DateTimeConstants.TUESDAY, getString(com.simplemobiletools.commons.R.string.tuesday)),
354+
RadioItem(DateTimeConstants.WEDNESDAY, getString(com.simplemobiletools.commons.R.string.wednesday)),
355+
RadioItem(DateTimeConstants.THURSDAY, getString(com.simplemobiletools.commons.R.string.thursday)),
356+
RadioItem(DateTimeConstants.FRIDAY, getString(com.simplemobiletools.commons.R.string.friday)),
357+
RadioItem(DateTimeConstants.SATURDAY, getString(com.simplemobiletools.commons.R.string.saturday)),
358358
)
359359

360360
settingsStartWeekOn.text = getDayOfWeekString(config.firstDayOfWeek)
@@ -642,7 +642,7 @@ class SettingsActivity : SimpleActivity() {
642642

643643
private fun getDisplayPastEventsText(displayPastEvents: Int): String {
644644
return if (displayPastEvents == 0) {
645-
getString(R.string.never)
645+
getString(com.simplemobiletools.commons.R.string.never)
646646
} else {
647647
getFormattedMinutes(displayPastEvents, false)
648648
}
@@ -652,10 +652,10 @@ class SettingsActivity : SimpleActivity() {
652652
settingsFontSize.text = getFontSizeText()
653653
settingsFontSizeHolder.setOnClickListener {
654654
val items = arrayListOf(
655-
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
656-
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
657-
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
658-
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large))
655+
RadioItem(FONT_SIZE_SMALL, getString(com.simplemobiletools.commons.R.string.small)),
656+
RadioItem(FONT_SIZE_MEDIUM, getString(com.simplemobiletools.commons.R.string.medium)),
657+
RadioItem(FONT_SIZE_LARGE, getString(com.simplemobiletools.commons.R.string.large)),
658+
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(com.simplemobiletools.commons.R.string.extra_large))
659659
)
660660

661661
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
@@ -820,7 +820,7 @@ class SettingsActivity : SimpleActivity() {
820820
private fun updateDefaultDurationText() {
821821
val duration = config.defaultDuration
822822
binding.settingsDefaultDuration.text = if (duration == 0) {
823-
"0 ${getString(R.string.minutes_raw)}"
823+
"0 ${getString(com.simplemobiletools.commons.R.string.minutes_raw)}"
824824
} else {
825825
getFormattedMinutes(duration, false)
826826
}
@@ -961,7 +961,7 @@ class SettingsActivity : SimpleActivity() {
961961
try {
962962
startActivityForResult(this, PICK_IMPORT_SOURCE_INTENT)
963963
} catch (e: ActivityNotFoundException) {
964-
toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
964+
toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
965965
} catch (e: Exception) {
966966
showErrorToast(e)
967967
}
@@ -982,7 +982,7 @@ class SettingsActivity : SimpleActivity() {
982982

983983
private fun parseFile(inputStream: InputStream?) {
984984
if (inputStream == null) {
985-
toast(R.string.unknown_error_occurred)
985+
toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
986986
return
987987
}
988988

@@ -1060,7 +1060,12 @@ class SettingsActivity : SimpleActivity() {
10601060
}
10611061

10621062
runOnUiThread {
1063-
val msg = if (configValues.size > 0) R.string.settings_imported_successfully else R.string.no_entries_for_importing
1063+
val msg = if (configValues.size > 0) {
1064+
com.simplemobiletools.commons.R.string.settings_imported_successfully
1065+
} else {
1066+
com.simplemobiletools.commons.R.string.no_entries_for_importing
1067+
}
1068+
10641069
toast(msg)
10651070

10661071
setupSettingItems()

0 commit comments

Comments
 (0)