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

Improve Popup logic #97

Merged
merged 8 commits into from
Mar 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public class MainActivity extends AppCompatActivity {

@Override public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
case R.id.show_dialog:
MainDialog.show(this);
return true;
case R.id.variantIos:
EmojiManager.install(new IosEmojiProvider());
recreate();
Expand Down Expand Up @@ -144,7 +147,7 @@ private void setUpEmojiPopup() {
})
.setOnSoftKeyboardCloseListener(new OnSoftKeyboardCloseListener() {
@Override public void onKeyboardClose() {
emojiPopup.dismiss();
Log.d(TAG, "Closed soft keyboard");
}
})
.build(editText);
Expand Down
135 changes: 135 additions & 0 deletions app/src/main/java/com/vanniktech/emoji/sample/MainDialog.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
package com.vanniktech.emoji.sample;

import android.app.Dialog;
import android.graphics.PorterDuff;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.vanniktech.emoji.EmojiEditText;
import com.vanniktech.emoji.EmojiPopup;
import com.vanniktech.emoji.emoji.Emoji;
import com.vanniktech.emoji.listeners.OnEmojiBackspaceClickListener;
import com.vanniktech.emoji.listeners.OnEmojiClickedListener;
import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener;
import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener;
import com.vanniktech.emoji.listeners.OnSoftKeyboardCloseListener;
import com.vanniktech.emoji.listeners.OnSoftKeyboardOpenListener;

public class MainDialog extends DialogFragment {
private static final String FRAGMENT_MANAGER_TAG = "dialog_main";
private static final String TAG = "MainDialog";

private ChatAdapter chatAdapter;
private EmojiPopup emojiPopup;

private EmojiEditText editText;
private ViewGroup rootView;
private ImageView emojiButton;

public static void show(@NonNull final AppCompatActivity activity) {
new MainDialog().show(activity.getSupportFragmentManager(), FRAGMENT_MANAGER_TAG);
}

@Override public void onCreate(@Nullable final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

chatAdapter = new ChatAdapter();
}

@Override public void onStop() {
if (emojiPopup != null) {
emojiPopup.dismiss();
}

super.onStop();
}

@NonNull @Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
return new AlertDialog.Builder(getContext())
.setView(buildView())
.create();
}

private View buildView() {
final View result = View.inflate(getContext(), R.layout.dialog_main, null);

editText = (EmojiEditText) result.findViewById(R.id.main_dialog_chat_bottom_message_edittext);
rootView = (ViewGroup) result.findViewById(R.id.main_dialog_root_view);
emojiButton = (ImageView) result.findViewById(R.id.main_dialog_emoji);
final ImageView sendButton = (ImageView) result.findViewById(R.id.main_dialog_send);

emojiButton.setColorFilter(ContextCompat.getColor(getContext(), R.color.emoji_icons), PorterDuff.Mode.SRC_IN);
sendButton.setColorFilter(ContextCompat.getColor(getContext(), R.color.emoji_icons), PorterDuff.Mode.SRC_IN);

emojiButton.setOnClickListener(new View.OnClickListener() {
@Override public void onClick(final View v) {
emojiPopup.toggle();
}
});
sendButton.setOnClickListener(new View.OnClickListener() {
@Override public void onClick(final View v) {
final String text = editText.getText().toString().trim();

if (text.length() > 0) {
chatAdapter.add(text);

editText.setText("");
}
}
});

final RecyclerView recyclerView = (RecyclerView) result.findViewById(R.id.main_dialog_recycler_view);
recyclerView.setAdapter(chatAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));

setUpEmojiPopup();

return rootView;
}

