Merge branch 'master' of github.com:Ilhamfp31/chatman (77263e67) · Commits · IF3111-2019-KitaNetral / ChatMan · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

ChatMan
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3111-2019-KitaNetral
ChatMan
Commits
77263e67

Commit 77263e67 authored 6 years ago by

Ilham Firdausi Putra

Downloads
- Plain Diff

Merge branch 'master' of github.com:Ilhamfp31/chatman

parents 50702d71 a0df947f

Branches

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

android/.idea/misc.xml 1 addition, 1 deletion

android/.idea/misc.xml
android/app/src/main/java/com/chatman/AuthActivity.java 23 additions, 14 deletions

android/app/src/main/java/com/chatman/AuthActivity.java
android/app/src/main/java/com/chatman/adapter/MainViewPagerAdapter.java 50 additions, 0 deletions

...c/main/java/com/chatman/adapter/MainViewPagerAdapter.java
android/app/src/main/java/com/chatman/fragment/ChatBot.java 30 additions, 0 deletions

android/app/src/main/java/com/chatman/fragment/ChatBot.java
android/app/src/main/java/com/chatman/fragment/ChatList.java 120 additions, 0 deletions

android/app/src/main/java/com/chatman/fragment/ChatList.java
android/app/src/main/java/com/chatman/model/Chat.java 49 additions, 0 deletions

android/app/src/main/java/com/chatman/model/Chat.java
android/app/src/main/java/com/chatman/model/ChatRoom.java 29 additions, 0 deletions

android/app/src/main/java/com/chatman/model/ChatRoom.java
android/app/src/main/res/layout/fragment_chat_bot.xml 14 additions, 0 deletions

android/app/src/main/res/layout/fragment_chat_bot.xml
android/app/src/main/res/layout/fragment_chat_list.xml 29 additions, 0 deletions

android/app/src/main/res/layout/fragment_chat_list.xml

with 345 additions and 15 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment