Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5 view dvbutton #25

Merged
merged 20 commits into from
May 14, 2024
Merged

5 view dvbutton #25

merged 20 commits into from
May 14, 2024

Conversation

DimaK21
Copy link
Contributor

@DimaK21 DimaK21 commented May 5, 2024

два класса для кнопок: PrimaryButtonView, SecondaryButtonView

@DimaK21 DimaK21 self-assigned this May 5, 2024
@DimaK21 DimaK21 requested a review from n-shvedov27 as a code owner May 5, 2024 20:23
@DimaK21 DimaK21 linked an issue May 5, 2024 that may be closed by this pull request
@DimaK21 DimaK21 requested review from a team, GoetzDeBouville and NikolayRyabcev and removed request for a team May 5, 2024 20:24
@DimaK21
Copy link
Contributor Author

DimaK21 commented May 7, 2024

С учетом того что 10 и 12 ветки не влиты, получается большой объем кода в ПР. Может сделать пр в 12 ветку в таком случае? 12 ветка обновилась, мерджни ее в 5 снова

12 залил в 5

# Conflicts:
#	uikit/src/main/res/values/custom_attrs.xml
#	uikit_sample/src/main/AndroidManifest.xml
@n-shvedov27 n-shvedov27 merged commit cf4d431 into develop May 14, 2024
1 check passed
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.

Кастомная view DVButton
4 participants