Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/snipsnap/SlyceMessaging
Browse files Browse the repository at this point in the history
  • Loading branch information
@MatthewTPage
MatthewTPage committed Jul 19, 2016
2 parents bef85c2 + 29eea5c commit 6f534ad
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 40 deletions.
10 changes: 8 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity {
Log.d("inf", "******************************** " + imageUri);
}
});

slyceMessagingFragment.setLoadMoreMessagesListener(new LoadMoreMessagesListener() {
@Override
public List<Message> loadMoreMessages() {
Expand All @@ -187,7 +187,7 @@ public class MainActivity extends AppCompatActivity {
return messages;
}
});

slyceMessagingFragment.setMoreMessagesExist(true);
}
}
Expand All @@ -206,3 +206,9 @@ public class MainActivity extends AppCompatActivity {
<item name="snackbarButtonColor">@color/text_blue</item>
</style>
```

## Developers

We have a local.properties file checked in for CI builds. Please do not check in changes to local.properties. Run this command to prevent that file from showing up as changed:

```git update-index --assume-unchanged local.properties```
16 changes: 8 additions & 8 deletions slyce-messaging/src/main/java/it/slyce/messaging/SlyceMessagingFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void setPictureButtonVisible(final boolean bool) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
ImageView imageView = (ImageView) rootView.findViewById(R.id.scout_image_view_snap);
ImageView imageView = (ImageView) rootView.findViewById(R.id.slyce_messaging_image_view_snap);
imageView.setVisibility(bool ? View.VISIBLE : View.GONE);
}
});
Expand Down Expand Up @@ -173,10 +173,10 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bun
this.customSettings = new CustomSettings();

// Setup views
mEntryField = (EditText) rootView.findViewById(R.id.scout_edit_text_entry_field);
ImageView mSendButton = (ImageView) rootView.findViewById(R.id.scout_image_view_send);
ImageView mSnapButton = (ImageView) rootView.findViewById(R.id.scout_image_view_snap);
mRecyclerView = (RecyclerView) rootView.findViewById(R.id.recycler_view);
mEntryField = (EditText) rootView.findViewById(R.id.slyce_messaging_edit_text_entry_field);
ImageView mSendButton = (ImageView) rootView.findViewById(R.id.slyce_messaging_image_view_send);
ImageView mSnapButton = (ImageView) rootView.findViewById(R.id.slyce_messaging_image_view_snap);
mRecyclerView = (RecyclerView) rootView.findViewById(R.id.slyce_messaging_recycler_view);

// Add interfaces
mSendButton.setOnClickListener(this);
Expand Down Expand Up @@ -314,9 +314,9 @@ public void run() {

@Override
public void onClick(View v) {
if (v.getId() == R.id.scout_image_view_send) {
if (v.getId() == R.id.slyce_messaging_image_view_send) {
sendUserTextMessage();
} else if (v.getId() == R.id.scout_image_view_snap) {
} else if (v.getId() == R.id.slyce_messaging_image_view_snap) {
mEntryField.setText("");
final File root = new File(Environment.getExternalStorageDirectory() + File.separator + "SlyceMessaging" + File.separator);
root.mkdirs();
Expand Down Expand Up @@ -349,7 +349,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
return;
}
try {
if (requestCode == 1) {
if (requestCode == 1 && resultCode == getActivity().RESULT_OK) {
final boolean isCamera;
if (data == null) {
isCamera = true;
Expand Down
51 changes: 21 additions & 30 deletions slyce-messaging/src/main/res/layout/fragment_slyce_messaging.xml
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_gray_lightest">

<android.support.design.widget.CoordinatorLayout
<android.support.v7.widget.RecyclerView
android:id="@+id/slyce_messaging_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/scout_view_horiz_divider"
android:layout_below="@+id/scout_app_bar_layout">

<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:overScrollMode="ifContentScrolls"
android:scrollbars="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp" />

</android.support.design.widget.CoordinatorLayout>

android:layout_above="@+id/slyce_messaging_view_horiz_divider"
android:clipToPadding="false"
android:overScrollMode="ifContentScrolls"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:scrollbars="vertical" />


<View
android:id="@+id/scout_view_horiz_divider"
android:id="@+id/slyce_messaging_view_horiz_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_above="@+id/scout_view_group_entry_field"
android:layout_above="@+id/slyce_messaging_view_group_entry_field"
android:background="@color/stroke_blue_lightest" />

<RelativeLayout
android:id="@+id/scout_view_group_entry_field"
android:id="@+id/slyce_messaging_view_group_entry_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/background_white">


<ImageView
android:id="@+id/scout_image_view_snap"
android:id="@+id/slyce_messaging_image_view_snap"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerVertical="true"
Expand All @@ -54,17 +45,17 @@
android:padding="4dp"
android:scaleType="fitCenter"
android:src="@mipmap/ic_camera_photo"
android:tint="@color/background_navy"/>
android:tint="@color/background_navy" />

<it.slyce.messaging.view.text.FontEditText
android:id="@+id/scout_edit_text_entry_field"
android:id="@+id/slyce_messaging_edit_text_entry_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_toLeftOf="@+id/scout_image_view_send"
android:layout_toRightOf="@+id/scout_image_view_snap"
android:layout_toLeftOf="@+id/slyce_messaging_image_view_send"
android:layout_toRightOf="@+id/slyce_messaging_image_view_snap"
android:background="@android:color/transparent"
android:gravity="left"
android:hint="@string/scout_entry_hint"
Expand All @@ -78,20 +69,20 @@


<ImageView
android:id="@+id/scout_image_view_send"
android:id="@+id/slyce_messaging_image_view_send"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginBottom="8dp"
android:layout_marginRight="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@mipmap/ic_send"
android:tint="@color/background_navy"/>
android:tint="@color/background_navy" />

</RelativeLayout>

Expand Down

0 comments on commit 6f534ad

Please sign in to comment.