Skip to content

1433 extract feature UI module#1441

Merged
Futsch1 merged 6 commits into
Futsch1:mainfrom
ThomasKiljanczykDev:1433-extract-feature-ui-module
May 24, 2026
Merged

1433 extract feature UI module#1441
Futsch1 merged 6 commits into
Futsch1:mainfrom
ThomasKiljanczykDev:1433-extract-feature-ui-module

Conversation

@ThomasKiljanczykDev
Copy link
Copy Markdown
Contributor

@Futsch1 final PR, merge after the PR #1440

Comment thread app/src/main/java/com/futsch1/medtimer/OptionsMenu.kt
Comment thread feature/reminders/src/main/res/values/strings.xml Outdated
@Futsch1
Copy link
Copy Markdown
Owner

Futsch1 commented May 24, 2026

@ThomasKiljanczykDev I have some comments/questions to be resolved before merging

@ThomasKiljanczykDev ThomasKiljanczykDev force-pushed the 1433-extract-feature-ui-module branch from a95f073 to 0f0b201 Compare May 24, 2026 16:19
# Conflicts:
#	app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt
#	app/src/androidTest/java/com/futsch1/medtimer/ReminderTest.kt
#	app/src/main/java/com/futsch1/medtimer/MedTimerAppIntro.kt
#	app/src/main/res/drawable/alarm.xml
#	app/src/main/res/drawable/check2_all.xml
#	app/src/main/res/drawable/ic_monochrome.xml
#	app/src/main/res/layout/preference_widget_material_switch.xml
#	core/ui/src/main/res/drawable/alarm.xml
#	core/ui/src/main/res/drawable/check2_all.xml
#	core/ui/src/main/res/drawable/ic_monochrome.xml
#	core/ui/src/main/res/layout/preference_widget_material_switch.xml
#	feature/ui/src/main/res/drawable/alarm.xml
#	feature/ui/src/main/res/drawable/check2_all.xml
#	feature/ui/src/main/res/drawable/ic_monochrome.xml
#	feature/ui/src/main/res/layout/preference_widget_material_switch.xml
Move all strings, plurals, arrays, colors, dimens, styles/themes, drawables
and mipmaps (incl. all locale variants) from :app, :feature:reminders and
:feature:ui into :core:ui, and re-qualify the corresponding R references to
com.futsch1.medtimer.core.ui.R. Code-coupled resources (layouts, menus, the
navigation graph, preference/widget XML) stay in their feature modules.
Replace fully-qualified com.futsch1.medtimer.core.ui.R access with a plain R
import in files that don't also use their own module's R. Files that reference
both their own R (R.id/R.layout, kept in feature modules) and core.ui.R keep
the fully-qualified core.ui.R, since only one R can be imported as plain R.
@ThomasKiljanczykDev ThomasKiljanczykDev force-pushed the 1433-extract-feature-ui-module branch from 0f0b201 to 3e99791 Compare May 24, 2026 16:22
@ThomasKiljanczykDev
Copy link
Copy Markdown
Contributor Author

@Futsch1 I've addressed your comments

@ThomasKiljanczykDev
Copy link
Copy Markdown
Contributor Author

@Futsch1 all green.

Do you have any more comments I need to address?

@Futsch1 Futsch1 merged commit 9f06ba8 into Futsch1:main May 24, 2026
10 checks passed
@ThomasKiljanczykDev ThomasKiljanczykDev deleted the 1433-extract-feature-ui-module branch May 24, 2026 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants