ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Lyndon
2018-06-05 10:57:08 +02:00
parent 7612b2aa97
commit 58825a6c43
13 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
View File

@@ -104,8 +104,8 @@ dependencies {
implementation 'io.reactivex:rxjava:1.1.6'
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
implementation 'com.squareup.retrofit2:retrofit:2.1.0'
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
implementation 'com.squareup.retrofit2:retrofit:2.2.0'
implementation 'com.squareup.retrofit2:converter-gson:2.2.0'
implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
implementation 'com.squareup.okhttp3:okhttp:3.7.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
@@ -123,6 +123,8 @@ dependencies {
compileOnly 'javax.annotation:jsr250-api:1.0'
implementation files('libs/sanselan-0_97-android-1.0.0.jar')
implementation 'com.firebase:firebase-jobdispatcher:0.5.2'
implementation 'com.google.android.gms:play-services-base:15.0.1'
}
task adp2upload(type: Exec, dependsOn: "build") {
@@ -138,4 +140,4 @@ task adp2upload(type: Exec, dependsOn: "build") {
commandLine 'upload_build.sh', "-c", "$channel", "-v", "$versionCode", "-p", "android", "-a", "$slug", "-f", "$file", "-i", "$identifier", "-n", "$notes"
}
apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.gms.google-services'

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Message.java
View File

@@ -89,7 +89,9 @@ public class Message {
}
public enum Status {
DELIVERED(R.drawable.message_delivered), FAILED(R.drawable.message_failed), PENDING(-1);
DELIVERED(R.drawable.message_delivered),
FAILED(R.drawable.message_failed),
PENDING(-1);
private int resourceId;

24
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
View File

@@ -3,6 +3,9 @@ package de.beyondsoft.ownchat.page.chat;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.github.lzyzsd.circleprogress.DonutProgress;
import butterknife.OnItemLongClick;
import butterknife.OnLongClick;
import de.beyondsoft.ownchat.R;
import de.beyondsoft.ownchat.model.Message;
import de.beyondsoft.ownchat.utils.DateUtils;
@@ -16,6 +19,7 @@ import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import java.util.ArrayList;
@@ -404,7 +408,7 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
@Optional
@OnClick(R.id.chat_item_sending_failed)
void retrySendingClicked() {
if (mIsRetrying) {
if(mIsRetrying) {
return;
}
@@ -413,12 +417,20 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
Message messageToResend = mMessages.get(currentPosition - mPositionOffset.get(currentPosition));
statusProgressBar.setVisibility(View.VISIBLE);
if(statusProgressBar != null) {
statusProgressBar.setVisibility(View.VISIBLE);
}
ViewUtils.setProgressBarColor(statusProgressBar, R.color.colorWhite);
statusImageView.setVisibility(View.GONE);
if(statusImageView != null) {
statusImageView.setVisibility(View.GONE);
}
if(sendingFailedTextView != null) {
sendingFailedTextView.setVisibility(View.GONE);
}
sendingFailedTextView.setVisibility(View.GONE);
mMessageClickListener.resendMessage(messageToResend);
}
@@ -428,12 +440,12 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
int currentPosition = getAdapterPosition();
Message message = mMessages.get(currentPosition - mPositionOffset.get(currentPosition));
if (message.status != Message.Status.DELIVERED) {
if(message.status != Message.Status.DELIVERED) {
mMessageClickListener.localFileClicked(Uri.parse(message.uri));
return;
}
if (mDownloadProgressMap.containsKey(currentPosition)) {
if(mDownloadProgressMap.containsKey(currentPosition)) {
return;
}

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java
View File

@@ -13,6 +13,7 @@ import android.content.IntentFilter;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.View;
/**
@@ -111,6 +112,7 @@ public class GroupChatActivity extends BaseChatActivity {
}
}
Log.d("GROUP_CHAT_ACTIVITY", "Resuming group chat activity. Canceling notification. Group is null: " + (mGroup == null));
cancelNotification();
IntentFilter filter = new IntentFilter(Constants.NOTIFICATION_BROADCAST);
registerReceiver(mReceiver, filter);
@@ -169,6 +171,8 @@ public class GroupChatActivity extends BaseChatActivity {
mGroup = group;
setToolbar();
Log.d("GROUP_CHAT_ACTIVITY", "Group(" + mGroup.id + ") has been set. Canceling notification");
cancelNotification();
}
}

2
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/impressum/ImpressumActivity.java
View File

@@ -30,7 +30,7 @@ public class ImpressumActivity extends AppCompatActivity {
setContentView(R.layout.activity_web_view);
ButterKnife.bind(this);
mWebView.setWebViewClient(new Callback());
mWebView.loadUrl("https://www.ownchat.de/index.php/datenschutzerklaerung-app/");
mWebView.loadUrl("https://www.ownchat.de/datenschutzerklaerung-app/");
}
@OnClick(R.id.impressum_toolbar_back_arrow)

3
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
View File

@@ -19,6 +19,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
@@ -27,7 +28,9 @@ import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.Toast;
import java.util.Map;

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/chat_toolbar.xml
View File

@@ -8,6 +8,7 @@
tools:context=".page.chat.BaseChatActivity">
<RelativeLayout
android:id="@+id/test_layout_id"
android:layout_width="match_parent"
android:layout_height="match_parent">

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
View File

@@ -7,6 +7,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:id="@+id/message_container"
android:paddingEnd="40dp"
android:paddingStart="0dp"
android:paddingBottom="0dp">

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
View File

@@ -6,6 +6,7 @@
android:layoutDirection="rtl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/message_container"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:paddingEnd="40dp"

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
View File

@@ -5,6 +5,7 @@
xmlns:emojicon="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/message_container"
android:paddingEnd="40dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
View File

@@ -8,6 +8,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:id="@+id/message_container"
android:paddingEnd="40dp"
android:paddingStart="0dp">

1
BeWoPlanerChat/bewoplaner-chat-android/build.gradle
View File

@@ -11,7 +11,6 @@ buildscript {
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:4.0.1'
}
}

4
BeWoPlanerChat/bewoplaner-chat-android/gradle.properties
View File

@@ -9,11 +9,11 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
org.gradle.parallel=true
org.gradle.deamon=true