update travis #1

.travis.yml

@@ -13,12 +13,11 @@ android:
     - '.+'
 
 sudo: required
-
 jdk:
   - oraclejdk8
 before_install:
 - chmod +x gradlew
 - chmod +rx app 
 
 before_script:
-  - chmod +x gradlew
+  - chmod +x gradlew

app/build.gradle

@@ -21,7 +21,7 @@ android {
         applicationId "io.getstream.chat.sdk"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 2
+        versionCode 3
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar">
+        <activity android:name=".ChannelsActivity"></activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/io/getstream/chat/sdk/AppInfo.java

@@ -0,0 +1,14 @@
+package io.getstream.chat.sdk;
+
+public class AppInfo {
+//    public static String USER_ID        = "broken-waterfall-5";
+//    public static String USER_NAME      = "Jon Snow";
+//    public static String USER_IMAGE     = "https://bit.ly/2u9Vc0r";
+//    public static String USER_ID        = "testuser1";
+//    public static String USER_NAME      = "Test User";
+//    public static String USER_IMAGE     = "https://bit.ly/2u9Vc0r";
+
+//    public static String USER_ID1       = "billowing-firefly-8";
+//    public static String USER_NAME1     = "Billowing firefly";
+//    public static String USER_IMAGE1    = "https://stepupandlive.files.wordpress.com/2014/09/3d-animated-frog-image.jpg";
+}

app/src/main/java/io/getstream/chat/sdk/AppSecretKey.java

@@ -0,0 +1,7 @@
+package io.getstream.chat.sdk;
+
+public final class AppSecretKey {
+//    public static String API_KEY        = "qk4nn7rpcn75";
+
+    public static String API_KEY       = "cranwty2xrfm";
+}

app/src/main/java/io/getstream/chat/sdk/ChannelsActivity.java

@@ -0,0 +1,32 @@
+package io.getstream.chat.sdk;
+
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.getstream.sdk.chat.rest.core.StreamChat;
+import com.getstream.sdk.chat.utils.Global;
+import com.getstream.sdk.chat.view.fragment.ChannelListFragment;
+
+public class ChannelsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_channels);
+        addGetStreamFragment(Global.streamChat);
+    }
+
+    private void addGetStreamFragment(@NonNull StreamChat streamChat) {
+        ChannelListFragment fragment = new ChannelListFragment();
+        fragment.containerResId = R.id.container;
+        fragment.streamChat = streamChat;
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction.replace(R.id.container, fragment);
+        fragmentTransaction.addToBackStack(null);
+        fragmentTransaction.commit();
+    }
+}

app/src/main/java/io/getstream/chat/sdk/MainActivity.java

@@ -23,6 +23,7 @@
 import com.getstream.sdk.chat.model.channel.Channel;
 import com.getstream.sdk.chat.model.enums.Token;
 import com.getstream.sdk.chat.rest.core.StreamChat;
+import com.getstream.sdk.chat.utils.Global;
 import com.getstream.sdk.chat.view.activity.ChatActivity;
 import com.getstream.sdk.chat.view.fragment.ChannelListFragment;
 

app/src/main/res/layout/activity_channels.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ChannelsActivity">
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout>

build.gradle

@@ -26,8 +26,6 @@ allprojects {
     }
 }
 
-
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

gradlew

@@ -76,14 +76,12 @@ if [ -n "$JAVA_HOME" ] ; then
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
     JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
@@ -169,4 +167,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"