private void setUpEmojiPopup() {
emojiPopup = EmojiPopup.Builder.fromRootView(rootView)
.setOnEmojiBackspaceClickListener(new OnEmojiBackspaceClickListener() {
@Override public void onEmojiBackspaceClicked(final View v) {
Log.d(TAG, "Clicked on Backspace");
}
})
.setOnEmojiClickedListener(new OnEmojiClickedListener() {
@Override public void onEmojiClicked(final Emoji emoji) {
Log.d(TAG, "Clicked on emoji");
}
})
.setOnEmojiPopupShownListener(new OnEmojiPopupShownListener() {
@Override public void onEmojiPopupShown() {
emojiButton.setImageResource(R.drawable.ic_keyboard);
}
})
.setOnSoftKeyboardOpenListener(new OnSoftKeyboardOpenListener() {
@Override public void onKeyboardOpen(final int keyBoardHeight) {
Log.d(TAG, "Opened soft keyboard");
}
})
.setOnEmojiPopupDismissListener(new OnEmojiPopupDismissListener() {
@Override public void onEmojiPopupDismiss() {
emojiButton.setImageResource(R.drawable.emoji_ios_category_people);
}
})
.setOnSoftKeyboardCloseListener(new OnSoftKeyboardCloseListener() {
@Override public void onKeyboardClose() {
Log.d(TAG, "Closed soft keyboard");
}
})
.build(editText);
}
}
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_message.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
</vector>
102 changes: 49 additions & 53 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
@@ -1,61 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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:id="@+id/main_activity_root_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MainActivity"
>
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_activity_root_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MainActivity">

<android.support.v7.widget.RecyclerView
android:id="@+id/main_activity_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
<android.support.v7.widget.RecyclerView
android:id="@+id/main_activity_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/main_activity_emoji_bar"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#FFF"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="4dp"
>
<LinearLayout
android:id="@+id/main_activity_emoji_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#FFF"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="4dp">

<ImageButton
android:id="@+id/main_activity_emoji"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/emoji_ios_category_people"
tools:ignore="ContentDescription"
/>
<ImageButton
android:id="@+id/main_activity_emoji"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/emoji_ios_category_people"
tools:ignore="ContentDescription"/>

<com.vanniktech.emoji.EmojiEditText
android:id="@+id/main_activity_chat_bottom_message_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:imeOptions="actionSend"
android:inputType="textCapSentences|textMultiLine"
android:maxLines="3"
app:emojiSize="26sp"
/>
<com.vanniktech.emoji.EmojiEditText
android:id="@+id/main_activity_chat_bottom_message_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:imeOptions="actionSend"
android:inputType="textCapSentences|textMultiLine"
android:maxLines="3"
app:emojiSize="26sp"/>

<ImageView
android:id="@+id/main_activity_send"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_send"
tools:ignore="ContentDescription"
/>
</LinearLayout>
<ImageView
android:id="@+id/main_activity_send"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_send"
tools:ignore="ContentDescription"/>
</LinearLayout>
</RelativeLayout>
55 changes: 55 additions & 0 deletions app/src/main/res/layout/dialog_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:id="@+id/main_dialog_root_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:context=".MainDialog">

<android.support.v7.widget.RecyclerView
android:id="@+id/main_dialog_recycler_view"
android:layout_width="match_parent"
android:layout_height="200dp"/>

<LinearLayout
android:id="@+id/main_dialog_emoji_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="4dp">

<ImageButton
android:id="@+id/main_dialog_emoji"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/emoji_ios_category_people"
tools:ignore="ContentDescription"/>

<com.vanniktech.emoji.EmojiEditText
android:id="@+id/main_dialog_chat_bottom_message_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:imeOptions="actionSend"
android:inputType="textCapSentences|textMultiLine"
android:maxLines="3"
app:emojiSize="26sp"/>

<ImageView
android:id="@+id/main_dialog_send"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_send"
tools:ignore="ContentDescription"/>
</LinearLayout>
</LinearLayout>
13 changes: 9 additions & 4 deletions app/src/main/res/menu/activity_main.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/show_dialog"
android:icon="@drawable/ic_message"
android:title="@string/show_dialog_title"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_search_option"
android:icon="@drawable/ic_swap"
Expand All @@ -10,13 +15,13 @@
<group>
<item
android:id="@+id/variantIos"
android:title="@string/variant_ios_title" />
android:title="@string/variant_ios_title"/>
<item
android:id="@+id/variantGoogle"
android:title="@string/variant_google_title" />
android:title="@string/variant_google_title"/>
<item
android:id="@+id/variantEmojiOne"
android:title="@string/variant_emojione_title" />
android:title="@string/variant_emojione_title"/>
</group>
</menu>
</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<string name="variant_ios_title">Ios</string>
<string name="variant_google_title">Google</string>
<string name="variant_emojione_title">EmojiOne</string>
<string name="show_dialog_title">Show Dialog</string>
</resources>
6 changes: 6 additions & 0 deletions code_quality_tools/findbugs-filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,10 @@
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
</Match>

<!-- Sample app. -->
<Match>
<Class name="~.*MainDialog*.*"/>
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
</Match>

</FindBugsFilter>
Loading