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

2.7.3 merge #2164

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

2.7.3 merge #2164

wants to merge 12 commits into from

Conversation

TejNote
Copy link

@TejNote TejNote commented Oct 27, 2021

No description provided.

TejNote added 12 commits March 31, 2021 17:45
2. 닥톡 스타일 추가
3. statusbar, navbar 색상 변경 disable
� Conflicts:
�	app/src/main/java/com/luck/pictureselector/MainActivity.java
�	gradle/wrapper/gradle-wrapper.properties
�	picture_library/src/main/java/com/luck/picture/lib/PictureBaseActivity.java
�	picture_library/src/main/java/com/luck/picture/lib/PictureSelectionModel.java
�	picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java
�	picture_library/src/main/res/layout/picture_album_folder_item.xml
�	picture_library/src/main/res/values-de-rDE/strings.xml
�	picture_library/src/main/res/values-en-rUS/string.xml
�	picture_library/src/main/res/values-es-rES/string.xml
�	picture_library/src/main/res/values-fr-rFR/strings.xml
�	picture_library/src/main/res/values-ja-rJP/strings.xml
�	picture_library/src/main/res/values-ko-rKR/strings.xml
�	picture_library/src/main/res/values-vi-rVN/string.xml
�	picture_library/src/main/res/values-zh-rCN/strings.xml
�	picture_library/src/main/res/values-zh-rTW/strings.xml
�	picture_library/src/main/res/values/strings.xml
�	ucrop/src/main/res/values/strings.xml
…vityResultLauncher

2. startOpenCameraVideo deprecated, and add startOpenCameraVideo ActivityResultLauncher
3. startOpenCameraAudio deprecated, and add startOpenCameraAudio ActivityResultLauncher
4. library version up
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.

1 participant