ChronosXYZ/Influence-P2P
1
0
Fork 0
mirror of https://github.com/ChronosX88/Influence-P2P.git synced 2024-11-22 07:12:19 +00:00
Code Issues Projects Releases Wiki Activity

Enabled multidex

Browse Source
This commit is contained in:
ChronosX88 2019-04-10 20:05:15 +04:00
parent 22b7950d17
commit a94c655c43
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -11,6 +11,7 @@ android {
versionCode 1 versionCode 1
versionName "0.1alpha2" versionName "0.1alpha2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@ -53,6 +54,7 @@ dependencies {
implementation 'de.hdodenhof:circleimageview:3.0.0' implementation 'de.hdodenhof:circleimageview:3.0.0'
implementation group: 'org.objenesis', name: 'objenesis', version: '2.6' implementation group: 'org.objenesis', name: 'objenesis', version: '2.6'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'com.android.support:multidex:1.0.3'
} }
repositories { repositories {
mavenCentral() mavenCentral()

3
app/src/main/java/io/github/chronosx88/influence/helpers/AppHelper.java
View File

@ -5,6 +5,7 @@ import android.content.Context;
import net.tomp2p.dht.PeerDHT; import net.tomp2p.dht.PeerDHT;
import androidx.multidex.MultiDexApplication;
import androidx.room.Room; import androidx.room.Room;
import io.github.chronosx88.influence.observable.MainObservable; import io.github.chronosx88.influence.observable.MainObservable;
@ -12,7 +13,7 @@ import io.github.chronosx88.influence.observable.MainObservable;
* Extended Application class which designed for getting various objects from anywhere in the application. * Extended Application class which designed for getting various objects from anywhere in the application.
*/ */
public class AppHelper extends Application { public class AppHelper extends MultiDexApplication {
private static Application instance; private static Application instance;
private static MainObservable observable; private static MainObservable observable;
private static String peerID; private static String peerID;

4
app/src/main/java/io/github/chronosx88/influence/helpers/ChatAdapter.java
View File

@ -10,6 +10,8 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -22,7 +24,7 @@ public class ChatAdapter extends RecyclerView.Adapter<ChatAdapter.ViewHolder> {
private final static int LEFT_ITEM = 1; private final static int LEFT_ITEM = 1;
private final static int TECHNICAL_MESSAGE = 2; // TODO private final static int TECHNICAL_MESSAGE = 2; // TODO
private final static Context context = AppHelper.getContext(); private final Context context = AppHelper.getContext();
private ArrayList<MessageEntity> messages = new ArrayList<>(); private ArrayList<MessageEntity> messages = new ArrayList<>();
@NonNull @NonNull