Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swvxand 250 ext messages allow file upload display download #6

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
90b9472
Added the ability to change style attributes programmatically
Jul 30, 2017
b08b8fa
Changed gradle version
Jul 30, 2017
8061bef
Changed build tools version
Jul 30, 2017
1a126b2
Changed build tools version
Jul 30, 2017
d219fc1
Changed build tools version
Jul 30, 2017
0ca00f4
Added getStyle()
Jul 30, 2017
fa6d403
Changed MessagesListStyle class to public
Jul 30, 2017
ca7d0c4
Added getStyle()/setStyle() to MessagesList
Jul 30, 2017
410fcf0
Made style public in MessageInput
Aug 1, 2017
f7647ae
Made style public in MessageInput
Aug 1, 2017
063737e
MessageInputStyle public
Aug 1, 2017
b3be2b0
Migrated to AndroidX and Java 8
IlyaGazman Oct 7, 2020
f10254b
Updated broken link
muankit Jan 28, 2021
6977471
Merge pull request #338 from gazman-sdk/master
bevzaanton Feb 11, 2021
f966d46
update Picasso version
bevzaanton Feb 11, 2021
3d4baf0
update gradle-wrapper.properties
bevzaanton Feb 11, 2021
ee44d13
add gradle-wrapper.jar
bevzaanton Feb 11, 2021
3db6396
v0.4.1
bevzaanton Feb 12, 2021
1ebe23d
Update README.md
bevzaanton Feb 12, 2021
51430f5
Update README.md
bevzaanton Feb 12, 2021
6a2677c
Update README.md
bevzaanton Feb 12, 2021
725a796
Update README.md
bevzaanton Feb 15, 2021
d10cfe3
Merge pull request #345 from muankit/patch-1
bevzaanton Mar 29, 2021
3942d27
updated changes from develop
jleeContributor Aug 11, 2021
e40390a
added update to change messageListSTYLE programically
jleeContributor Aug 11, 2021
3adb56f
fixed nexus repo upload
jleeContributor Aug 12, 2021
893056b
updated bamboo variable
jleeContributor Aug 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# built application files
*.apk
*.ap_
*.jar
#*.jar

# files for the dex VM
*.dex
Expand Down Expand Up @@ -38,4 +38,4 @@ android/proguard/
*.iws
.idea/
build/
.gradle
.gradle
29 changes: 16 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ChatKit for Android

