Skip to content

Commit

Permalink
Tweak close button
Browse files Browse the repository at this point in the history
  • Loading branch information
Zachary Wander committed Jul 6, 2017
1 parent a82d475 commit a3bad7b
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 35 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/huetoyou/chatexchange/ui/frags/ChatFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ protected String doInBackground(String... strings)
{
Log.e("STARTED", "DOOOO");
Document document = Jsoup.parse(strings[0]);
Log.e("DOC", document.html());
// Log.e("DOC", document.html());
Elements scripts = document.select("script");
Log.e("S", scripts.html());

Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/huetoyou/chatexchange/ui/misc/RecyclerAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.app.Activity;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.v4.widget.ImageViewCompat;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -284,7 +287,7 @@ public class MyViewHolder extends AbstractSwipeableItemViewHolder
// TODO: whatever views you need to bind
TextView mTextView;
ImageView mImageView;
ImageButton mCloseChat;
ImageView mCloseChat;
View mItem;

FrameLayout mContainer;
Expand Down Expand Up @@ -329,7 +332,7 @@ public void onAnimationStart(Animator animation)
mItem = v;
mTextView = v.findViewById(R.id.chatroomName);
mImageView = v.findViewById(R.id.chatroomImg);
mCloseChat = v.findViewById(R.id.close_chat_button);
mCloseChat = v.findViewById(R.id.close_chat_img);

mBehind = v.findViewById(R.id.behind_views);
mContainer = v.findViewById(R.id.chat_item_container);
Expand Down Expand Up @@ -389,7 +392,7 @@ public View getItem()
return mItem;
}

public ImageButton getCloseChatButton()
public ImageView getCloseChatButton()
{
return mCloseChat;
}
Expand Down Expand Up @@ -423,6 +426,7 @@ public void onClick(View view)
{
mCloseButtonRevealSet.cancel();
mCloseButtonHideSet.start();
getSwipeManager().performFakeSwipe(mVHs.get(position), 1);
//mCloseChat.setVisibility(View.INVISIBLE);
Log.e("CLOSE", "HIDING");
}
Expand Down
80 changes: 49 additions & 31 deletions app/src/main/res/layout/chatroom_list_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,62 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="60dp"
android:animateLayoutChanges="true"
android:gravity="center_vertical"
android:paddingBottom="10dp"
android:paddingEnd="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingTop="10dp"
android:background="?android:attr/selectableItemBackground">
android:gravity="center_vertical">

<!-- Defining where should text be placed. You set you text color here-->

<RelativeLayout
android:id="@+id/behind_views"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="end"
android:gravity="end"
android:paddingBottom="10dp"
android:paddingEnd="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingTop="10dp">

<ImageView
android:id="@+id/close_chat_img"
android:layout_width="40dp"
android:layout_height="40dp"
android:tint="@android:color/holo_red_dark"
android:visibility="invisible"
app:srcCompat="@drawable/ic_close_black_24dp"
android:background="?android:attr/selectableItemBackground"
/>

<!--<android.support.v7.widget.AppCompatImageButton-->
<!--android:id="@+id/close_chat_button"-->
<!--style="@style/Widget.AppCompat.Button.Colored"-->
<!--android:layout_width="40dp"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_gravity="center_vertical|end"-->
<!--android:background="?android:attr/selectableItemBackground"-->
<!--android:backgroundTintMode="src_over"-->
<!--android:tint="@color/white"-->
<!--android:visibility="invisible"-->
<!--app:backgroundTint="@android:color/holo_red_dark"-->
<!--app:elevation="4dp"-->
<!--app:srcCompat="@drawable/ic_close_black_24dp" />-->
</RelativeLayout>

<FrameLayout
android:id="@+id/chat_item_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:paddingBottom="10dp"
android:paddingEnd="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingTop="10dp"
android:background="?android:attr/selectableItemBackground" >

<ImageView
android:id="@+id/chatroomImg"
Expand Down Expand Up @@ -64,25 +102,5 @@

</FrameLayout>

<RelativeLayout
android:id="@+id/behind_views"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end">

<android.support.v7.widget.AppCompatImageButton
android:id="@+id/close_chat_button"
style="@style/Widget.AppCompat.ImageButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical|end"
android:elevation="4dp"
android:tint="@color/white"
android:visibility="invisible"
app:backgroundTint="@android:color/holo_red_dark"
app:elevation="4dp"
app:srcCompat="@drawable/ic_close_black_24dp" />
</RelativeLayout>


</FrameLayout>

0 comments on commit a3bad7b

Please sign in to comment.