sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix jingle by libery and for sum7

This commit is contained in:
genofire 2020-04-24 01:57:05 +02:00
parent fec143d7a4
commit 201a55c8b0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -80,7 +80,8 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:3.12.10' implementation 'com.squareup.okhttp3:okhttp:3.12.10'
implementation 'com.google.guava:guava:27.1-android' implementation 'com.google.guava:guava:27.1-android'
quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.11.1' quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.11.1'
implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs') implementation 'org.webrtc:google-webrtc:1.0.30039'
//implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs')
} }
ext { ext {

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -1995,7 +1995,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
this.binding.textinput.append(this.conversation.getNextMessage()); this.binding.textinput.append(this.conversation.getNextMessage());
} }
this.binding.textinput.setKeyboardListener(this); this.binding.textinput.setKeyboardListener(this);
messageListAdapter.updatePreferences();
refresh(false); refresh(false);
this.conversation.messagesLoaded.set(true); this.conversation.messagesLoaded.set(true);
Log.d(Config.LOGTAG, "scrolledToBottomAndNoPending=" + Boolean.toString(scrolledToBottomAndNoPending)); Log.d(Config.LOGTAG, "scrolledToBottomAndNoPending=" + Boolean.toString(scrolledToBottomAndNoPending));
@ -2903,4 +2902,4 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} }
activity.switchToAccount(message.getConversation().getAccount(), fingerprint); activity.switchToAccount(message.getConversation().getAccount(), fingerprint);
} }
} }

3
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

@ -100,7 +100,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
this.audioPlayer = new AudioPlayer(this); this.audioPlayer = new AudioPlayer(this);
this.activity = activity; this.activity = activity;
metrics = getContext().getResources().getDisplayMetrics(); metrics = getContext().getResources().getDisplayMetrics();
updatePreferences();
} }
@ -355,7 +354,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
int color = darkBackground ? this.getMessageTextColor(darkBackground, false) int color = darkBackground ? this.getMessageTextColor(darkBackground, false)
: ContextCompat.getColor(activity, R.color.green700_desaturated); : ContextCompat.getColor(activity, R.color.orange700_desaturated);
DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }

2
src/main/res/layout/activity_rtp_session.xml
View File

@ -191,7 +191,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@drawable/ic_call_white_48dp" android:src="@drawable/ic_call_white_48dp"
android:visibility="gone" android:visibility="gone"
app:backgroundTint="@color/green700" app:backgroundTint="@color/green500"
app:elevation="4dp" app:elevation="4dp"
app:fabCustomSize="72dp" app:fabCustomSize="72dp"
app:maxImageSize="36dp" app:maxImageSize="36dp"