Skip to content

fix - unable to change user avatar #5942

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.

Sign up for GitHub

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

Merged
AndyScherzinger merged 4 commits into from
Mar 12, 2026
Merged

fix - unable to change user avatar #5942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
778625f
fix crop screen
sowjanyakch Mar 10, 2026
330f942
docs: Add comments for the lib's arbitrary dependency override
AndyScherzinger Mar 11, 2026
80d392e
style(avatar): Theme UCrop activity to have white header/footer
AndyScherzinger Mar 11, 2026
99eadda
fix: move v26 incompatible style identifier to v27+ theming
AndyScherzinger Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,11 @@ dependencies {
implementation "io.noties.markwon:ext-tasklist:$markwonVersion"
implementation "io.noties.markwon:ext-tables:$markwonVersion"

// Avatar picker
implementation 'com.github.nextcloud-deps:ImagePicker:2.1.0.2'
// Override avatar picker's internal crop lib for better dge-to-edge support
implementation 'com.github.yalantis:ucrop:2.2.11'

implementation 'io.github.elye:loaderviewlibrary:3.0.0'
implementation 'org.osmdroid:osmdroid-android:6.1.20'
implementation ('fr.dudie:nominatim-api:3.4', {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,16 @@
android:name=".conversationinfo.ConversationInfoActivity"
android:theme="@style/AppTheme" />

<activity
android:name="com.github.dhaval2404.imagepicker.ImagePickerActivity"
android:theme="@style/ImagePickerTheme.NonFullScreen"
tools:replace="android:theme" />

<activity
android:name="com.yalantis.ucrop.UCropActivity"
android:theme="@style/Theme.UCrop"
tools:replace="android:theme" />

<activity
android:name=".conversationinfoedit.ConversationInfoEditActivity"
android:theme="@style/AppTheme" />
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values-v27/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,9 @@
<item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
<item name="android:alertDialogTheme">?alertDialogTheme</item>
</style>

<style name="ImagePickerTheme.NonFullScreen" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:fitsSystemWindows">true</item>
</style>
</resources>
22 changes: 22 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@
<item name="iconTint">@color/fontAppbar</item>
</style>

<style name="ImagePickerTheme.NonFullScreen" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:fitsSystemWindows">true</item>
</style>

<style name="Theme.UCrop" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Status bar: dark background, white (light) icons -->
<item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>

<!-- Navigation bar: dark to match -->
<item name="android:navigationBarColor">@android:color/transparent</item>

<!-- Force a light (white) toolbar surface even in dark mode -->
<item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#000000</item>

<!-- Primary used as toolbar tint fallback -->
<item name="colorPrimary">#FFFFFF</item>
<item name="colorOnPrimary">#000000</item>
</style>


<style name="ChatSendButtonMenu" parent="@style/Widget.Material3.PopupMenu">
<item name="android:dropDownVerticalOffset">-90dp</item>
<item name="android:colorPrimary">@color/fg_inverse</item>
Expand Down
8 changes: 8 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18125,6 +18125,14 @@
<sha256 value="2e65fbabc8876cb388abf006b399ed5241e963940e0798d0e2310e339aaf738b" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.yalantis" name="ucrop" version="2.2.11">
<artifact name="ucrop-2.2.11.aar">
<sha256 value="c12db23784aaa954d8998106cf5c1cfee2993c62f7601c790da8e21d4c51a0a9" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="ucrop-2.2.11.pom">
<sha256 value="1e070fcc04b929e8b0f847463240550a1639e4bc2e7110b0a57f4f1366247580" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.yalantis" name="ucrop" version="2.2.6">
<artifact name="ucrop-2.2.6.aar">
<sha256 value="aa2a5929b6916d05d347a24ddb1319e0330f109f683b9080897d73fdb8638e6b" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down
Loading