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.

Sign up for GitHub

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

Add custom menu API #453

Merged
merged 16 commits into from
Sep 11, 2018
Merged

Add custom menu API #453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6f9e4d4
Add MenuManager class.
JoshLipan Sep 10, 2018
65683f8
Update sample
JoshLipan Sep 10, 2018
735c729
Update menu API“
JoshLipan Sep 10, 2018
f061ded
Merge branch 'dev' of https://github.com/jpush/aurora-imui into dev
JoshLipan Sep 10, 2018
83d0b1c
Explode menu collection class
JoshLipan Sep 10, 2018
62eadcd
Update sample
JoshLipan Sep 10, 2018
322942c
Update chatinput version to v0.9.0
JoshLipan Sep 10, 2018
199ae68
Update sample
JoshLipan Sep 11, 2018
d174021
Update doc
JoshLipan Sep 11, 2018
d408210
Update doc
JoshLipan Sep 11, 2018
aeb0e2a
Add customLayoutItems for android
JoshLipan Sep 11, 2018
a634a5f
Update RN sample
JoshLipan Sep 11, 2018
4aab2d8
Update RN docs
JoshLipan Sep 11, 2018
dda08bb
Update version to v0.11.0
JoshLipan Sep 11, 2018
97b2543
Update RN chatinput
JoshLipan Sep 11, 2018
0b0db28
Update RN docs
JoshLipan Sep 11, 2018
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
Prev Previous commit
Next Next commit
Update menu API“
  • Loading branch information
@JoshLipan
JoshLipan committed Sep 10, 2018
commit 735c7299d357841e252ebbb4cac808a1948b988b
8 changes: 7 additions & 1 deletion ...oid/chatinput/src/main/java/cn/jiguang/imui/chatinput/menu/collection/MenuCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cn.jiguang.imui.chatinput.menu.collection;

import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -24,9 +25,14 @@ public MenuCollection(Context context) {


protected void addMenu(String menuTag, View menu) {
if(TextUtils.isEmpty(menuTag)){
Log.e(TAG, "Collection custom menu failed,tag is empty.");
return;
}

if (containsKey(menuTag)) {
Log.e(TAG, "Tag " + menuTag + " has been used already！");
Log.e(TAG, "Collection custom menu failed,Tag " + menuTag + " has been used already！");
return;
}
menu.setTag(menuTag);
if (mMenuCollectionChangedListener != null) {
Expand Down
27 changes: 18 additions & 9 deletions ...tinput/src/main/java/cn/jiguang/imui/chatinput/menu/collection/MenuFeatureCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,34 @@
import cn.jiguang.imui.chatinput.menu.view.MenuFeature;


public class MenuFeatureCollection extends MenuCollection {
public class MenuFeatureCollection extends MenuCollection{


public MenuFeatureCollection(Context context) {

public MenuFeatureCollection(Context context){
super(context);
}

public void addMenuFeature(String tag, int resource) {
public void addMenuFeature(String tag,int resource){
if(resource == -1){
Log.i(TAG,"Menu feature with tag"+tag+" will not be added.");
return;
}
View view = mInflater.inflate(resource, null);
addMenuFeature(tag, view);
addMenuFeature(tag,view);
}

public void addMenuFeature(String tag, View menuFeature) {
public void addMenuFeature(String tag,View menuFeature){
if(menuFeature == null){
Log.i(TAG,"Menu feature with tag"+tag+" will not be added.");
return;
}

if (menuFeature instanceof MenuFeature) {
if(menuFeature instanceof MenuFeature){
menuFeature.setVisibility(View.GONE);
addMenu(tag, menuFeature);
} else {
Log.e(TAG, "Collection menu feature failed exception!");
addMenu(tag,menuFeature);
}else {
Log.e(TAG,"Collection menu feature failed exception!");
}
}

Expand Down