filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/aris/threads

This commit is contained in:
ariskotsomitopoulos 2021-12-16 20:55:52 +02:00
parent 638d56c707 3b35be510f
commit f769d84443
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/2467.bugfix Normal file
View File

@ -0,0 +1 @@
Fixing proximity sensor still being active after a call

1
changelog.d/4710.bugfix Normal file
View File

@ -0,0 +1 @@
Call banner: center text vertically

1
changelog.d/4713.misc Normal file
View File

@ -0,0 +1 @@
Avoids leaking the activity windows when loading dialogs are displaying

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=b75392c5625a88bccd58a574552a5a323edca82dab5942d2d41097f809c6bcce distributionSha256Sum=dd54e87b4d7aa8ff3c6afb0f7805aa121d4b70bca55b8c9b1b896eb103184582
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

1
vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
View File

@ -151,6 +151,7 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
override fun onDestroyView() { override fun onDestroyView() {
Timber.i("onDestroyView Fragment ${javaClass.simpleName}") Timber.i("onDestroyView Fragment ${javaClass.simpleName}")
_binding = null _binding = null
dismissLoadingDialog()
super.onDestroyView() super.onDestroyView()
} }

4
vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
View File

@ -93,7 +93,9 @@ class CallProximityManager @Inject constructor(
if (wakeLock == null) { if (wakeLock == null) {
wakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, generateWakeLockTag()) wakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, generateWakeLockTag())
} }
wakeLock?.acquire(WAKE_LOCK_TIMEOUT_MILLIS) wakeLock
?.takeIf { !it.isHeld }
?.acquire(WAKE_LOCK_TIMEOUT_MILLIS)
} }
private fun onProximityFar() { private fun onProximityFar() {

15
vector/src/main/res/layout/view_current_calls.xml
View File

@ -1,25 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
tools:background="?colorPrimary"
tools:parentTag="android.widget.FrameLayout"> tools:parentTag="android.widget.FrameLayout">
<TextView <TextView
android:id="@+id/currentCallsInfo" android:id="@+id/currentCallsInfo"
style="@style/Widget.Vector.TextView.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="10dp" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingTop="12dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:paddingBottom="12dp" android:textColor="?colorOnPrimary"
android:text="@string/call_only_active" tools:text="@string/call_only_active" />
android:textColor="?colorOnPrimary" />
</merge> </merge>