[ ![Download](https://api.bintray.com/packages/troy379/maven/ChatKit/images/download.svg) ](https://bintray.com/troy379/maven/ChatKit/_latestVersion)
[![](https://jitpack.io/v/stfalcon-studio/Chatkit.svg)](https://jitpack.io/#stfalcon-studio/Chatkit)

ChatKit is a library designed to simplify the development of UI for such a trivial task as chat. It has flexible possibilities for styling, customizing and data management

Expand Down Expand Up @@ -41,19 +41,22 @@ To implement all of the features above you can use the following components:

### Download

Download via Gradle:
```gradle
compile 'com.github.stfalcon:chatkit:0.3.3'
1. Add jitpack to the root build.gradle file of your project at the end of repositories.
```

or Maven:
```xml
<dependency>
<groupId>com.github.stfalcon</groupId>
<artifactId>chatkit</artifactId>
<version>0.3.3</version>
<type>pom</type>
</dependency>
allprojects {
repositories {
...
maven { url 'https://jitpack.io' }
}
}
```
2. Add the dependency
[![](https://jitpack.io/v/stfalcon-studio/Chatkit.svg)](https://jitpack.io/#stfalcon-studio/Chatkit)
```
dependencies {
...
implementation 'com.github.stfalcon-studio:Chatkit:[last_version]'
}
```

### AndroidX
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.novoda:bintray-release:0.4.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

plugins {
id 'maven-publish'
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
maven { url "https://jitpack.io" }
}
}

Expand Down
65 changes: 36 additions & 29 deletions chatkit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,47 @@ android {
abortOnError false
}
}
}

def username = nexus_username
def password = nexus_password

uploadArchives {
repositories {
repositories.mavenDeployer {
pom {
groupId = "com.digium"
artifactId = "chat-kit"
version = '1.0.0-SNAPSHOT'
}

snapshotRepository(url: "http://nexus.switchvox.com/repository/maven-snapshots/") {
authentication(userName: username, password: password)
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

repository(url: "http://nexus.switchvox.com/repository/maven-releases/") {
authentication(userName: username, password: password)
def username = System.getenv('bamboo_nexusUsername')
def password = System.getenv('bamboo_nexusPassword')

uploadArchives {
repositories {
repositories.mavenDeployer {
pom {
groupId = "com.digium"
artifactId = "chat-kit"
version = '1.0.0-SNAPSHOT'
}

snapshotRepository(url: "http://nexus.switchvox.com/repository/maven-snapshots/") {
authentication(userName: username, password: password)
}

repository(url: "http://nexus.switchvox.com/repository/maven-releases/") {
authentication(userName: username, password: password)
}
}
}
}
}

ext {
androidxVersion = '1.2.0-alpha03'
materialVersion = '1.2.0-alpha05'
flexboxVersion = '1.1.0'
}
ext {
androidxVersion = '1.2.0-alpha03'
materialVersion = '1.2.0-alpha05'
flexboxVersion = '1.1.0'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "androidx.appcompat:appcompat:$androidxVersion"
implementation "com.google.android.material:material:$materialVersion"
implementation "com.google.android:flexbox:$flexboxVersion"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation "com.google.android:flexbox:1.0.0"
implementation 'androidx.recyclerview:recyclerview:1.1.0'
}
}
3 changes: 1 addition & 2 deletions chatkit/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.stfalcon.chatkit">
<manifest package="com.stfalcon.chatkit">

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import android.widget.ImageView;
import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

/**
* Callback for implementing images loading in message list
*/
Expand Down
6 changes: 6 additions & 0 deletions chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
import android.util.AttributeSet;
import android.util.TypedValue;

import androidx.annotation.AttrRes;
import androidx.annotation.ColorRes;
import androidx.annotation.DimenRes;
import androidx.annotation.DrawableRes;
import androidx.core.content.ContextCompat;

import com.stfalcon.chatkit.R;

import androidx.annotation.AttrRes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import android.view.View;
import androidx.recyclerview.widget.RecyclerView;

import androidx.recyclerview.widget.RecyclerView;

/**
* Base ViewHolder
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ public interface IUser {
* Returns the user's id
*
* @return the user's id
* */
*/
String getId();

/**
* Returns the user's name
*
* @return the user's name
* */
*/
String getName();

/**
* Returns the user's avatar image url
*
* @return the user's avatar image url
* */
*/
String getAvatar();
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
import android.content.Context;
import android.util.AttributeSet;

import androidx.annotation.Nullable;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;

import com.stfalcon.chatkit.commons.models.IDialog;

import androidx.annotation.Nullable;
Expand Down Expand Up @@ -74,7 +80,7 @@ public void setAdapter(Adapter adapter) {
* @param adapter Adapter. Must extend DialogsListAdapter
* @param <DIALOG> Dialog model class
*/
public <DIALOG extends IDialog>
public <DIALOG extends IDialog<?>>
void setAdapter(DialogsListAdapter<DIALOG> adapter) {
setAdapter(adapter, false);
}
Expand All @@ -86,7 +92,7 @@ void setAdapter(DialogsListAdapter<DIALOG> adapter) {
* @param reverseLayout weather to use reverse layout for layout manager.
* @param <DIALOG> Dialog model class
*/
public <DIALOG extends IDialog>
public <DIALOG extends IDialog<?>>
void setAdapter(DialogsListAdapter<DIALOG> adapter, boolean reverseLayout) {
SimpleItemAnimator itemAnimator = new DefaultItemAnimator();
itemAnimator.setSupportsChangeAnimations(false);
Expand Down
Loading